Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/entity/casefrontsheet/request/SheetOverview.java

@@ -25,6 +25,7 @@ public class SheetOverview {
     private Date signDate;
     private Integer lateDays;
     private Integer lateFlag;
+    private Boolean renew;
 
     public Integer getLateDays() {
         if (null == lateDays) return 0;
@@ -55,4 +56,8 @@ public class SheetOverview {
     public Integer getInOutFlag() {
         return null == inOutFlag ? 1 : inOutFlag;
     }
+
+    public Boolean getRenew() {
+        return null != renew && renew;
+    }
 }

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -33,6 +33,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -216,6 +217,9 @@ public class CaseFrontSheetMainService {
     public ResultVo<CaseFrontsheetMain> getPatientInfo(SheetOverview overview) {
         String bah = overview.getBah();
         Integer times = overview.getTimes();
+        if (overview.getRenew()) {
+            dao.deleteOldSheet(bah, times);
+        }
         StandardAddressMember standardAddressMember = getStandardAddressMember(bah);
         CaseFrontsheetMain sheet = dao.selectSignedSheetMain(bah, times);
         if (null != sheet) {