diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java index bbe7ad7..fd958b2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java @@ -27,7 +27,9 @@ public enum ServiceStatusEnums { ALL(103,"全部",100), ALL_OPEN(7,"开通",100), ALL_NO_OPEN(8,"不开通",100), - ALL_OVERDUE(9,"过期",100); + ALL_OVERDUE(9,"过期",100), + + NO_SERVICE(10, "全部", 5); private ServiceStatusEnums(int id, String name,int pid){ this.name=name; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index ab4451b..fe3df46 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -53,7 +53,8 @@ public enum SmsServiceEnums { YFXXJSTX(39,"孕妇学校课程结束提醒",21,"1,3"), TZTX(40,"体重测量提醒",21,"1"), XTTX(41,"血糖测量提醒",21,"1"), - XYTX(42,"血压测量提醒",21,"1"); + XYTX(42,"血压测量提醒",21,"1"), + NOSERVICE(43,"无服务",0,"0,1,2,3,4"); private SmsServiceEnums(int id,String name,int pid,String serviceObj){ this.id = id; 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 654184a..f45bab9 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,8 +238,8 @@ public class EnumsController { @RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET) @ResponseBody public List> getServiceStatusByPid(@PathVariable("pid") Integer pid) { - // 0-围产小助理/孕期产检提醒服务 100-全部 - if (pid != 0 && pid != 100){ + // 0-围产小助理/孕期产检提醒服务 100-全部 5-无服务 + if (pid != 0 && pid != 100 && pid != 5){ pid = 1; } List> list = ServiceStatusEnums.getServiceStatusByPid(pid);