From 79271db67b79c3e35ca9ade4fe12e9ef6885b146 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 15 Feb 2019 09:28:41 +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 | 93 ++++++++++++++-------- 1 file changed, 58 insertions(+), 35 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 6d2080a..523f241 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 @@ -310,7 +310,18 @@ public class PatientServiceFacade { //服务开通操作人 pser.setUpdateUser(String.valueOf(userId)); - + if (serInfo.containsKey("device")) { + pser.setDevice(Integer.parseInt(serInfo.get("device"))); + } + if (serInfo.containsKey("deviceCon")) { + pser.setDevice(Integer.parseInt(serInfo.get("deviceCon"))); + } + if (serInfo.containsKey("doctorWeek")) { + pser.setDevice(Integer.parseInt(serInfo.get("doctorWeek"))); + } + if (serInfo.containsKey("serviceWeek")) { + pser.setDevice(Integer.parseInt(serInfo.get("serviceWeek"))); + } Patients patients = patientsService.findOnePatientById(ps.getParentid()); setServiceRecordAdd(pser, patients); @@ -378,16 +389,20 @@ public class PatientServiceFacade { Integer serviceWeek = pser.getServiceWeek(); Integer doctorService = pser.getDoctorWeek(); + if (serviceWeek != null) + { 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); - + } + if (doctorService != null) + { 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); - + } } @@ -398,48 +413,56 @@ public class PatientServiceFacade { Integer doctorService = pser.getDoctorWeek(); if (pser.getId() != null) { - if (pser.getSerEndTime().getTime() > new Date().getTime()) + if (serviceWeek != null) { + if (pser.getSerEndTime().getTime() > new Date().getTime()) + { - Date startTime = pser.getSerStartTime(); - Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek); + Date startTime = pser.getSerStartTime(); + Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek); - pser.setSerStartTime(startTime); - pser.setSerEndTime(endTime); + pser.setSerStartTime(startTime); + pser.setSerEndTime(endTime); - Integer startWeek = DateUtil.getWeek(lastMenses, startTime); - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; - pser.setSerStartWeek(startWeek); - pser.setSerEndWeek(endWeek); - } - 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); + Integer startWeek = DateUtil.getWeek(lastMenses, startTime); + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; + pser.setSerStartWeek(startWeek); + pser.setSerEndWeek(endWeek); + } + 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); + } } - if (pser.getDocEndTime().getTime() > new Date().getTime()) + if (doctorService != null) { - Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService); - Date startTime = pser.getSerStartTime(); + if (pser.getDocEndTime().getTime() > new Date().getTime()) + { + Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorService); + Date startTime = pser.getSerStartTime(); - pser.setDocEndTime(endTime); - pser.setDocStartTime(startTime); + pser.setDocEndTime(endTime); + pser.setDocStartTime(startTime); - Integer startWeek = DateUtil.getWeek(lastMenses, startTime); - Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; - pser.setDocStartWeek(startWeek); - pser.setDocEndWeek(endWeek); - } - else - { - 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); + Integer startWeek = DateUtil.getWeek(lastMenses, startTime); + Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorService; + pser.setDocStartWeek(startWeek); + pser.setDocEndWeek(endWeek); + } + else + { + 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); + } } + + } } -- 1.8.3.1