From 4c489f4e96a7440656a4af3fcb70e1c7e0979d43 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 17 Nov 2017 15:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainOrm/master/HospitalServiceContent.xml      |  6 +++--
 .../operate/web/controller/SyncDataController.java |  1 +
 .../operate/web/facade/ConfigServiceFacade.java    | 28 ++++++++++++++++++----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
index ccf530f..9de1706 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
@@ -96,15 +96,17 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status
 
     <select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
-        select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content group by hospital_id;
+        select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
+        group by hospital_id
         <include refid="orderAndLimit"/>
     </select>
 
     <select id="queryGroupHospitalServiceContentCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
-        select count(1) from hospital_service_content  group by hospital_id;
+        select count(1) from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
+        group by hospital_id
     </select>
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
index bd5bc8a..f7b7e19 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
@@ -99,6 +99,7 @@ public class SyncDataController extends BaseController {
             }
             return baseResponse;
         } catch (Exception e) {
+            e.printStackTrace();
             BaseResponse baseResponse = new BaseResponse();
             baseResponse.setObject(e.getMessage());
             baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
index 4038164..646fc27 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
@@ -183,11 +183,31 @@ public class ConfigServiceFacade {
                 }
             }
         }
+        if (StringUtils.isNotEmpty(hs.getCreateUser())) {
+            try {
+                Users users = usersService.getUsers(Integer.parseInt(hs.getCreateUser()));
+                if (users != null) {
+                    result.setCreateUser(users.getName());
+                }
+            } catch (Exception e) {
+                result.setCreateUser("产检医生");
+            }
+        }
+
+        if(StringUtils.isNotEmpty(hs.getSerTypes())){
+            String serTypes [] = hs.getSerTypes().split(",");
+            StringBuffer stb = new StringBuffer();
+            for(String st:serTypes){
+                String serType = PatientSerEnums.SerTypeEnums.getTitle(Integer.parseInt(st));
+                stb.append(serType+"/");
+            }
+            result.setSerType(stb.toString().substring(0,stb.length()-1));
+        }
+
         result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
-        String serType = PatientSerEnums.SerTypeEnums.getTitle(hs.getSerType());
-        result.setSerType(serType);
-        result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
-        result.setCreateUser(hs.getCreateUser());
+        if(hs.getStatus()!=null){
+            result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
+        }
         return result;
     }
 
-- 
1.8.3.1