增加上传截止倒数天数查询条件

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SetlListUpldController.java

@@ -368,4 +368,10 @@ public class SetlListUpldController {
         service.saveSetlDeptConfInfo(list);
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION,"保存成功!");
     }
+
+
+    @GetMapping("/getUploadMaxDay")
+    public ResultVo<Integer> getUploadMaxDay() {
+        return service.getUploadMaxDay();
+    }
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/ZyInactpatient.java

@@ -117,6 +117,10 @@ public class ZyInactpatient implements Serializable {
      * disDept
      */
     private String disDept;
+    /**
+     * 出院科室名称
+     */
+    private String outDeptName;
 
     /**
      * disWard

src/main/java/thyyxxk/webserver/entity/querydata/JieSuanDanChaXun.java

@@ -77,7 +77,7 @@ public class JieSuanDanChaXun {
     /**
      * 上传截止时间倒数天数
      */
-    private Integer uploadJieZhiDay;
+    private List<Integer> uploadJieZhiDay;
 
     private List<SiSetlinfoTemp> siSetlinfoTemps;
 

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

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.service.medicalinsurance;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.ReflectUtil;
 import com.alibaba.fastjson.JSON;
@@ -943,7 +944,7 @@ public class SetlListUpldService {
         String result = "";
         Date now = new Date();
         int days = Integer.parseInt(dictValue);
-        int diffDay = DateUtil.daysBetween(now, setlTime);
+        long diffDay = cn.hutool.core.date.DateUtil.betweenDay(setlTime, now, true);
         if (StringUtil.isBlank(setlListId)) {
             //未上传
             if (diffDay < days) {
@@ -1020,11 +1021,19 @@ public class SetlListUpldService {
         if (StringUtil.notBlank(param.getReferPhysician())) {
             qw.eq("b.refer_physician", param.getReferPhysician());
         }
-        if (param.getUploadJieZhiDay() != null) {
+        if (ListUtil.notBlank(param.getUploadJieZhiDay())) {
             Integer value = Integer.parseInt(day);
-            Integer result = value - param.getUploadJieZhiDay();
-            result = result==0?1:result;
-            qw.apply(" DATEDIFF(day,a.setl_time,GETDATE()) = {0}",result);
+            StringBuilder result = new StringBuilder();
+            for (int i = 0; i < param.getUploadJieZhiDay().size(); i++) {
+               Integer temp = value-param.getUploadJieZhiDay().get(i);
+                if(i >= param.getUploadJieZhiDay().size()-1){
+                    result.append(temp);
+                }else {
+                    result.append(temp);
+                    result.append(",");
+                }
+            }
+            qw.inSql(" DATEDIFF(day,a.setl_time,GETDATE()) ",result.toString());
         }
         return qw;
     }
@@ -1355,7 +1364,7 @@ public class SetlListUpldService {
         }
         dao.shenBao(param.getOperation(), param.getDecType(), param.getInpatientNo(), param.getAdmissTimes());
         if(!"1".equals(param.getSaveAuditPassFlag())){
-            tSetlDeptConfService.asynSendAuditMessge(param.getDisDept(),param.getName(),param.getInpatientNo());
+            tSetlDeptConfService.asynSendAuditMessge(param.getDisDept(),param.getOutDeptName(),param.getName(),param.getInpatientNo());
         }
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "保存成功。");
     }
@@ -2145,4 +2154,10 @@ public class SetlListUpldService {
         tSetlDeptConfService.remove(delWrapper);
         tSetlDeptConfService.batchSaveData(data);
     }
+
+    public ResultVo<Integer> getUploadMaxDay() {
+        String temp = dao.getDictValueByDictName("1.1", "1");
+        Integer day =  NumberUtil.isInteger(temp) ? Integer.parseInt(temp) : 7;
+        return ResultVoUtil.success(day);
+    }
 }

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

@@ -48,7 +48,7 @@ public class TSetlDeptConfService extends ServiceImpl<TSetlDeptConfDao, TSetlDep
      * @param: patNo
      **/
     @Async
-    public void asynSendAuditMessge(String deptCode,String name,String patNo){
+    public void asynSendAuditMessge(String deptCode,String deptName,String name,String patNo){
         QueryWrapper<TSetlDeptConf> queryWrapper = new QueryWrapper();
         queryWrapper.eq("dept_code",deptCode);
         queryWrapper.eq("type_flag",1);
@@ -64,7 +64,7 @@ public class TSetlDeptConfService extends ServiceImpl<TSetlDeptConfDao, TSetlDep
         }
         if(CollUtil.isNotEmpty(codeRs)){
             codeRs.forEach(code->{
-                sendWxInfoService.sendCorpWxMsg(code, String.format("医保结算单上传\n发起申请审核\n患者姓名：【%s】\n住院号：【%s】\n", name,patNo));
+                sendWxInfoService.sendCorpWxMsg(code, String.format("医保结算单上传\n发起申请审核\n患者姓名：【%s】\n住院号：【%s】\n出院科室：【%s】", name,patNo,deptName));
             });
         }
     }