diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index a7514a6..2c3c3a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; +import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -757,7 +758,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { Map data = new HashMap<>(); BabyModel babyModel = babyService.getOneBabyById(id); data.put("babyName",babyModel.getName()); - data.put("babySex",babyModel.getSex()); + data.put("babySex", SexEnum.getTextById(babyModel.getSex())); data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery = new BabyHighRiskBabyModelQuery(); babyHighRiskBabyModelQuery.setYn(YnEnums.YES.getId()); @@ -789,7 +790,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); data.put("zgStatus",riskBabyModel1.getZgStatus()); data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); - String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+babyHighRiskBabyModel.getHighRiskQt() == null ? "" : babyHighRiskBabyModel.getHighRiskQt(); + String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+(babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " "+ babyHighRiskBabyModel.getHighRiskQt()); data.put("diagnoseValue",diagnoseValue); } else @@ -807,12 +808,12 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { handleExecption(babyHighRiskBabyModel.getWg(),exection); handleExecption(babyHighRiskBabyModel.getTooth(),exection); handleExecption(babyHighRiskBabyModel.getHeart(),exection); - handleExecption(babyHighRiskBabyModel.getLung(),exection); - handleExecption(babyHighRiskBabyModel.getAbdomen(),exection); - handleExecption(babyHighRiskBabyModel.getWszq(),exection); + handleExecption(babyHighRiskBabyModel.getLung(), exection); + handleExecption(babyHighRiskBabyModel.getAbdomen(), exection); + handleExecption(babyHighRiskBabyModel.getWszq(), exection); handleExecption(babyHighRiskBabyModel.getJzsz(),exection); handleExecption(babyHighRiskBabyModel.getSjxtjc(),exection); - handleExecption(babyHighRiskBabyModel.getXlxwfy(),exection); + handleExecption(babyHighRiskBabyModel.getXlxwfy(), exection); fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString());