From 140929e083079db1ac14eb840575fedbc0ff75ba Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 29 Dec 2017 10:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BB=B7=E6=A0=BC=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/common/enums/PatientSerEnums.java     | 23 +++++++++++++++++++---
 .../web/controller/PatientServiceController.java   | 10 ++++++++++
 .../operate/web/facade/PatientServiceFacade.java   | 10 ++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
index f055106..dfcec2c 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
@@ -20,8 +20,8 @@ public class PatientSerEnums {
         xy(4, "血压管理"),
         zjzx(5, "专家咨询"),
         tw(7, "体温管理"),
-        babyjzzz(10,"精准医疗指导"),
-        babyBzfw(11,"标准服务");
+        babyjzzz(10, "精准医疗指导"),
+        babyBzfw(11, "标准服务");
         private Integer id;
         private String title;
 
@@ -111,11 +111,28 @@ public class PatientSerEnums {
         return list;
     }
 
+    //全部服务类型
+    public static List getSerTypeAll() {
+        List<Object> list = new ArrayList<>();
+        for (SerTypeEnums enums : SerTypeEnums.values()) {
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("id", enums.getId());
+            if (enums.getId() < 10) {
+                resultMap.put("name", "(孕妇)"+enums.getTitle());
+            }else{
+                resultMap.put("name", "(儿童)"+enums.getTitle());
+            }
+
+            list.add(resultMap);
+        }
+        return list;
+    }
+
     //孕妇服务类型
     public static List getSerType() {
         List<Object> list = new ArrayList<>();
         for (SerTypeEnums enums : SerTypeEnums.values()) {
-            if(enums.getId()<10){
+            if (enums.getId() < 10) {
                 Map<String, Object> resultMap = new HashMap<>();
                 resultMap.put("id", enums.getId());
                 resultMap.put("name", enums.getTitle());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
index 6909a5b..fe0d9fd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
@@ -41,6 +41,16 @@ public class PatientServiceController extends BaseController {
 
         return patientServiceFacade.patientServiceInit(loginState.getId());
     }
+    /**
+     * 初始化接口
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/serInfo/init", method = RequestMethod.GET)
+    public BaseResponse configServiceInit( HttpServletRequest request) {
+        return patientServiceFacade.configServiceInit();
+    }
 
     /**
      * 初始化接口
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 4df37cd..eaa5907 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
@@ -70,6 +70,16 @@ public class PatientServiceFacade {
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
     }
 
+
+    public BaseResponse configServiceInit() {
+        Map map = new HashMap();
+        //服务类型
+        map.put("serTypes", PatientSerEnums.getSerTypeAll());
+        //服务状态
+        map.put("serStatus", PatientSerEnums.getSerStatus());
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
+    }
+
     public BaseResponse patientServiceInit(Integer id) {
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(id);
-- 
1.8.3.1