From dffdd110790d4cb252102dcfd6cd06b8e1d3511e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 24 Nov 2017 15:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/PatientServiceFacade.java | 7 +++++--
 .../lyms/platform/operate/web/facade/PatientServiceSysFacade.java  | 6 +++---
 2 files changed, 8 insertions(+), 5 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 4f10dd4..5f9b808 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
@@ -115,6 +115,7 @@ public class PatientServiceFacade {
         //根据用户id获取医院ID
         // String hospitalId = autoMatchFacade.getHospitalId(id);
         PatientServiceQuery patientQuery = new PatientServiceQuery();
+        //显示所有医院
         // patientQuery.setHospitalId(hospitalId);
         patientQuery.setParentid(pid);
         patientQuery.setSort("create_date desc");
@@ -313,8 +314,10 @@ public class PatientServiceFacade {
                     result.setUpdateUser(users.getName());
                 }
             } catch (Exception e) {
-                result.setSerDoctStr("产检医生");
+                result.setUpdateUser("产检医生");
             }
+        }else {
+            result.setUpdateUser("小程序开通");
         }
         result.setParentid(ps.getParentid());
         result.setCreateDate(DateUtil.getyyyy_MM_dd(ps.getCreateDate()));
@@ -331,7 +334,7 @@ public class PatientServiceFacade {
         result.setSerCode(ps.getSerCode());
         result.setCreateUser(ps.getCreateUser());
         result.setUpdateDate(DateUtil.getyyyy_MM_dd(ps.getUpdateDate()));
-        if (ps.getSerDoct() != null) {
+        if (StringUtils.isNotEmpty(ps.getSerDoct())) {
             try {
                 Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
                 if (users != null) {
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 cac2936..c095871 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
@@ -47,9 +47,8 @@ public class PatientServiceSysFacade implements SysBaseFacade {
             patientQuery.setParentid(patientService.getParentid());
             //开通服务
             patientQuery.setSerType(patientService.getSerType());
-            //指定医生
-            patientQuery.setSerDoct(patientService.getSerDoct());
-
+            //开通医院
+            patientQuery.setHospitalId(patientService.getHospitalId());
             List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
             if (CollectionUtils.isNotEmpty(patientServices)) {//修改
                 PatientService ps = patientServices.get(0);
@@ -61,6 +60,7 @@ public class PatientServiceSysFacade implements SysBaseFacade {
             } else {//新增
                 patientService.setId(UUID.randomUUID().toString().replace("-", ""));
                 int serType = patientService.getSerType();
+                patientService.setUpdateDate(new Date());
                 // 1高危精准指导、5-专家咨询默认已经领取
                 if(serType == PatientSerEnums.SerTypeEnums.yqjzzd.getId()||serType == PatientSerEnums.SerTypeEnums.zjzx.getId()){
                     //默认已领取
-- 
1.8.3.1