From 83f97ea49554b24a57b418a81121cf619c1fad50 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 15 Feb 2019 10:39:26 +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

---
 .../resources/mainOrm/master/PatientService.xml    | 29 ++------------------
 .../operate/web/facade/PatientServiceFacade.java   | 32 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index b79a196..53263b0 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -31,34 +31,11 @@
 
     <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
         insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,
-        update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,
-        per_type
-        ,device
-        ,deviceCon
-        ,doctorWeek
-        ,serviceWeek
-        ,serStartWeek
-        ,serEndWeek
-        ,serStartTime
-        ,serEndTime
-        ,docStartWeek
-        ,docEndWeek
-        ,docStartTime
-        ,docEndTime
+        update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type
+        ,device,deviceCon,doctorWeek,serviceWeek,serStartWeek,serEndWeek,serStartTime,serEndTime,docStartWeek,docEndWeek,docStartTime,docEndTime
         ) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},
         #{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus},#{isOld},#{perType}
-        , #{device}
-        , #{deviceCon}
-        , #{doctorWeek}
-        , #{serviceWeek}
-        , #{serStartWeek}
-        , #{serEndWeek}
-        , #{serStartTime}
-        , #{serEndTime}
-        , #{docStartWeek}
-        , #{docEndWeek}
-        , #{docStartTime}
-        , #{docEndTime}
+        ,#{device},#{deviceCon},#{doctorWeek},#{serviceWeek},#{serStartWeek},#{serEndWeek},#{serStartTime},#{serEndTime},#{docStartWeek},#{docEndWeek},#{docStartTime},#{docEndTime}
         )
     </insert>
 
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 523f241..2e5b041 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
@@ -314,13 +314,13 @@ public class PatientServiceFacade {
                 pser.setDevice(Integer.parseInt(serInfo.get("device")));
             }
             if (serInfo.containsKey("deviceCon")) {
-                pser.setDevice(Integer.parseInt(serInfo.get("deviceCon")));
+                pser.setDeviceCon(Integer.parseInt(serInfo.get("deviceCon")));
             }
             if (serInfo.containsKey("doctorWeek")) {
-                pser.setDevice(Integer.parseInt(serInfo.get("doctorWeek")));
+                pser.setDoctorWeek(Integer.parseInt(serInfo.get("doctorWeek")));
             }
             if (serInfo.containsKey("serviceWeek")) {
-                pser.setDevice(Integer.parseInt(serInfo.get("serviceWeek")));
+                pser.setServiceWeek(Integer.parseInt(serInfo.get("serviceWeek")));
             }
             Patients patients = patientsService.findOnePatientById(ps.getParentid());
             setServiceRecordAdd(pser, patients);
@@ -391,17 +391,35 @@ public class PatientServiceFacade {
 
         if (serviceWeek != null)
         {
+
+            Date endTime = DateUtil.addWeek(new Date(), serviceWeek);
+            if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
+            {
+                endTime = DateUtil.addWeek(lastMenses, 42);
+            }
+            Integer endWeek = DateUtil.getWeek(lastMenses, new Date()) + serviceWeek;
+            endWeek =  endWeek > 42 ? 42 :  endWeek;
+
             pser.setSerStartTime(new Date());
-            pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
+            pser.setSerEndTime(endTime);
             pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
-            pser.setSerEndWeek(DateUtil.getWeek(lastMenses, new Date()) + serviceWeek);
+            pser.setSerEndWeek(endWeek);
         }
         if (doctorService != null)
         {
+            Date endTime = DateUtil.addWeek(new Date(), doctorService);
+            if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
+            {
+                endTime = DateUtil.addWeek(lastMenses, 42);
+            }
+
+            Integer endWeek = DateUtil.getWeek(lastMenses, new Date()) + doctorService;
+            endWeek =  endWeek > 42 ? 42 :  endWeek;
+
             pser.setDocStartTime(new Date());
-            pser.setDocEndTime(DateUtil.addWeek(new Date(), serviceWeek));
+            pser.setDocEndTime(endTime);
             pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
-            pser.setDocEndWeek(DateUtil.getWeek(lastMenses, new Date()) + doctorService);
+            pser.setDocEndWeek(endWeek);
         }
     }
 
-- 
1.8.3.1