From e625453d211bdda2480ab619fa2869e39310434d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 20 Feb 2019 17:17:25 +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 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 859388d..aa7178e 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 @@ -433,7 +433,7 @@ public class PatientServiceFacade { { Date lastMenses = patients.getLastMenses(); Integer serviceWeek = pser.getServiceWeek(); - Integer doctorService = pser.getDoctorWeek(); + Integer doctorWeek = pser.getDoctorWeek(); if (pser.getId() != null) { if (serviceWeek != null) @@ -468,11 +468,11 @@ public class PatientServiceFacade { } } - if (doctorService != null) + if (doctorWeek != null) { if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) { - Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService); + Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorWeek); if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { endTime = DateUtil.addWeek(lastMenses, 42); @@ -480,7 +480,7 @@ public class PatientServiceFacade { Date startTime = pser.getSerStartTime(); Integer startWeek = DateUtil.getWeek(lastMenses, startTime); - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorWeek; endWeek = endWeek > 42 ? 42 : endWeek; pser.setDocEndTime(endTime); @@ -492,15 +492,12 @@ public class PatientServiceFacade { else { pser.setDocStartTime(new Date()); - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); + pser.setDocEndTime(DateUtil.addWeek(new Date(), doctorWeek)); pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); + pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorWeek); } } - - } - } -- 1.8.3.1