diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java index a7a46f7..f85b803 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ConfigTypeEnums.java @@ -21,8 +21,15 @@ public enum ConfigTypeEnums { YDQJD("ydqjd",SystemConfig.YDQJD), XX("xx",SystemConfig.XUEXING), FXYS("fxys",SystemConfig.FXYS), - GWFZ("gwfz",SystemConfig.GWFZ) - ; + GWFZ("gwfz",SystemConfig.GWFZ), + JZS("jzs",SystemConfig.JZS), + GRS("grs",SystemConfig.GRS), + YMJZS("ymjzs",SystemConfig.YMJZS), + YWGMS("ywgms",SystemConfig.YWGMS), + SSS("sss",SystemConfig.SSS), + YSFYS("ysfy",SystemConfig.YSFYS), + BCRS("bcrs",SystemConfig.BCRS); + private ConfigTypeEnums(String type,String value){ diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index 99ae9b6..6db8090 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -44,4 +44,19 @@ public class SystemConfig { public static final String FXYS = "5769eef90cf22c3157577421"; //高危分值 public static final String GWFZ = "5769eef90cf22c3157577422"; + + //家族史 + public static final String JZS = "5769eef90cf22c3157577422"; + //个人史 + public static final String GRS = "5769eef90cf22c3157577422"; + //疫苗接种史 + public static final String YMJZS = "5769eef90cf22c3157577422"; + //药物过敏史 + public static final String YWGMS = "5769eef90cf22c3157577422"; + //手术史 + public static final String SSS = "5769eef90cf22c3157577422"; + //叶酸服用 + public static final String YSFYS = "5769eef90cf22c3157577422"; + //本次妊娠 + public static final String BCRS = "5769eef90cf22c3157577422"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 2a88c22..ad1980f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -23,6 +23,7 @@ public class AntenatalExaminationController extends BaseController { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + /** * 查询产前检查 * @@ -82,4 +83,9 @@ public class AntenatalExaminationController extends BaseController { public BaseResponse delOneAntById(@Valid AntExQueryRequest antExQueryRequest) { return antenatalExaminationFacade.delOneAntEx(antExQueryRequest); } + @RequestMapping(method = RequestMethod.GET, value = "/antex/getenums") + @ResponseBody + public BaseResponse getEnums(){ + return antenatalExaminationFacade.getEnums(); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index ca93005..d81d2d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -132,9 +132,9 @@ public class BasicConfigController extends BaseController { * * @return 返回结果 */ - @RequestMapping(method = RequestMethod.GET, value = "/getHighRisk") + /* @RequestMapping(method = RequestMethod.GET, value = "/getHighRisk") @ResponseBody public BaseResponse getHighRisk() { return basicConfigFacade.getHighRisk(); - } + }*/ } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e20ee00..f28e397 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -3,10 +3,11 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExQueryRequest; import com.lyms.platform.operate.web.request.AntExcAddRequest; @@ -23,9 +24,14 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 产前检查接口 @@ -38,6 +44,8 @@ public class AntenatalExaminationFacade { private AntenatalExaminationService antenatalExaminationService; @Autowired private PatientsService patientsService; + @Autowired + private BasicConfigFacade basicConfigFacade; /** * 增加一条产前检查 @@ -181,4 +189,63 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse getEnums(){ + Map map =new HashMap<>(); + map.put("getFetPosition",getFetPosition()); + map.put("getFetal",getFetal()); + map.put("getJoin",getJoin()); + map.put("getTaiPan",getTaiPan()); + map.put("getHighRisk",basicConfigFacade.getHighRisk()); + map.put("jws",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); + map.put("xx",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING)); + map.put("ydqjd",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.YDQJD)); + map.put("fxys",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.FXYS)); + map.put("gwfz",basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + //胎方位 + public List getFetPosition(){ + List list = new ArrayList<>(); + for(FetalPositionEnums enums:FetalPositionEnums.values()){ + Map resultMap = new HashMap<>(); + resultMap.put("id",enums.getId()); + resultMap.put("name",enums.getName()); + list.add(resultMap); + } + return list; + } + //胎先露 + public List getFetal(){ + List list = new ArrayList<>(); + for(FetalEnums enums:FetalEnums.values()){ + Map resultMap = new HashMap<>(); + resultMap.put("id",enums.getId()); + resultMap.put("name",enums.getName()); + list.add(resultMap); + } + return list; + } + //衔接 + public List getJoin(){ + List list = new ArrayList<>(); + for(JoinEnums enums:JoinEnums.values()){ + Map resultMap = new HashMap<>(); + resultMap.put("id",enums.getId()); + resultMap.put("name",enums.getName()); + list.add(resultMap); + } + return list; + } + //胎盘 + public List getTaiPan(){ + List list = new ArrayList<>(); + for(TaiPanEnums enums:TaiPanEnums.values()){ + Map resultMap = new HashMap<>(); + resultMap.put("id",enums.getId()); + resultMap.put("name",enums.getName()); + list.add(resultMap); + } + return list; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 5977132..ac00ce9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -196,7 +196,7 @@ public class BasicConfigFacade { return objectResponse; } - public BaseResponse getHighRisk() { + public List getHighRisk() { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); @@ -211,8 +211,7 @@ public class BasicConfigFacade { } } } - - return new BaseObjectResponse().setData(convertToList(basicConfigs1)).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + return basicConfigs1; } private List convertToList(List list) {