结算单上传优化

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/AutoUploadBillDao.java

@@ -37,8 +37,8 @@ public interface AutoUploadBillDao extends BaseMapper<AutoUploadBill> {
             " )" +
             "</script>")
     void deleteVisitId(List<String> visitIds);
-    @Select("select max(created_date) created_date from t_auto_upload_bill " +
-            " where  pat_no =#{patNo} and times =#{times} and ledger_sn =#{ledgerSn}"
+    @Select("select min(created_date) created_date from t_auto_upload_bill " +
+            " where flag='1' and  pat_no =#{patNo} and times =#{times} and ledger_sn =#{ledgerSn}"
             )
     Date getLastUpdateTime(@Param("patNo") String patNo, @Param("times")Integer times, @Param("ledgerSn")Integer ledgerSn);
     @Select("select top ${pageSize} *  from ("+

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -1379,7 +1379,7 @@ public class SetlListUpldService {
         String[] title = {"姓名", "审核状态","质控提醒","上传截止日期","上传状态", "申报类型", "出院科室", "住院号/门诊号", "性别",
                 "住院天数", "诊断编码", "诊断名称", "治疗方式", "总费用", "报销金额",
                 "险种类型", "人员类别", "结算时间", "医疗类别", "清算机构", "参保地",
-                "管床医生", "转科室", "转科次数", "申请备注"};
+                "管床医生", "转科室", "转科次数", "申请备注","编码员备注"};
         String[][] content = new String[list.size()][];
         for (int i = 0; i < list.size(); i++) {
             content[i] = new String[title.length];
@@ -1409,6 +1409,7 @@ public class SetlListUpldService {
             content[i][22] = pojo.getZhuanKeName() == null ? "" : pojo.getZhuanKeName().toString();
             content[i][23] = pojo.getZhuanKeAmount() == null ? "" : pojo.getZhuanKeAmount().toString();
             content[i][24] = pojo.getReqRemark();
+            content[i][25] = pojo.getBmyBz();
         }
         //传三个参数 一个是 固定的 response ，excel的头部信息，excel的内容
         ExcelUtil.exportExcel(response, title, content);