From db84fc5a5b8ddbf8a28b49bbbefd65534fb0a294 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 21 Nov 2017 11:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=A2=9E=E5=8A=A0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=BC=80=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/PatientServiceFacade.java   | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 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 98cc7ff..c27588e 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
@@ -157,7 +157,6 @@ public class PatientServiceFacade {
         String hospitalId = autoMatchFacade.getHospitalId(id);
         List<Map<String, String>> serInfos = ps.getSerInfos();
 
-        List<PatientService> patientServiceList = new ArrayList<>();
         for (Map<String, String> serInfo : serInfos) {
             //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
             PatientServiceQuery patientQuery = new PatientServiceQuery();
@@ -172,36 +171,39 @@ public class PatientServiceFacade {
             }
 
             Patients patients = patientsService.findOnePatientById(ps.getParentid());
+            PatientService pser = new PatientService();
+            pser.setCreateUser(ps.getCreateUser());
+            pser.setCreateDate(ps.getCreateDate());
+            pser.setParentid(ps.getParentid());
             if (patients != null) {
-                ps.setPid(patients.getPid());
+                pser.setPid(patients.getPid());
             }
-            ps.setId(UUID.randomUUID().toString().replace("-", ""));
+            pser.setId(UUID.randomUUID().toString().replace("-", ""));
 
-            ps.setHospitalId(hospitalId);
+            pser.setHospitalId(hospitalId);
             //默认开通状态
-            ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
+            pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
             //服务类型
-            ps.setSerType(Integer.parseInt(serInfo.get("serType")));
-            if (serInfo.containsKey(serInfo.get("serDoct"))) {
-                ps.setSerDoct(serInfo.get("serDoct"));
+            pser.setSerType(Integer.parseInt(serInfo.get("serType")));
+            if (serInfo.containsKey("serDoct")) {
+                pser.setSerDoct(serInfo.get("serDoct"));
             }
             //默认已经领取
-            ps.setStatus(2);
+            pser.setStatus(2);
             //默认待同步
-            ps.setSynStatus(1);
+            pser.setSynStatus(1);
             //领取时间
-            ps.setReceiveDate(new Date());
+            pser.setReceiveDate(new Date());
             //领取操作医生id
-            ps.setReceiveUser(String.valueOf(id));
+            pser.setReceiveUser(String.valueOf(id));
             //服务开通操作时间
-            ps.setUpdateDate(new Date());
+            pser.setUpdateDate(new Date());
             //服务开通操作人
-            ps.setUpdateUser(String.valueOf(id));
-            patientServiceService.addPatientService(ps);
+            pser.setUpdateUser(String.valueOf(id));
+            patientServiceService.addPatientService(pser);
 
-            operateLogFacade.addAddOptLog(id, Integer.valueOf(hospitalId), ps, OptActionEnums.ADD.getId(), "开通增值服务");
+            operateLogFacade.addAddOptLog(id, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
 
-            patientServiceList.add(ps);
         }
 
         BaseResponse baseResponse = new BaseResponse();
-- 
1.8.3.1