diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java index c184f7c..e89dbee 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java @@ -1,5 +1,10 @@ package com.lyms.platform.common.enums; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * * 耳聾基因結果 @@ -23,6 +28,17 @@ public enum DeafEnums { this.name=name; } + public static List getDeafEnums() { + List list = new ArrayList<>(); + for (DeafEnums e : DeafEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + public Integer getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java index 701afb5..ea6fb72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java @@ -56,6 +56,19 @@ public class BabyEarController extends BaseController } /** + * 获取听力母亲信息 + * + * @param id babyId + * @return 母亲信息 + */ + @TokenRequired + @ResponseBody + @RequestMapping(method = RequestMethod.GET,value = "/queryBabyInfo/{id}") + public BaseResponse queryBabyInfo(@PathVariable("id")String id){ + return babyEarFacade.queryBabyInfo(id); + } + + /** * 听筛建档初始化数据 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index df61f1a..a67dac0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -126,7 +126,7 @@ public class EarController extends BaseController { //根据条件查询基础配置信息表 InitScreen initScreen = new InitScreen(); initScreen.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); - initScreen.setDeafEnumsResult(EnumUtil.toJson(DeafEnums.class)); + initScreen.setDeafEnumsResult(DeafEnums.getDeafEnums()); return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index f0861c1..b138132 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1208,7 +1208,8 @@ public class BabyEarFacade { babyEarBaseView.setFphone(babyEarBase.getFphone()); babyEarBaseView.setCreateTime(babyEarBase.getCreateTime()); babyEarBaseView.setVcCardNo(babyEarBase.getVcCardNo()); - babyEarBaseView.setServiceType(ServiceStatusEnums.getNameById(babyEarBase.getServiceType())); + babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyEarBase.getServiceStatus())); + babyEarBaseView.setServiceStatus(ServiceStatusEnums.getNameById(babyEarBase.getServiceStatus())); babyEarBaseView.setMonthAge(babyEarBase.getMonthAge()); return babyEarBaseView; } @@ -1615,4 +1616,61 @@ public class BabyEarFacade { baseResponse.setErrormsg("成功"); return baseResponse; } + + public BaseResponse queryBabyInfo(String id) { + BaseObjectResponse br = new BaseObjectResponse(); + Map mothMap = new HashMap<>(); + Map resMap = new HashMap<>(); + BabyModel model = babyService.getOneBabyById(id); + if (model != null) { + //儿童姓名 + mothMap.put("name", model.getName()); + //儿童月龄 + mothMap.put("monthAge", DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + //生日 + mothMap.put("birthday", DateUtil.getyyyy_MM_dd(model.getBirth())); + //母亲名称 + mothMap.put("mname", model.getMname()); + //联系方式 + mothMap.put("mphone", model.getMphone()); + //备注 + mothMap.put("mremark", model.getMremark()); + //性别 + mothMap.put("sex", SexEnum.getTextById(model.getSex())); + //母亲的就诊卡号 + mothMap.put("vcCardNo", model.getVcCardNo()); + //母亲身份证号 + mothMap.put("cardNo", model.getMcertNo()); + + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + + earQuery.setBabyPatientId(id); + List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) { + BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0); + //母亲孕期高危因素 + if (babyPatientExtendEar.getmHighRiskFactorId() != null) { + String[] highFactors = babyPatientExtendEar.getmHighRiskFactorId().split(","); + List ids = Arrays.asList(highFactors); + + HighScoreResult highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService); + Integer score = 0; + if (highScoreResult != null && highScoreResult.getScore() != null) { + score = highScoreResult.getScore(); + } + List> checkList = ResolveUtils.queryHighRisk(highScoreResult); + List> list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(checkList)) { + list.addAll(checkList); + } + //高危 孕妇 + mothMap.put("highRisk", list); + } + } + //是否高危儿童 0 非高危 1高危 + resMap.put("baseInfo", mothMap); + br.setData(resMap); + } + return br; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index 63a972b..6463dec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -130,6 +130,7 @@ public class BabyEarBase implements IBasicRequestConvert { setName(babyModel.getName()); setCardNo(babyModel.getCardNo()); setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate())); setProvinceId(babyModel.getProvinceId()); setCityId(babyModel.getCityId()); setAreaId(babyModel.getAreaId()); @@ -144,7 +145,6 @@ public class BabyEarBase implements IBasicRequestConvert { setFcertNo(babyModel.getFcertNo()); setFcertTypeId(babyModel.getFcertTypeId()); setMbirth(DateUtil.getyyyy_MM_dd(babyModel.getMbirth())); - setMonthAge(DateUtil.getBabyMonthAge(babyModel.getMbirth(), babyModel.getBuildDate())); setMproTypeId(babyModel.getMproTypeId()); setMcertNo(babyModel.getMcertNo()); setMcertTypeId(babyModel.getMcertTypeId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java index e9221b3..96c8ed0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java @@ -80,6 +80,10 @@ public class BabyScreenAddRequest implements IBasicRequestConvert> deafEnumsResult; + private List deafEnumsResult; //高危儿的确定因素 private List> highRiskConfirms; @@ -24,11 +24,11 @@ public class InitScreen extends BaseResponse { this.highRiskConfirms = highRiskConfirms; } - public List> getDeafEnumsResult() { + public List getDeafEnumsResult() { return deafEnumsResult; } - public void setDeafEnumsResult(List> deafEnumsResult) { + public void setDeafEnumsResult(List deafEnumsResult) { this.deafEnumsResult = deafEnumsResult; } }