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 6396e5b..f055106 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 @@ -14,12 +14,14 @@ public class PatientSerEnums { //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) public enum SerTypeEnums { bzfw(6, "标准服务"), - yqjzzd(1, "精准医疗指导"), + yqjzzd(1, "孕期精准医疗指导"), tz(2, "体重管理"), xt(3, "血糖管理"), xy(4, "血压管理"), zjzx(5, "专家咨询"), - tw(7, "体温管理"); + tw(7, "体温管理"), + babyjzzz(10,"精准医疗指导"), + babyBzfw(11,"标准服务"); private Integer id; private String title; @@ -54,6 +56,7 @@ public class PatientSerEnums { } } + //服务状态(1-开通、2-退订、3-过期、4-暂停) public enum SerStatusEnums { kt(1, "开通"), @@ -98,24 +101,26 @@ public class PatientSerEnums { public static List getBabySerType() { List list = new ArrayList<>(); Map resultMap = new HashMap<>(); - resultMap.put("id", SerTypeEnums.bzfw.id); - resultMap.put("name", SerTypeEnums.bzfw.getTitle()); + resultMap.put("id", SerTypeEnums.babyBzfw.id); + resultMap.put("name", SerTypeEnums.babyBzfw.getTitle()); list.add(resultMap); Map resultMap2 = new HashMap<>(); - resultMap2.put("id", SerTypeEnums.yqjzzd.id); - resultMap2.put("name", SerTypeEnums.yqjzzd.getTitle()); + resultMap2.put("id", SerTypeEnums.babyjzzz.id); + resultMap2.put("name", SerTypeEnums.babyjzzz.getTitle()); list.add(resultMap2); return list; } - //全部服务类型 + //孕妇服务类型 public static List getSerType() { List list = new ArrayList<>(); for (SerTypeEnums enums : SerTypeEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getTitle()); - list.add(resultMap); + if(enums.getId()<10){ + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getTitle()); + list.add(resultMap); + } } return list; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index a64fa66..91b5699 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -147,6 +147,7 @@ public class TestController { } /** + * 儿童建档服务数据处理 * @param isSkip 是否增量添加 true:增量添加 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 5830d0e..ff9491e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2945,6 +2945,7 @@ public class ViewFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); + //获取儿童服务开通信息 BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List) baseResponse.getObject(); result.setPatientSerResults(patientSerResults);