@@ -102,6 +104,12 @@
+
+
+
+
+
+
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
index c97246b..9638478 100644
--- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
+++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
@@ -477,26 +477,21 @@ function moreAdd(flag){
//导出excel功能
function exportExcel(){
var checks = $("#checks").val();
- var total = $("#rows").val();
- if (total > 5000 && checks == '') {
- toastr.warning("数据量大,暂提供5000条以内数据导出!");
- } else {
- if(checks != '') {
- checks = checks.substring(0, checks.length - 1);
- var url = path+"/approve/exportExcelApproveList?checks="+checks;
- window.location.href = url;
- }else{
- Common.confirm({
- title: "提示",
- message: "没有选中，您确定要按搜索栏条件导出?",
- operate: function (reselt) {
- if (reselt) {
- var url = path+"/approve/exportExcelApproveList?startTime1="+$("#startTime1").val()+"&endTime1="+$("#endTime1").val()+"&startTime2="+$("#startTime2").val()+"&endTime2="+$("#endTime2").val()+"&name="+$("#searchName").val()+"&effeDays="+$("#effeDaysSearch").val()+"&applyer="+$("#applyerSearch").val()+"&approveState="+$("#searchApproveState").val()+"&approver="+$("#approver").val();
- window.location.href = url;
- }
+ if(checks != '') {
+ checks = checks.substring(0, checks.length - 1);
+ var url = path+"/approve/exportExcelApproveList?checks="+checks;
+ window.location.href = url;
+ }else{
+ Common.confirm({
+ title: "提示",
+ message: "没有选中，您确定要按搜索栏条件导出?",
+ operate: function (reselt) {
+ if (reselt) {
+ var url = path+"/approve/exportExcelApproveList?startTime1="+$("#startTime1").val()+"&endTime1="+$("#endTime1").val()+"&startTime2="+$("#startTime2").val()+"&endTime2="+$("#endTime2").val()+"&name="+$("#searchName").val()+"&effeDays="+$("#effeDaysSearch").val()+"&applyer="+$("#applyerSearch").val()+"&approveState="+$("#searchApproveState").val()+"&approver="+$("#approver").val();
+ window.location.href = url;
}
- })
- }
+ }
+ })
}
}
diff --git a/src/main/webapp/static/js/recordManage/bloodPurification/documentList.js b/src/main/webapp/static/js/recordManage/bloodPurification/documentList.js
index 4a783ae..24090be 100644
--- a/src/main/webapp/static/js/recordManage/bloodPurification/documentList.js
+++ b/src/main/webapp/static/js/recordManage/bloodPurification/documentList.js
@@ -8,329 +8,332 @@ function search(){
datType: 'json',
success: function (data) {
if (data.code == 0) {
- var data = data.data;
-
- /**
- * 当月
- */
- //知情同意合格率
- var informedconDocNosignRate = data.informedconDocNosignRate;
- var informedconDocNosignRateHb = data.informedconDocNosignRateHb;
- var informedconDocNosignRateYoy = data.informedconDocNosignRateYoy;
-
- $("#quarter_infoConQualRate").html(informedconDocNosignRate + '%');
- var informedconDocNosignHb = isEmpty(informedconDocNosignRateHb) ? 0 : (informedconDocNosignRate - informedconDocNosignRateHb) / informedconDocNosignRateHb * 100;
- $("#quarter_bloodPurHbRate").html(informedconDocNosignHb + '%')
- if(informedconDocNosignHb >= 0){
- $("#quarter_infoConQualHbArrow").css("color", "#d92323")
- $("#quarter_infoConQualHbArrow").html("上升")
+ var data = data.data
+ if(Object.keys(data).length != 0){
+ /**
+ * 当月
+ */
+ //知情同意合格率
+ var informedconDocNosignRate = data.informedconDocNosignRate;
+ var informedconDocNosignRateHb = data.informedconDocNosignRateHb;
+ var informedconDocNosignRateYoy = data.informedconDocNosignRateYoy;
+
+ $("#quarter_infoConQualRate").html(informedconDocNosignRate + '%');
+ var informedconDocNosignHb = isEmpty(informedconDocNosignRateHb) ? 0 : (informedconDocNosignRate - informedconDocNosignRateHb) / informedconDocNosignRateHb * 100;
+ $("#quarter_bloodPurHbRate").html(informedconDocNosignHb + '%')
+ if(informedconDocNosignHb >= 0){
+ $("#quarter_infoConQualHbArrow").css("color", "#d92323")
+ $("#quarter_infoConQualHbArrow").html("上升")
+ }else{
+ $("#quarter_infoConQualHbArrow").css("color", "#10d710")
+ $("#quarter_infoConQualHbArrow").html("下降")
+ }
+
+ var informedconDocNosignTb = isEmpty(informedconDocNosignRateYoy) ? 0 : (informedconDocNosignRate - informedconDocNosignRateYoy) / informedconDocNosignRateYoy * 100;
+ if(informedconDocNosignTb >= 0){
+ $("#quarter_infoConQualTbArrow").css("color", "#d92323")
+ $("#quarter_infoConQualTbArrow").html("上升")
+ }else{
+ $("#quarter_infoConQualTbRate").css("color", "#10d710")
+ $("#quarter_infoConQualTbRate").html("下降")
+ }
+
+ //血净记录缺失率
+ var bloodFillIncompleteRate = data.bloodFillIncompleteRate;
+ var bloodFillIncompleteRateHb = data.bloodFillIncompleteRateHb;
+ var bloodFillIncompleteRateYoy = data.bloodFillIncompleteRateYoy;
+
+ $("#quarter_bloodPurRate").html(bloodFillIncompleteRate + '%');
+ var bloodFillIncompleteHb = isEmpty(bloodFillIncompleteRateHb) ? 0 : (bloodFillIncompleteRate - bloodFillIncompleteRateHb) / bloodFillIncompleteRateHb * 100;
+ $("#quarter_bloodPurHbRate").html(bloodFillIncompleteHb + '%')
+ if(bloodFillIncompleteHb >= 0){
+ $("#quarter_bloodPurHbArrow").css("color", "#d92323")
+ $("#quarter_bloodPurHbArrow").html("上升")
+ }else{
+ $("#quarter_bloodPurHbArrow").css("color", "#10d710")
+ $("#quarter_bloodPurHbArrow").html("下降")
+ }
+
+ var bloodFillIncompleteTb = isEmpty(bloodFillIncompleteRateYoy) ? 0 : (bloodFillIncompleteRate - bloodFillIncompleteRateYoy) / bloodFillIncompleteRateYoy * 100;
+ $("#quarter_bloodPurTbRate").html(bloodFillIncompleteTb + '%')
+ if(bloodFillIncompleteTb >= 0){
+ $("#quarter_bloodPurTbArrow").css("color", "#d92323")
+ $("#quarter_bloodPurTbArrow").html("上升")
+ }else{
+ $("#quarter_bloodPurTbArrow").css("color", "#10d710")
+ $("#quarter_bloodPurTbArrow").html("下降")
+ }
+
+ //健康教育缺失率
+ var healtheduFillIncompleteRate = data.healtheduFillIncompleteRate;
+ var healtheduFillIncompleteRateHb = data.healtheduFillIncompleteRateHb;
+ var healtheduFillIncompleteRateYoy = data.healtheduFillIncompleteRateYoy;
+
+ $("#quarter_educaDefectRate").html(healtheduFillIncompleteRate + '%');
+ var healtheduFillIncompleteHb = isEmpty(healtheduFillIncompleteRateHb) ? 0 : (healtheduFillIncompleteRate - healtheduFillIncompleteRateHb) / healtheduFillIncompleteRateHb * 100;
+ $("#quarter_educaDefectHbRate").html(healtheduFillIncompleteHb + '%')
+ if(healtheduFillIncompleteHb >= 0){
+ $("#quarter_educaDefectHbArrow").css("color", "#d92323")
+ $("#quarter_educaDefectHbArrow").html("上升")
+ }else{
+ $("#quarter_educaDefectHbArrow").css("color", "#10d710")
+ $("#quarter_educaDefectHbArrow").html("下降")
+ }
+
+ var healtheduFillIncompleteTb = isEmpty(healtheduFillIncompleteRateYoy) ? 0 : (healtheduFillIncompleteRate - healtheduFillIncompleteRateYoy) / healtheduFillIncompleteRateYoy * 100;
+ $("#quarter_educaDefectTbRate").html(healtheduFillIncompleteTb + '%')
+ if(healtheduFillIncompleteTb >= 0){
+ $("#quarter_educaDefectTbArrow").css("color", "#d92323")
+ $("#quarter_educaDefectTbArrow").html("上升")
+ }else{
+ $("#quarter_educaDefectTbArrow").css("color", "#10d710")
+ $("#quarter_educaDefectTbArrow").html("下降")
+ }
+
+ /**
+ * 当季
+ */
+ //知情同意合格率
+ var informedconDocNosignRateQuarter = data.informedconDocNosignRateQuarter;
+ var informedconDocNosignRateQuarterHb = data.informedconDocNosignRateQuarterHb;
+ var informedconDocNosignRateQuarterYoy = data.informedconDocNosignRateQuarterYoy;
+
+ $("#month_infoConQualRate").html(informedconDocNosignRateQuarter + '%');
+ var informedconDocNosignQuarterHb = isEmpty(informedconDocNosignRateQuarterHb) ? 0 : (informedconDocNosignRateQuarter - informedconDocNosignRateQuarterHb) / informedconDocNosignRateQuarterHb * 100;
+ $("#month_infoConQualHbRate").html(informedconDocNosignQuarterHb + '%')
+ if(informedconDocNosignQuarterHb >= 0){
+ $("#month_infoConQualHbArrow").css("color", "#d92323")
+ $("#month_infoConQualHbArrow").html("上升")
+ }else{
+ $("#month_infoConQualHbArrow").css("color", "#10d710")
+ $("#month_infoConQualHbArrow").html("下降")
+ }
+
+ var informedconDocNosignQuarterTb = isEmpty(informedconDocNosignRateQuarterYoy) ? 0 : (informedconDocNosignRateQuarter - informedconDocNosignRateQuarterYoy) / informedconDocNosignRateQuarterYoy * 100;
+ $("#month_infoConQualTbRate").html(informedconDocNosignQuarterTb + '%')
+ if(informedconDocNosignQuarterTb >= 0){
+ $("#month_infoConQualTbArrow").css("color", "#d92323")
+ $("#month_infoConQualTbArrow").html("上升")
+ }else{
+ $("#month_infoConQualTbArrow").css("color", "#10d710")
+ $("#month_infoConQualTbArrow").html("下降")
+ }
+
+ //血净记录缺失率
+ var bloodFillIncompleteRateQuarter = data.bloodFillIncompleteRateQuarter;
+ var bloodFillIncompleteRateQuarterHb = data.bloodFillIncompleteRateQuarterHb;
+ var bloodFillIncompleteRateQuarterYoy = data.bloodFillIncompleteRateQuarterYoy;
+
+ $("#month_bloodPurQualRate").html(bloodFillIncompleteRateQuarter + '%');
+ var bloodFillIncompleteQuarterHb = isEmpty(bloodFillIncompleteRateQuarterHb) ? 0 : (bloodFillIncompleteRateQuarter - bloodFillIncompleteRateQuarterHb) / bloodFillIncompleteRateQuarterHb * 100;
+ $("#month_bloodPurQualHbRate").html(bloodFillIncompleteQuarterHb + '%')
+ if(bloodFillIncompleteQuarterHb >= 0){
+ $("#month_bloodPurQualHbArrow").css("color", "#d92323")
+ $("#month_bloodPurQualHbArrow").html("上升")
+ }else{
+ $("#month_bloodPurQualHbArrow").css("color", "#10d710")
+ $("#month_bloodPurQualHbArrow").html("下降")
+ }
+
+ var bloodFillIncompleteQuarterTb = isEmpty(bloodFillIncompleteRateQuarterYoy) ? 0 : (bloodFillIncompleteRateQuarter - bloodFillIncompleteRateQuarterYoy) / bloodFillIncompleteRateQuarterYoy * 100;
+ $("#month_bloodPurQualTbRate").html(bloodFillIncompleteQuarterTb + '%')
+ if(bloodFillIncompleteQuarterTb >= 0){
+ $("#month_bloodPurQualTbArrow").css("color", "#d92323")
+ $("#month_bloodPurQualTbArrow").html("上升")
+ }else{
+ $("#month_bloodPurQualTbArrow").css("color", "#10d710")
+ $("#month_bloodPurQualTbArrow").html("下降")
+ }
+
+ //健康教育缺失率
+ var healtheduFillIncompleteRateQuarter = data.healtheduFillIncompleteRateQuarter;
+ var healtheduFillIncompleteRateQuarterHb = data.healtheduFillIncompleteRateQuarterHb;
+ var healtheduFillIncompleteRateQuarterYoy = data.healtheduFillIncompleteRateQuarterYoy;
+
+ $("#month_educaDefectQualRate").html(healtheduFillIncompleteRateQuarter + '%');
+ var healtheduFillIncompleteQuarterHb = isEmpty(healtheduFillIncompleteRateQuarterHb) ? 0 : (healtheduFillIncompleteRateQuarter - healtheduFillIncompleteRateQuarterHb) / healtheduFillIncompleteRateQuarterHb * 100;
+ $("#month_educaDefectQualHbRate").html(healtheduFillIncompleteQuarterHb + '%')
+ if(healtheduFillIncompleteQuarterHb >= 0){
+ $("#month_educaDefectQualHbArrow").css("color", "#d92323")
+ $("#month_educaDefectQualHbArrow").html("上升")
+ }else{
+ $("#month_educaDefectQualHbArrow").css("color", "#10d710")
+ $("#month_educaDefectQualHbArrow").html("下降")
+ }
+
+ var healtheduFillIncompleteQuarterTb = isEmpty(healtheduFillIncompleteRateQuarterYoy) ? 0 : (healtheduFillIncompleteRateQuarter - healtheduFillIncompleteRateQuarterYoy) / healtheduFillIncompleteRateQuarterYoy * 100;
+ $("#month_educaDefectQualTbRate").html(healtheduFillIncompleteQuarterTb + '%')
+ if(healtheduFillIncompleteQuarterTb >= 0){
+ $("#month_educaDefectQualTbArrow").css("color", "#d92323")
+ $("#month_educaDefectQualTbArrow").html("上升")
+ }else{
+ $("#month_educaDefectQualTbArrow").css("color", "#10d710")
+ $("#month_educaDefectQualTbArrow").html("下降")
+ }
+
+ /**
+ * 当前半年
+ */
+ //知情同意合格率
+ var informedconDocNosignRateHalfYear = data.informedconDocNosignRateHalfYear;
+ var informedconDocNosignRateHalfYearHb = data.informedconDocNosignRateHalfYearHb;
+ var informedconDocNosignRateHalfYearYoy = data.informedconDocNosignRateHalfYearYoy;
+
+ $("#halfyear_infoConQualRate").html(informedconDocNosignRateHalfYear + '%');
+ var informedconDocNosignHalfYearHb = isEmpty(informedconDocNosignRateHalfYearHb) ? 0 : (informedconDocNosignRateHalfYear - informedconDocNosignRateHalfYearHb) / informedconDocNosignRateHalfYearHb * 100;
+ $("#halfyear_infoConQualHbRate").html(informedconDocNosignHalfYearHb + '%')
+ if(informedconDocNosignHalfYearHb >= 0){
+ $("#halfyear_infoConQualHbArrow").css("color", "#d92323")
+ $("#halfyear_infoConQualHbArrow").html("上升")
+ }else{
+ $("#halfyear_infoConQualHbArrow").css("color", "#10d710")
+ $("#halfyear_infoConQualHbArrow").html("下降")
+ }
+
+ var informedconDocNosignHalfYearTb = isEmpty(informedconDocNosignRateHalfYearYoy) ? 0 : (informedconDocNosignRateHalfYear - informedconDocNosignRateHalfYearYoy) / informedconDocNosignRateHalfYearYoy * 100;
+ $("#halfyear_infoConQualTbRate").html(informedconDocNosignHalfYearTb + '%')
+ if(informedconDocNosignHalfYearTb >= 0){
+ $("#halfyear_infoConQualTbArrow").css("color", "#d92323")
+ $("#halfyear_infoConQualTbArrow").html("上升")
+ }else{
+ $("#halfyear_infoConQualTbArrow").css("color", "#10d710")
+ $("#halfyear_infoConQualTbArrow").html("下降")
+ }
+
+ //血净记录缺失率
+ var bloodFillIncompleteRateHalfYear = data.bloodFillIncompleteRateHalfYear;
+ var bloodFillIncompleteRateHalfYearHb = data.bloodFillIncompleteRateHalfYearHb;
+ var bloodFillIncompleteRateHalfYearYoy = data.bloodFillIncompleteRateHalfYearYoy;
+
+ $("#halfyear_bloodPurRate").html(bloodFillIncompleteRateHalfYear + '%');
+ var bloodFillIncompleteHalfYearHb = isEmpty(bloodFillIncompleteRateHalfYearHb) ? 0 : (bloodFillIncompleteRateHalfYear - bloodFillIncompleteRateHalfYearHb) / bloodFillIncompleteRateHalfYearHb * 100;
+ $("#halfyear_bloodPurHbRate").html(bloodFillIncompleteHalfYearHb + '%')
+ if(bloodFillIncompleteHalfYearHb >= 0){
+ $("#halfyear_bloodPurHbArrow").css("color", "#d92323")
+ $("#halfyear_bloodPurHbArrow").html("上升")
+ }else{
+ $("#halfyear_bloodPurHbArrow").css("color", "#10d710")
+ $("#halfyear_bloodPurHbArrow").html("下降")
+ }
+
+ var bloodFillIncompleteHalfYearTb = isEmpty(bloodFillIncompleteRateHalfYearYoy) ? 0 : (bloodFillIncompleteRateHalfYear - bloodFillIncompleteRateHalfYearYoy) / bloodFillIncompleteRateHalfYearYoy * 100;
+ $("#halfyear_bloodPurTbRate").html(bloodFillIncompleteHalfYearTb + '%')
+ if(bloodFillIncompleteHalfYearTb >= 0){
+ $("#halfyear_bloodPurTbArrow").css("color", "#d92323")
+ $("#halfyear_bloodPurTbArrow").html("上升")
+ }else{
+ $("#halfyear_bloodPurTbArrow").css("color", "#10d710")
+ $("#halfyear_bloodPurTbArrow").html("下降")
+ }
+
+ //健康教育缺失率
+ var healtheduFillIncompleteRateHalfYear = data.healtheduFillIncompleteRateHalfYear;
+ var healtheduFillIncompleteRateHalfYearHb = data.healtheduFillIncompleteRateHalfYearHb;
+ var healtheduFillIncompleteRateHalfYearYoy = data.healtheduFillIncompleteRateHalfYearYoy;
+
+ $("#halfyear_educaDefectRate").html(healtheduFillIncompleteRateHalfYear + '%');
+ var healtheduFillIncompleteHalfYearHb = isEmpty(healtheduFillIncompleteRateHalfYearHb) ? 0 : (healtheduFillIncompleteRateHalfYear - healtheduFillIncompleteRateHalfYearHb) / healtheduFillIncompleteRateHalfYearHb * 100;
+ $("#halfyear_educaDefectHbRate").html(healtheduFillIncompleteHalfYearHb + '%')
+ if(healtheduFillIncompleteHalfYearHb >= 0){
+ $("#halfyear_educaDefectHbArrow").css("color", "#d92323")
+ $("#halfyear_educaDefectHbArrow").html("上升")
+ }else{
+ $("#halfyear_educaDefectHbArrow").css("color", "#10d710")
+ $("#halfyear_educaDefectHbArrow").html("下降")
+ }
+
+ var healtheduFillIncompleteHalfYearTb = isEmpty(healtheduFillIncompleteRateHalfYearYoy) ? 0 : (healtheduFillIncompleteRateHalfYear - healtheduFillIncompleteRateHalfYearYoy) / healtheduFillIncompleteRateHalfYearYoy * 100;
+ $("#halfyear_educaDefectTbRate").html(healtheduFillIncompleteHalfYearTb + '%')
+ if(healtheduFillIncompleteHalfYearTb >= 0){
+ $("#halfyear_educaDefectTbArrow").css("color", "#d92323")
+ $("#halfyear_educaDefectTbArrow").html("上升")
+ }else{
+ $("#halfyear_educaDefectTbArrow").css("color", "#10d710")
+ $("#halfyear_educaDefectTbArrow").html("下降")
+ }
+
+ /**
+ * 当前一年
+ */
+ //知情同意合格率
+ var informedconDocNosignRateYear = data.informedconDocNosignRateYear;
+ var informedconDocNosignRateYearHb = data.informedconDocNosignRateYearHb;
+ var informedconDocNosignRateYearYoy = data.informedconDocNosignRateYearYoy;
+
+ $("#year_infoConQualRate").html(informedconDocNosignRateYear + '%');
+ var informedconDocNosignYearHb = isEmpty(informedconDocNosignRateYearHb) ? 0 : (informedconDocNosignRateYear - informedconDocNosignRateYearHb) / informedconDocNosignRateYearHb * 100;
+ $("#year_infoConQualHbRate").html(informedconDocNosignYearHb + '%')
+ if(informedconDocNosignYearHb >= 0){
+ $("#year_infoConQualHbArrow").css("color", "#d92323")
+ $("#year_infoConQualHbArrow").html("上升")
+ }else{
+ $("#year_infoConQualHbArrow").css("color", "#10d710")
+ $("#year_infoConQualHbArrow").html("下降")
+ }
+
+ var informedconDocNosignYearTb = isEmpty(informedconDocNosignRateYearYoy) ? 0 : (informedconDocNosignRateYear - informedconDocNosignRateYearYoy) / informedconDocNosignRateYearYoy * 100;
+ $("#year_infoConQualTbRate").html(informedconDocNosignYearTb + '%')
+ if(informedconDocNosignYearTb >= 0){
+ $("#year_infoConQualTbArrow").css("color", "#d92323")
+ $("#year_infoConQualTbArrow").html("上升")
+ }else{
+ $("#year_infoConQualTbArrow").css("color", "#10d710")
+ $("#year_infoConQualTbArrow").html("下降")
+ }
+
+ //血净记录缺失率
+ var bloodFillIncompleteRateYear = data.bloodFillIncompleteRateYear;
+ var bloodFillIncompleteRateYearHb = data.bloodFillIncompleteRateYearHb;
+ var bloodFillIncompleteRateYearYoy = data.bloodFillIncompleteRateYearYoy;
+
+ $("#year_bloodPurRate").html(bloodFillIncompleteRateYear + '%');
+ var bloodFillIncompleteYearHb = isEmpty(bloodFillIncompleteRateYearHb) ? 0 : (bloodFillIncompleteRateYear - bloodFillIncompleteRateYearHb) / bloodFillIncompleteRateYearHb * 100;
+ $("#year_bloodPurHbRate").html(bloodFillIncompleteYearHb + '%')
+ if(bloodFillIncompleteYearHb >= 0){
+ $("#year_bloodPurHbArrow").css("color", "#d92323")
+ $("#year_bloodPurHbArrow").html("上升")
+ }else{
+ $("#year_bloodPurHbArrow").css("color", "#10d710")
+ $("#year_bloodPurHbArrow").html("下降")
+ }
+
+ var bloodFillIncompleteYearTb = isEmpty(bloodFillIncompleteRateYearYoy) ? 0 : (bloodFillIncompleteRateYear - bloodFillIncompleteRateYearYoy) / bloodFillIncompleteRateYearYoy * 100;
+ $("#year_bloodPurTbRate").html(bloodFillIncompleteYearTb + '%')
+ if(bloodFillIncompleteYearTb >= 0){
+ $("#year_bloodPurTbArrow").css("color", "#d92323")
+ $("#year_bloodPurTbArrow").html("上升")
+ }else{
+ $("#year_bloodPurTbArrow").css("color", "#10d710")
+ $("#year_bloodPurTbArrow").html("下降")
+ }
+
+ //健康教育缺失率
+ var healtheduFillIncompleteRateYear = data.healtheduFillIncompleteRateYear;
+ var healtheduFillIncompleteRateYearHb = data.healtheduFillIncompleteRateYearHb;
+ var healtheduFillIncompleteRateYearYoy = data.healtheduFillIncompleteRateYearYoy;
+
+ $("#year_educaDefectRate").html(healtheduFillIncompleteRateYear + '%');
+ var healtheduFillIncompleteYearHb = isEmpty(healtheduFillIncompleteRateYearHb) ? 0 : (healtheduFillIncompleteRateYear - healtheduFillIncompleteRateYearHb) / healtheduFillIncompleteRateYearHb * 100;
+ $("#year_educaDefectHbRate").html(healtheduFillIncompleteYearHb + '%')
+ if(healtheduFillIncompleteYearHb >= 0){
+ $("#year_educaDefectHbArrow").css("color", "#d92323")
+ $("#year_educaDefectHbArrow").html("上升")
+ }else{
+ $("#year_educaDefectHbArrow").css("color", "#10d710")
+ $("#year_educaDefectHbArrow").html("下降")
+ }
+
+ var healtheduFillIncompleteYearTb = isEmpty(healtheduFillIncompleteRateYearYoy) ? 0 : (healtheduFillIncompleteRateYear - healtheduFillIncompleteRateYearYoy) / healtheduFillIncompleteRateYearYoy * 100;
+ $("#year_educaDefectTbRate").html(healtheduFillIncompleteYearTb + '%')
+ if(healtheduFillIncompleteYearTb >= 0){
+ $("#year_educaDefectTbArrow").css("color", "#d92323")
+ $("#year_educaDefectTbArrow").html("上升")
+ }else{
+ $("#year_educaDefectTbArrow").css("color", "#10d710")
+ $("#year_educaDefectTbArrow").html("下降")
+ }
}else{
- $("#quarter_infoConQualHbArrow").css("color", "#10d710")
- $("#quarter_infoConQualHbArrow").html("下降")
- }
-
- var informedconDocNosignTb = isEmpty(informedconDocNosignRateYoy) ? 0 : (informedconDocNosignRate - informedconDocNosignRateYoy) / informedconDocNosignRateYoy * 100;
- if(informedconDocNosignTb >= 0){
- $("#quarter_infoConQualTbArrow").css("color", "#d92323")
- $("#quarter_infoConQualTbArrow").html("上升")
- }else{
- $("#quarter_infoConQualTbRate").css("color", "#10d710")
- $("#quarter_infoConQualTbRate").html("下降")
- }
-
- //血净记录缺失率
- var bloodFillIncompleteRate = data.bloodFillIncompleteRate;
- var bloodFillIncompleteRateHb = data.bloodFillIncompleteRateHb;
- var bloodFillIncompleteRateYoy = data.bloodFillIncompleteRateYoy;
-
- $("#quarter_bloodPurRate").html(bloodFillIncompleteRate + '%');
- var bloodFillIncompleteHb = isEmpty(bloodFillIncompleteRateHb) ? 0 : (bloodFillIncompleteRate - bloodFillIncompleteRateHb) / bloodFillIncompleteRateHb * 100;
- $("#quarter_bloodPurHbRate").html(bloodFillIncompleteHb + '%')
- if(bloodFillIncompleteHb >= 0){
- $("#quarter_bloodPurHbArrow").css("color", "#d92323")
- $("#quarter_bloodPurHbArrow").html("上升")
- }else{
- $("#quarter_bloodPurHbArrow").css("color", "#10d710")
- $("#quarter_bloodPurHbArrow").html("下降")
- }
-
- var bloodFillIncompleteTb = isEmpty(bloodFillIncompleteRateYoy) ? 0 : (bloodFillIncompleteRate - bloodFillIncompleteRateYoy) / bloodFillIncompleteRateYoy * 100;
- $("#quarter_bloodPurTbRate").html(bloodFillIncompleteTb + '%')
- if(bloodFillIncompleteTb >= 0){
- $("#quarter_bloodPurTbArrow").css("color", "#d92323")
- $("#quarter_bloodPurTbArrow").html("上升")
- }else{
- $("#quarter_bloodPurTbArrow").css("color", "#10d710")
- $("#quarter_bloodPurTbArrow").html("下降")
- }
-
- //健康教育缺失率
- var healtheduFillIncompleteRate = data.healtheduFillIncompleteRate;
- var healtheduFillIncompleteRateHb = data.healtheduFillIncompleteRateHb;
- var healtheduFillIncompleteRateYoy = data.healtheduFillIncompleteRateYoy;
-
- $("#quarter_educaDefectRate").html(healtheduFillIncompleteRate + '%');
- var healtheduFillIncompleteHb = isEmpty(healtheduFillIncompleteRateHb) ? 0 : (healtheduFillIncompleteRate - healtheduFillIncompleteRateHb) / healtheduFillIncompleteRateHb * 100;
- $("#quarter_educaDefectHbRate").html(healtheduFillIncompleteHb + '%')
- if(healtheduFillIncompleteHb >= 0){
- $("#quarter_educaDefectHbArrow").css("color", "#d92323")
- $("#quarter_educaDefectHbArrow").html("上升")
- }else{
- $("#quarter_educaDefectHbArrow").css("color", "#10d710")
- $("#quarter_educaDefectHbArrow").html("下降")
- }
-
- var healtheduFillIncompleteTb = isEmpty(healtheduFillIncompleteRateYoy) ? 0 : (healtheduFillIncompleteRate - healtheduFillIncompleteRateYoy) / healtheduFillIncompleteRateYoy * 100;
- $("#quarter_educaDefectTbRate").html(healtheduFillIncompleteTb + '%')
- if(healtheduFillIncompleteTb >= 0){
- $("#quarter_educaDefectTbArrow").css("color", "#d92323")
- $("#quarter_educaDefectTbArrow").html("上升")
- }else{
- $("#quarter_educaDefectTbArrow").css("color", "#10d710")
- $("#quarter_educaDefectTbArrow").html("下降")
- }
-
- /**
- * 当季
- */
- //知情同意合格率
- var informedconDocNosignRateQuarter = data.informedconDocNosignRateQuarter;
- var informedconDocNosignRateQuarterHb = data.informedconDocNosignRateQuarterHb;
- var informedconDocNosignRateQuarterYoy = data.informedconDocNosignRateQuarterYoy;
-
- $("#month_infoConQualRate").html(informedconDocNosignRateQuarter + '%');
- var informedconDocNosignQuarterHb = isEmpty(informedconDocNosignRateQuarterHb) ? 0 : (informedconDocNosignRateQuarter - informedconDocNosignRateQuarterHb) / informedconDocNosignRateQuarterHb * 100;
- $("#month_infoConQualHbRate").html(informedconDocNosignQuarterHb + '%')
- if(informedconDocNosignQuarterHb >= 0){
- $("#month_infoConQualHbArrow").css("color", "#d92323")
- $("#month_infoConQualHbArrow").html("上升")
- }else{
- $("#month_infoConQualHbArrow").css("color", "#10d710")
- $("#month_infoConQualHbArrow").html("下降")
- }
-
- var informedconDocNosignQuarterTb = isEmpty(informedconDocNosignRateQuarterYoy) ? 0 : (informedconDocNosignRateQuarter - informedconDocNosignRateQuarterYoy) / informedconDocNosignRateQuarterYoy * 100;
- $("#month_infoConQualTbRate").html(informedconDocNosignQuarterTb + '%')
- if(informedconDocNosignQuarterTb >= 0){
- $("#month_infoConQualTbArrow").css("color", "#d92323")
- $("#month_infoConQualTbArrow").html("上升")
- }else{
- $("#month_infoConQualTbArrow").css("color", "#10d710")
- $("#month_infoConQualTbArrow").html("下降")
- }
-
- //血净记录缺失率
- var bloodFillIncompleteRateQuarter = data.bloodFillIncompleteRateQuarter;
- var bloodFillIncompleteRateQuarterHb = data.bloodFillIncompleteRateQuarterHb;
- var bloodFillIncompleteRateQuarterYoy = data.bloodFillIncompleteRateQuarterYoy;
-
- $("#month_bloodPurQualRate").html(bloodFillIncompleteRateQuarter + '%');
- var bloodFillIncompleteQuarterHb = isEmpty(bloodFillIncompleteRateQuarterHb) ? 0 : (bloodFillIncompleteRateQuarter - bloodFillIncompleteRateQuarterHb) / bloodFillIncompleteRateQuarterHb * 100;
- $("#month_bloodPurQualHbRate").html(bloodFillIncompleteQuarterHb + '%')
- if(bloodFillIncompleteQuarterHb >= 0){
- $("#month_bloodPurQualHbArrow").css("color", "#d92323")
- $("#month_bloodPurQualHbArrow").html("上升")
- }else{
- $("#month_bloodPurQualHbArrow").css("color", "#10d710")
- $("#month_bloodPurQualHbArrow").html("下降")
- }
-
- var bloodFillIncompleteQuarterTb = isEmpty(bloodFillIncompleteRateQuarterYoy) ? 0 : (bloodFillIncompleteRateQuarter - bloodFillIncompleteRateQuarterYoy) / bloodFillIncompleteRateQuarterYoy * 100;
- $("#month_bloodPurQualTbRate").html(bloodFillIncompleteQuarterTb + '%')
- if(bloodFillIncompleteQuarterTb >= 0){
- $("#month_bloodPurQualTbArrow").css("color", "#d92323")
- $("#month_bloodPurQualTbArrow").html("上升")
- }else{
- $("#month_bloodPurQualTbArrow").css("color", "#10d710")
- $("#month_bloodPurQualTbArrow").html("下降")
- }
-
- //健康教育缺失率
- var healtheduFillIncompleteRateQuarter = data.healtheduFillIncompleteRateQuarter;
- var healtheduFillIncompleteRateQuarterHb = data.healtheduFillIncompleteRateQuarterHb;
- var healtheduFillIncompleteRateQuarterYoy = data.healtheduFillIncompleteRateQuarterYoy;
-
- $("#month_educaDefectQualRate").html(healtheduFillIncompleteRateQuarter + '%');
- var healtheduFillIncompleteQuarterHb = isEmpty(healtheduFillIncompleteRateQuarterHb) ? 0 : (healtheduFillIncompleteRateQuarter - healtheduFillIncompleteRateQuarterHb) / healtheduFillIncompleteRateQuarterHb * 100;
- $("#month_educaDefectQualHbRate").html(healtheduFillIncompleteQuarterHb + '%')
- if(healtheduFillIncompleteQuarterHb >= 0){
- $("#month_educaDefectQualHbArrow").css("color", "#d92323")
- $("#month_educaDefectQualHbArrow").html("上升")
- }else{
- $("#month_educaDefectQualHbArrow").css("color", "#10d710")
- $("#month_educaDefectQualHbArrow").html("下降")
- }
-
- var healtheduFillIncompleteQuarterTb = isEmpty(healtheduFillIncompleteRateQuarterYoy) ? 0 : (healtheduFillIncompleteRateQuarter - healtheduFillIncompleteRateQuarterYoy) / healtheduFillIncompleteRateQuarterYoy * 100;
- $("#month_educaDefectQualTbRate").html(healtheduFillIncompleteQuarterTb + '%')
- if(healtheduFillIncompleteQuarterTb >= 0){
- $("#month_educaDefectQualTbArrow").css("color", "#d92323")
- $("#month_educaDefectQualTbArrow").html("上升")
- }else{
- $("#month_educaDefectQualTbArrow").css("color", "#10d710")
- $("#month_educaDefectQualTbArrow").html("下降")
- }
-
- /**
- * 当前半年
- */
- //知情同意合格率
- var informedconDocNosignRateHalfYear = data.informedconDocNosignRateHalfYear;
- var informedconDocNosignRateHalfYearHb = data.informedconDocNosignRateHalfYearHb;
- var informedconDocNosignRateHalfYearYoy = data.informedconDocNosignRateHalfYearYoy;
-
- $("#halfyear_infoConQualRate").html(informedconDocNosignRateHalfYear + '%');
- var informedconDocNosignHalfYearHb = isEmpty(informedconDocNosignRateHalfYearHb) ? 0 : (informedconDocNosignRateHalfYear - informedconDocNosignRateHalfYearHb) / informedconDocNosignRateHalfYearHb * 100;
- $("#halfyear_infoConQualHbRate").html(informedconDocNosignHalfYearHb + '%')
- if(informedconDocNosignHalfYearHb >= 0){
- $("#halfyear_infoConQualHbArrow").css("color", "#d92323")
- $("#halfyear_infoConQualHbArrow").html("上升")
- }else{
- $("#halfyear_infoConQualHbArrow").css("color", "#10d710")
- $("#halfyear_infoConQualHbArrow").html("下降")
- }
-
- var informedconDocNosignHalfYearTb = isEmpty(informedconDocNosignRateHalfYearYoy) ? 0 : (informedconDocNosignRateHalfYear - informedconDocNosignRateHalfYearYoy) / informedconDocNosignRateHalfYearYoy * 100;
- $("#halfyear_infoConQualTbRate").html(informedconDocNosignHalfYearTb + '%')
- if(informedconDocNosignHalfYearTb >= 0){
- $("#halfyear_infoConQualTbArrow").css("color", "#d92323")
- $("#halfyear_infoConQualTbArrow").html("上升")
- }else{
- $("#halfyear_infoConQualTbArrow").css("color", "#10d710")
- $("#halfyear_infoConQualTbArrow").html("下降")
- }
-
- //血净记录缺失率
- var bloodFillIncompleteRateHalfYear = data.bloodFillIncompleteRateHalfYear;
- var bloodFillIncompleteRateHalfYearHb = data.bloodFillIncompleteRateHalfYearHb;
- var bloodFillIncompleteRateHalfYearYoy = data.bloodFillIncompleteRateHalfYearYoy;
-
- $("#halfyear_bloodPurRate").html(bloodFillIncompleteRateHalfYear + '%');
- var bloodFillIncompleteHalfYearHb = isEmpty(bloodFillIncompleteRateHalfYearHb) ? 0 : (bloodFillIncompleteRateHalfYear - bloodFillIncompleteRateHalfYearHb) / bloodFillIncompleteRateHalfYearHb * 100;
- $("#halfyear_bloodPurHbRate").html(bloodFillIncompleteHalfYearHb + '%')
- if(bloodFillIncompleteHalfYearHb >= 0){
- $("#halfyear_bloodPurHbArrow").css("color", "#d92323")
- $("#halfyear_bloodPurHbArrow").html("上升")
- }else{
- $("#halfyear_bloodPurHbArrow").css("color", "#10d710")
- $("#halfyear_bloodPurHbArrow").html("下降")
- }
-
- var bloodFillIncompleteHalfYearTb = isEmpty(bloodFillIncompleteRateHalfYearYoy) ? 0 : (bloodFillIncompleteRateHalfYear - bloodFillIncompleteRateHalfYearYoy) / bloodFillIncompleteRateHalfYearYoy * 100;
- $("#halfyear_bloodPurTbRate").html(bloodFillIncompleteHalfYearTb + '%')
- if(bloodFillIncompleteHalfYearTb >= 0){
- $("#halfyear_bloodPurTbArrow").css("color", "#d92323")
- $("#halfyear_bloodPurTbArrow").html("上升")
- }else{
- $("#halfyear_bloodPurTbArrow").css("color", "#10d710")
- $("#halfyear_bloodPurTbArrow").html("下降")
- }
-
- //健康教育缺失率
- var healtheduFillIncompleteRateHalfYear = data.healtheduFillIncompleteRateHalfYear;
- var healtheduFillIncompleteRateHalfYearHb = data.healtheduFillIncompleteRateHalfYearHb;
- var healtheduFillIncompleteRateHalfYearYoy = data.healtheduFillIncompleteRateHalfYearYoy;
-
- $("#halfyear_educaDefectRate").html(healtheduFillIncompleteRateHalfYear + '%');
- var healtheduFillIncompleteHalfYearHb = isEmpty(healtheduFillIncompleteRateHalfYearHb) ? 0 : (healtheduFillIncompleteRateHalfYear - healtheduFillIncompleteRateHalfYearHb) / healtheduFillIncompleteRateHalfYearHb * 100;
- $("#halfyear_educaDefectHbRate").html(healtheduFillIncompleteHalfYearHb + '%')
- if(healtheduFillIncompleteHalfYearHb >= 0){
- $("#halfyear_educaDefectHbArrow").css("color", "#d92323")
- $("#halfyear_educaDefectHbArrow").html("上升")
- }else{
- $("#halfyear_educaDefectHbArrow").css("color", "#10d710")
- $("#halfyear_educaDefectHbArrow").html("下降")
- }
-
- var healtheduFillIncompleteHalfYearTb = isEmpty(healtheduFillIncompleteRateHalfYearYoy) ? 0 : (healtheduFillIncompleteRateHalfYear - healtheduFillIncompleteRateHalfYearYoy) / healtheduFillIncompleteRateHalfYearYoy * 100;
- $("#halfyear_educaDefectTbRate").html(healtheduFillIncompleteHalfYearTb + '%')
- if(healtheduFillIncompleteHalfYearTb >= 0){
- $("#halfyear_educaDefectTbArrow").css("color", "#d92323")
- $("#halfyear_educaDefectTbArrow").html("上升")
- }else{
- $("#halfyear_educaDefectTbArrow").css("color", "#10d710")
- $("#halfyear_educaDefectTbArrow").html("下降")
- }
-
- /**
- * 当前一年
- */
- //知情同意合格率
- var informedconDocNosignRateYear = data.informedconDocNosignRateYear;
- var informedconDocNosignRateYearHb = data.informedconDocNosignRateYearHb;
- var informedconDocNosignRateYearYoy = data.informedconDocNosignRateYearYoy;
-
- $("#year_infoConQualRate").html(informedconDocNosignRateYear + '%');
- var informedconDocNosignYearHb = isEmpty(informedconDocNosignRateYearHb) ? 0 : (informedconDocNosignRateYear - informedconDocNosignRateYearHb) / informedconDocNosignRateYearHb * 100;
- $("#year_infoConQualHbRate").html(informedconDocNosignYearHb + '%')
- if(informedconDocNosignYearHb >= 0){
- $("#year_infoConQualHbArrow").css("color", "#d92323")
- $("#year_infoConQualHbArrow").html("上升")
- }else{
- $("#year_infoConQualHbArrow").css("color", "#10d710")
- $("#year_infoConQualHbArrow").html("下降")
- }
-
- var informedconDocNosignYearTb = isEmpty(informedconDocNosignRateYearYoy) ? 0 : (informedconDocNosignRateYear - informedconDocNosignRateYearYoy) / informedconDocNosignRateYearYoy * 100;
- $("#year_infoConQualTbRate").html(informedconDocNosignYearTb + '%')
- if(informedconDocNosignYearTb >= 0){
- $("#year_infoConQualTbArrow").css("color", "#d92323")
- $("#year_infoConQualTbArrow").html("上升")
- }else{
- $("#year_infoConQualTbArrow").css("color", "#10d710")
- $("#year_infoConQualTbArrow").html("下降")
- }
-
- //血净记录缺失率
- var bloodFillIncompleteRateYear = data.bloodFillIncompleteRateYear;
- var bloodFillIncompleteRateYearHb = data.bloodFillIncompleteRateYearHb;
- var bloodFillIncompleteRateYearYoy = data.bloodFillIncompleteRateYearYoy;
-
- $("#year_bloodPurRate").html(bloodFillIncompleteRateYear + '%');
- var bloodFillIncompleteYearHb = isEmpty(bloodFillIncompleteRateYearHb) ? 0 : (bloodFillIncompleteRateYear - bloodFillIncompleteRateYearHb) / bloodFillIncompleteRateYearHb * 100;
- $("#year_bloodPurHbRate").html(bloodFillIncompleteYearHb + '%')
- if(bloodFillIncompleteYearHb >= 0){
- $("#year_bloodPurHbArrow").css("color", "#d92323")
- $("#year_bloodPurHbArrow").html("上升")
- }else{
- $("#year_bloodPurHbArrow").css("color", "#10d710")
- $("#year_bloodPurHbArrow").html("下降")
- }
-
- var bloodFillIncompleteYearTb = isEmpty(bloodFillIncompleteRateYearYoy) ? 0 : (bloodFillIncompleteRateYear - bloodFillIncompleteRateYearYoy) / bloodFillIncompleteRateYearYoy * 100;
- $("#year_bloodPurTbRate").html(bloodFillIncompleteYearTb + '%')
- if(bloodFillIncompleteYearTb >= 0){
- $("#year_bloodPurTbArrow").css("color", "#d92323")
- $("#year_bloodPurTbArrow").html("上升")
- }else{
- $("#year_bloodPurTbArrow").css("color", "#10d710")
- $("#year_bloodPurTbArrow").html("下降")
- }
-
- //健康教育缺失率
- var healtheduFillIncompleteRateYear = data.healtheduFillIncompleteRateYear;
- var healtheduFillIncompleteRateYearHb = data.healtheduFillIncompleteRateYearHb;
- var healtheduFillIncompleteRateYearYoy = data.healtheduFillIncompleteRateYearYoy;
-
- $("#year_educaDefectRate").html(healtheduFillIncompleteRateYear + '%');
- var healtheduFillIncompleteYearHb = isEmpty(healtheduFillIncompleteRateYearHb) ? 0 : (healtheduFillIncompleteRateYear - healtheduFillIncompleteRateYearHb) / healtheduFillIncompleteRateYearHb * 100;
- $("#year_educaDefectHbRate").html(healtheduFillIncompleteYearHb + '%')
- if(healtheduFillIncompleteYearHb >= 0){
- $("#year_educaDefectHbArrow").css("color", "#d92323")
- $("#year_educaDefectHbArrow").html("上升")
- }else{
- $("#year_educaDefectHbArrow").css("color", "#10d710")
- $("#year_educaDefectHbArrow").html("下降")
- }
-
- var healtheduFillIncompleteYearTb = isEmpty(healtheduFillIncompleteRateYearYoy) ? 0 : (healtheduFillIncompleteRateYear - healtheduFillIncompleteRateYearYoy) / healtheduFillIncompleteRateYearYoy * 100;
- $("#year_educaDefectTbRate").html(healtheduFillIncompleteYearTb + '%')
- if(healtheduFillIncompleteYearTb >= 0){
- $("#year_educaDefectTbArrow").css("color", "#d92323")
- $("#year_educaDefectTbArrow").html("上升")
- }else{
- $("#year_educaDefectTbArrow").css("color", "#10d710")
- $("#year_educaDefectTbArrow").html("下降")
+ toastr.warning("暂无数据");
}
} else {
toastr.warning(data.msg);
diff --git a/src/main/webapp/static/js/recordManage/bloodPurification/searchBloodCommomMethodqf.js b/src/main/webapp/static/js/recordManage/bloodPurification/searchBloodCommomMethodqf.js
index 7d9d018..3d6a3e1 100644
--- a/src/main/webapp/static/js/recordManage/bloodPurification/searchBloodCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/bloodPurification/searchBloodCommomMethodqf.js
@@ -299,43 +299,39 @@ function camelToSnake(str) {
function exportExcel() {
getChecked();
var checks = $("#checks").val();
- if ($("#rows").val() > 5000 && checks == '') {
- toastr.warning("数据量大,暂提供5000条以内数据导出!");
+ getSql();
+ var tableThNames = $("#tableThNames").val();
+ var fieldCns = $("#fieldCns").val();
+ if (checks != '') {
+ //按选择框选择导出
+ checks = checks.substring(0, checks.length - 1);
+ var whereSql = ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')';
+ var url = path + "/template/exportExcel";
+ post(url, {
+ "selectSql": $("#englishFields").val(),
+ "fromTableSql": $("#fromTableSql").val(),
+ "whereSql": whereSql,
+ "tableThNames": tableThNames,
+ "fieldCns": fieldCns,
+ });
} else {
- getSql();
- var tableThNames = $("#tableThNames").val();
- var fieldCns = $("#fieldCns").val();
- if (checks != '') {
- //按选择框选择导出
- checks = checks.substring(0, checks.length - 1);
- var whereSql = ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')';
- var url = path + "/template/exportExcel";
- post(url, {
- "selectSql": $("#englishFields").val(),
- "fromTableSql": $("#fromTableSql").val(),
- "whereSql": whereSql,
- "tableThNames": tableThNames,
- "fieldCns": fieldCns,
- });
- } else {
- Common.confirm({
- title: "提示",
- message: "没有选中，您确定要按搜索栏条件导出?",
- operate: function (reselt) {
- if (reselt) {
- var url = path + "/template/exportExcel";
- post(url, {
- "selectSql": $("#englishFields").val(),
- "fromTableSql": $("#fromTableSql").val(),
- "whereSql": $("#whereSql").val(),
- "orderBys": $("#orderBys").val(),
- "tableThNames": tableThNames,
- "fieldCns": fieldCns
- });
- }
+ Common.confirm({
+ title: "提示",
+ message: "没有选中，您确定要按搜索栏条件导出?",
+ operate: function (reselt) {
+ if (reselt) {
+ var url = path + "/template/exportExcel";
+ post(url, {
+ "selectSql": $("#englishFields").val(),
+ "fromTableSql": $("#fromTableSql").val(),
+ "whereSql": $("#whereSql").val(),
+ "orderBys": $("#orderBys").val(),
+ "tableThNames": tableThNames,
+ "fieldCns": fieldCns
+ });
}
- })
- }
+ }
+ })
}
}
function btn(){
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index a2624ce..1a806bf 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -33,7 +33,7 @@ function initDatePicker() {
}
function initialization(){
initQueryCondition();
- search()
+ //search()
// $.ajax({
// type: 'get',
// url: path + '/commom/getInitialization',
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
index 85d0af4..b613696 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js
@@ -27,7 +27,12 @@ var menu = {
$.ajax({
type: "post",
url: path + "/commom/getBloodRecordTree",
- data: {patientId: $("#patientId").val(), typeId: $("#typeId").val()},
+ data:
+ {
+ patientId: $("#patientId").val(),
+ typeId: $("#typeId").val(),
+ sortFlag: $("#sortFlag").val(),
+ },
dataType: "json",
success: function (data) {
$("#assortIds").val("");
@@ -37,9 +42,17 @@ var menu = {
//图片来源集合
var sources = '';
for (var i = 0; i < data.length; i++) {
- if (data[i].parentId != null && data[i].parentId != 1 && data[i].checked == 'true') {
- scanPages += data[i].assortName + ",";
- sources += data[i].source + ",";
+ if (data[i].parentId != null && data[i].checked == 'true') {
+ // 检查 assortName 是否存在且非空
+ var assortNameValue = data[i].assortName ? data[i].assortName.trim() : '';
+ if (assortNameValue) {
+ scanPages += assortNameValue + ",";
+ }
+
+ var sourceValue = data[i].source ? data[i].source.trim() : '';
+ if (sourceValue) {
+ sources += sourceValue + ",";
+ }
}
}
//去掉后面逗号
@@ -80,14 +93,19 @@ function onCheck(e, treeId, treeNode) {
var assortIds = '';
var sources = '';
for (var i = 0; i < nodes.length; i++) {
- if (nodes[i].level == 2) {
- if (i != (nodes.length - 1)) {
- assortIds += nodes[i].assortName + ",";
- sources += +nodes[i].source + ",";
- } else {
- assortIds += nodes[i].assortName + "";
- sources += nodes[i].source;
+ var assortName = nodes[i].assortName || "";
+ var source = nodes[i].source || "";
+
+ if (i != (nodes.length - 1)) {
+ if(assortName != ''){
+ assortIds += assortName + ",";
+ }
+ if(source != ''){
+ sources += source + ",";
}
+ } else {
+ assortIds += assortName;
+ sources += source;
}
}
$("#assortIds").val(assortIds);
@@ -98,21 +116,25 @@ function onCheck(e, treeId, treeNode) {
function onClick(e, treeId, treeNode) {
var treeLevel = treeNode.level;
//选中图片节点时
- if (treeLevel == 2) {
- //图片集合
- var scanPages = treeNode.assortName;
- //来源集合
- var sources = treeNode.source;
- $("#assortIdByClick").val(scanPages);
- $("#sourceByClick").val(sources);
- onloadPdf(scanPages, sources);
- }
+ //图片集合
+ var scanPages = treeNode.assortName;
+ //来源集合
+ var sources = treeNode.source;
+ $("#assortIdByClick").val(scanPages);
+ $("#sourceByClick").val(sources);
+ onloadPdf(scanPages, sources);
};
//打印分类变更事件
$("#typeId").change(function () {
- menu.loadMenuTree();
+
})
+//按原件排序
+function pdfSorting(value) {
+ $("#sortFlag").val(value);
+ menu.loadMenuTree();
+}
+
//树复选框选中后加载pdf按钮
function onloadPdfMethod() {
var scanPages = $("#assortIds").val();
@@ -409,13 +431,17 @@ function sure() {
//删除图片
function delPic() {
+ var patientId = $("#patientId").val();
+ var assortIds = $("#assortIds").val();
+ if(assortIds == '' || assortIds == null){
+ toastr.warning("请先勾选所要删除的图片");
+ return;
+ }
Common.confirm({
title: "提示",
message: "确认将左侧树选中的图片删除?",
operate: function (reselt) {
if (reselt) {
- var patientId = $("#patientId").val();
- var assortIds = $("#assortIds").val();
if (assortIds != '') {
$.ajax({
type: 'post',
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
index c0038af..730d894 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -340,9 +340,9 @@ function camelToSnake(str) {
function exportExcel() {
getChecked();
var checks = $("#checks").val();
- if ($("#rows").val() > 5000 && checks == '') {
- toastr.warning("数据量大,暂提供5000条以内数据导出!");
- } else {
+ // if ($("#rows").val() > 5000 && checks == '') {
+ // toastr.warning("数据量大,暂提供5000条以内数据导出!");
+ // } else {
getSql();
var tableThNames = $("#tableThNames").val();
var fieldCns = $("#fieldCns").val();
@@ -377,7 +377,7 @@ function exportExcel() {
}
})
}
- }
+ //}
}
function btn(){
var url = path + "/printInfoList/pageUI174";