优化合同管理的导出功能

src/main/java/cn/hnthyy/thmz/Utils/ExcelUtil.java

@@ -569,7 +569,7 @@ public class ExcelUtil {
         data.put(FILE_NAME_KEY, "收费清单.xls");
         List<Map<String, Object>> heads = new ArrayList<>();
         Map<String, Object> map0 = new HashMap<>();
-        String[] head0 = {"病人ID", "机制号", "退欠标识", "金额", "发票号", "付款方式", "收费日期"};
+        String[] head0 = {"病人ID", "机制号", "退欠标识", "金额", "发票号", "付款方式", "收费日期", "项目名称"};
         String[] headNum0 = {"0,0,0,0"};
         map0.put(HEAD_ARR_KEY, head0);
         map0.put(HEAD_NUM_KEY, headNum0);
@@ -584,7 +584,8 @@ public class ExcelUtil {
                         chargeFeeVo.getTotalCharge().setScale(2, BigDecimal.ROUND_HALF_UP).toString(),
                         chargeFeeVo.getReceiptBill(),
                         chargeFeeVo.getChequeType(),
-                        DateFormatUtils.format(chargeFeeVo.getChargeDate(), "yyyy-MM-dd HH:mm:ss")
+                        DateFormatUtils.format(chargeFeeVo.getChargeDate(), "yyyy-MM-dd HH:mm:ss"),
+                        chargeFeeVo.getContractName()
                 };
                 arr.add(temp);
             }

src/main/resources/static/js/mz/clinic.js

@@ -1514,14 +1514,46 @@ function editPrescription(jsonData, type) {
         $("#personalHistory").val(jsonData.mzBlRecord.personalHistory);
         $("#familyHistory").val(jsonData.mzBlRecord.familyHistory);
         $("#obstericalHistory").val(jsonData.mzBlRecord.obstericalHistory);
-        $("#weight").val(jsonData.mzBlRecord.weight);
-        $("#temperature").val(jsonData.mzBlRecord.temperature);
-        $("#sphygmus").val(jsonData.mzBlRecord.sphygmus);
-        $("#breathe").val(jsonData.mzBlRecord.breathe);
-        $("#pressure_high").val(jsonData.mzBlRecord.pressureHigh);
-        $("#pressure_floor").val(jsonData.mzBlRecord.pressureFloor);
-        $("#pressure_high_left").val(jsonData.mzBlRecord.pressureHighLeft);
-        $("#pressure_floor_left").val(jsonData.mzBlRecord.pressureFloorLeft);
+        if(jsonData.mzBlRecord.weight!=null && jsonData.mzBlRecord.weight!=0){
+            $("#weight").val(jsonData.mzBlRecord.weight);
+        }else {
+            $("#weight").val("");
+        }
+        if(jsonData.mzBlRecord.temperature!=null && jsonData.mzBlRecord.temperature!=0){
+            $("#temperature").val(jsonData.mzBlRecord.temperature);
+        }else {
+            $("#temperature").val("");
+        }
+        if(jsonData.mzBlRecord.sphygmus!=null && jsonData.mzBlRecord.sphygmus!=0){
+            $("#sphygmus").val(jsonData.mzBlRecord.sphygmus);
+        }else {
+            $("#sphygmus").val("");
+        }
+        if(jsonData.mzBlRecord.breathe!=null && jsonData.mzBlRecord.breathe!=0){
+            $("#breathe").val(jsonData.mzBlRecord.breathe);
+        }else {
+            $("#breathe").val("");
+        }
+        if(jsonData.mzBlRecord.pressureHigh!=null && jsonData.mzBlRecord.pressureHigh!=0){
+            $("#pressure_high").val(jsonData.mzBlRecord.pressureHigh);
+        }else {
+            $("#pressure_high").val("");
+        }
+        if(jsonData.mzBlRecord.pressureFloor!=null && jsonData.mzBlRecord.pressureFloor!=0){
+            $("#pressure_floor").val(jsonData.mzBlRecord.pressureFloor);
+        }else {
+            $("#pressure_floor").val("");
+        }
+        if(jsonData.mzBlRecord.pressureHighLeft!=null && jsonData.mzBlRecord.pressureHighLeft!=0){
+            $("#pressure_high_left").val(jsonData.mzBlRecord.pressureHighLeft);
+        }else {
+            $("#pressure_high_left").val("");
+        }
+        if(jsonData.mzBlRecord.pressureFloorLeft!=null && jsonData.mzBlRecord.pressureFloorLeft!=0){
+            $("#pressure_floor_left").val(jsonData.mzBlRecord.pressureFloorLeft);
+        }else {
+            $("#pressure_floor_left").val("");
+        }
         $("#tentativeDiagnosis").val(jsonData.mzBlRecord.tentativeDiagnosis);
         $("#otherCheck").val(jsonData.mzBlRecord.emrPe);
         var icdCode = jsonData.icdCode;