Browse Source

已上传提醒优化

lihong 2 years ago
parent
commit
0fdc338b65

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/AutoUploadBillDao.java

@@ -37,7 +37,7 @@ 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}" +
-            " group by pat_no,times,ledger_sn")
+            " where  pat_no =#{patNo} and times =#{times} and ledger_sn =#{ledgerSn}"
+            )
     Date getLastUpdateTime(@Param("patNo") String patNo, @Param("times")Integer times, @Param("ledgerSn")Integer ledgerSn);
 }

+ 6 - 4
src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -1135,11 +1135,13 @@ public class SetlListUpldService {
         if(StringUtil.notBlank(setlListId)){
          Date lastUpdateTimeime = autoUploadBillService.getLastUpdateTime(patNo,times,ledgerSn);
          if(lastUpdateTimeime !=null){
-             int diff = DateUtil.daysBetween(new Date(), lastUpdateTimeime);
-             if(diff > 5 ){
-                 return "已上传超过【5】天后,医保不能重新上传数据";
+             Date now = new Date();
+             int temp = (int)cn.hutool.core.date.DateUtil.betweenDay(lastUpdateTimeime, now, true);
+             int diff= 5-temp ==0 ? 1 : 5-temp;
+             if(diff < 0 ){
+                 return "已上传超过【5】天,医保不能重新上传数据";
              }else {
-                 return "上传后还剩【"+(diff)+"】天,医保将不能重新上传数据,要修改请尽快";
+                 return "上传后还剩【"+diff+"】天,医保将不能重新上传数据,要修改请尽快";
              }
          }
         }