From f5b5077fc1d4d79bb4b3346d0a07fa8beb56e588 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 14 Feb 2019 20:06:45 +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 --- .../operate/web/facade/PatientServiceFacade.java | 35 +++++++++++++--------- .../web/facade/PatientServiceSysFacade.java | 4 +-- 2 files changed, 23 insertions(+), 16 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 1e885d3..6d2080a 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 @@ -312,7 +312,7 @@ public class PatientServiceFacade { Patients patients = patientsService.findOnePatientById(ps.getParentid()); - setServiceRecord(pser, patients); + setServiceRecordAdd(pser, patients); patientServiceService.addPatientService(pser); @@ -372,7 +372,26 @@ public class PatientServiceFacade { return baseResponse; } - public void setServiceRecord(PatientService pser, Patients patients) + public void setServiceRecordAdd(PatientService pser, Patients patients) + { + Date lastMenses = patients.getLastMenses(); + Integer serviceWeek = pser.getServiceWeek(); + Integer doctorService = pser.getDoctorWeek(); + + pser.setSerStartTime(new Date()); + pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek)); + pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date())); + pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek); + + pser.setDocStartTime(new Date()); + pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); + pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); + pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); + + } + + + public void setServiceRecordUpdate(PatientService pser, Patients patients) { Date lastMenses = patients.getLastMenses(); Integer serviceWeek = pser.getServiceWeek(); @@ -422,18 +441,6 @@ public class PatientServiceFacade { pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); } } - else - { - pser.setSerStartTime(new Date()); - pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek)); - pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date())); - pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek); - - pser.setDocStartTime(new Date()); - pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek)); - pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date())); - pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService); - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 3edb88d..18aefee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -110,7 +110,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { //操作时间 ps.setUpdateDate(new Date()); - patientServiceFacade.setServiceRecord(ps, patients); + patientServiceFacade.setServiceRecordUpdate(ps, patients); patientServiceService.updatePatientService(ps); } else {//新增 @@ -126,7 +126,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { patientService.setStatus(1); } - patientServiceFacade.setServiceRecord(patientService,patients); + patientServiceFacade.setServiceRecordAdd(patientService,patients); patientServiceService.addPatientService(patientService); } -- 1.8.3.1