Explorar el Código

根据首次签收的时候来判断是否迟交

lighter hace 10 meses
padre
commit
0f3e556fa7

+ 3 - 5
src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -639,6 +639,9 @@ public class CaseFrontSheetMainService {
         //判断是否已经签收过了
         Integer fileStatus = dao.selectFileStatus(sheet.getBah(), sheet.getAdmissTimes());
         if (!Objects.equals(fileStatus, State.FileStatus.SIGNED)) {
+            if (null == sheet.getLateFlag()) {
+                sheet.setLateFlag(calculateLateState(sheet.getDismissDate()));
+            }
             insertSheetData(sheet);
             basDao.updateActFileStatus(bah, times, State.FileStatus.SIGNED);
             return ResultVoUtil.success();
@@ -647,11 +650,6 @@ public class CaseFrontSheetMainService {
     }
 
     private void insertSheetData(CaseFrontsheetMain sheet) {
-        Integer lateFlag = sheet.getLateFlag();
-        if (null == lateFlag) {
-            lateFlag = calculateLateState(sheet.getDismissDate());
-        }
-        sheet.setLateFlag(lateFlag);
         if (null == sheet.getSignStaff()) {
             sheet.setSignStaff(dao.selectSignStaff(sheet.getBah(), sheet.getAdmissTimes()));
         }