From fdab2a41dee3041abcf4a72be220496558c5d7b8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 20 Feb 2019 10:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientServiceFacade.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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); } -- 1.8.3.1