diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 4be8d81..859388d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -449,13 +449,13 @@ public class PatientServiceFacade { endTime = DateUtil.addWeek(lastMenses, 42); } - pser.setSerStartTime(startTime); - pser.setSerEndTime(endTime); - Integer startWeek = DateUtil.getWeek(lastMenses, startTime); Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; endWeek = endWeek > 42 ? 42 : endWeek; + pser.setSerStartTime(startTime); + pser.setSerEndTime(endTime); + pser.setSerStartWeek(startWeek); pser.setSerEndWeek(endWeek); } @@ -479,12 +479,13 @@ public class PatientServiceFacade { } Date startTime = pser.getSerStartTime(); - pser.setDocEndTime(endTime); - pser.setDocStartTime(startTime); - Integer startWeek = DateUtil.getWeek(lastMenses, startTime); Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; endWeek = endWeek > 42 ? 42 : endWeek; + + pser.setDocEndTime(endTime); + pser.setDocStartTime(startTime); + pser.setDocStartWeek(startWeek); pser.setDocEndWeek(endWeek); }