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 7469c4e..c7e44c1 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 @@ -23,7 +23,7 @@ public class PatientSerEnums { zjzx(5, "专家咨询服务"), tw(7, "体温管理服务"), //YFDC(8, "孕妇单次服务"), - babyjzzz(10, "精准指导服务"), + babyjzzz(10, (SystemConfig.HIS_VERSION != null && "50".equals(SystemConfig.HIS_VERSION)) ? "健康咨询": "精准指导服务"), babyBzfw(11, "儿保小助理服务");//以前是:标准服务 private Integer id; private String title; @@ -60,6 +60,47 @@ public class PatientSerEnums { } + //周口 + public enum SerTypeZkEnums { + yqjzzd(1, "健康咨询"), + tz(2, "营养状况评估与咨询"), + babyjzzz(10, "健康咨询"), + babyBzfw(11, "儿保小助理服务");//以前是:标准服务 + private Integer id; + private String title; + + private SerTypeZkEnums(Integer id, String title) { + this.id = id; + this.title = title; + } + + public static String getTitle(Integer id) { + for (SerTypeZkEnums e : values()) { + if (e.getId() == id) { + return e.getTitle(); + } + } + return ""; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + } + + //服务状态(1-开通、2-退订、3-过期、4-暂停) public enum SerStatusEnums { kt(1, "开通"), @@ -117,31 +158,64 @@ public class PatientSerEnums { //全部服务类型 public static List getSerTypeAll() { List list = new ArrayList<>(); - for (SerTypeEnums enums : SerTypeEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - if (enums.getId() < 10) { - resultMap.put("name", "(孕妇)"+enums.getTitle()); - }else{ - resultMap.put("name", "(儿童)"+enums.getTitle()); + if ("50".equals(SystemConfig.HIS_VERSION)) + { + for (SerTypeZkEnums enums : SerTypeZkEnums.values()) { + Map 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); } + } + else + { + for (SerTypeEnums enums : SerTypeEnums.values()) { + Map 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); + list.add(resultMap); + } } + return list; } //孕妇服务类型 public static List getSerType() { List list = new ArrayList<>(); - for (SerTypeEnums enums : SerTypeEnums.values()) { - if (enums.getId() < 10) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getTitle()); - list.add(resultMap); + if ("50".equals(SystemConfig.HIS_VERSION)) + { + for (SerTypeZkEnums enums : SerTypeZkEnums.values()) { + if (enums.getId() < 10) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getTitle()); + list.add(resultMap); + } } } + else + { + for (SerTypeEnums enums : SerTypeEnums.values()) { + 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/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 9a78ce8..1f44894 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -46,7 +46,7 @@ public class SyncDataTaskService { // urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); // urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封"); // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); - // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); + urls.put("rp-zk-api.healthbaby.com.cn:8094","周口市妇幼保健院"); // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院"); // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index b339cff..19951c8 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -5,7 +5,7 @@ center_base_url=https://push.stage.platform.healthbaby.com.cn #区域平台访问短信中心的token center_token=e0c56363-00d6-42ee-bbe0-23c553583062 -#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼,7:南充中心医院 30 衡水 +#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼,7:南充中心医院 30 衡水 50周口妇幼 his_version=0 xt_version=