收费列表增加合同编号

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,8 +584,9 @@ 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"),
-                        chargeFeeVo.getContractName()
+                        chargeFeeVo.getChargeDate()!=null?DateFormatUtils.format(chargeFeeVo.getChargeDate(), "yyyy-MM-dd HH:mm:ss"):"",
+                        chargeFeeVo.getContractName(),
+                        chargeFeeVo.getContractNo()
                 };
                 arr.add(temp);
             }

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/ChargeFeeVoServiceImpl.java

@@ -71,6 +71,7 @@ public class ChargeFeeVoServiceImpl implements ChargeFeeVoService {
                     continue;
                 }
                 chargeFeeVo.setContractName(cooperativeEnterprise.getProjectName());
+                chargeFeeVo.setContractNo(cooperativeEnterprise.getContractNo());
             }
         }
     }

src/main/java/cn/hnthyy/thmz/vo/ChargeFeeVo.java

@@ -32,4 +32,6 @@ public class ChargeFeeVo {
     private Long contractId;
     //合同名称
     private String contractName;
+    //合同编号
+    private String contractNo;
 }

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

@@ -701,6 +701,11 @@ function getsfqd() {
                 title: '项目名称',
                 align: "center",
                 valign: 'middle'
+            }, {
+                field: 'contractNo',
+                title: '合同编号',
+                align: "center",
+                valign: 'middle'
             }
         ],
         responseHandler: function (res) {

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

@@ -711,6 +711,12 @@ function getsfqd() {
                 align: "center",
                 valign: 'middle'
             }
+            , {
+                field: 'contractN0',
+                title: '合同编号',
+                align: "center",
+                valign: 'middle'
+            }
         ],
         responseHandler: function (res) {
             if (res == '401' || res == 401) {

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

@@ -857,6 +857,11 @@ function getsfqd() {
                 title: '项目名称',
                 align: "center",
                 valign: 'middle'
+            }, {
+                field: 'contractNo',
+                title: '合同编号',
+                align: "center",
+                valign: 'middle'
             }
         ],
         responseHandler: function (res) {