From aec1461305c9ba12cc58c956e1c0513fbcc3a85f Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Tue, 7 May 2019 16:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE-=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=80=E7=B3=96=E3=80=81=E4=BD=93=E9=87=8D=E3=80=81?=
 =?UTF-8?q?=E8=A1=80=E5=8E=8B=E7=9B=91=E6=B5=8B=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/common/enums/ServiceTypeEnums.java    | 9 ++++++++-
 .../lyms/platform/operate/web/controller/EnumsController.java    | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
index 9c51000..419052d 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
@@ -18,7 +18,14 @@ public enum ServiceTypeEnums {
     //秦皇岛区域围产小助理显示孕期产检提醒服务
     STANDARD_SERVICE(0, (SystemConfig.HIS_VERSION != null && "4".equals(SystemConfig.HIS_VERSION)) ?  "孕期产检提醒服务": "围产小助理"),
 
-    ADD_SERVICE(1,"增值服务");
+    //ADD_SERVICE(1,"增值服务"),
+    ADD_SERVICE(1,"精准医疗服务"),
+
+    ADD_BLOOD_PRESSURE_MONITOR_SERVICE(2,"血压监测服务"),
+    ADD_BLOOD_SUGAR_MONITOR_SERVICE(3,"血糖监测服务"),
+    ADD_WEIGHT_MONITOR_SERVICE(4,"体重监测服务"),
+    NO_SERVICE(5,"无服务"),
+    NOTIFICATION_SERVICE(6,"精准医疗服务");
 
     private ServiceTypeEnums(int id, String name){
         this.name=name;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
index cf82f6b..654184a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
@@ -238,6 +238,10 @@ public class EnumsController {
     @RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)
     @ResponseBody
     public  List<Map<String,String>> getServiceStatusByPid(@PathVariable("pid") Integer pid) {
+        //  0-围产小助理/孕期产检提醒服务 100-全部
+        if (pid != 0 && pid != 100){
+            pid = 1;
+        }
         List<Map<String,String>> list = ServiceStatusEnums.getServiceStatusByPid(pid);
         return  list;
     }
-- 
1.8.3.1