diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index 49ddd6c..8e86ebb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -228,6 +228,16 @@ public class CancerScreeningModel extends BaseModel { private Integer breastAbnormity; //其它异常(上面选择其它恶性肿瘤时会用到) private String otherAbnormity; + //乳腺癌异常name + private String breastAbnormityName; + + public String getBreastAbnormityName() { + return breastAbnormityName; + } + + public void setBreastAbnormityName(String breastAbnormityName) { + this.breastAbnormityName = breastAbnormityName; + } public String getOtherAbnormity() { return otherAbnormity; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 8238dbc..497deed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -121,7 +121,7 @@ public class CancerScreeningFacade { map.put("sfZzjg", model.getSfZzjg());//检査机构 map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期 - map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null));//检査日期 + map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null)); list.add(map); } @@ -304,7 +304,8 @@ public class CancerScreeningFacade { CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); CancerScreeningResult result = new CancerScreeningResult(); org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result); - + //隆化-两癌-翻译乳腺癌名称 + result.setBreastAbnormityName(RxaZdycEnums.getName(null!=cancerScreeningModel.getBreastAbnormity()?cancerScreeningModel.getBreastAbnormity().toString():null)); result.setNationStr(CommonsHelper.getName1(cancerScreeningModel.getNationId(),basicConfigService)); result.setLevelTypeStr(CommonsHelper.getName1(cancerScreeningModel.getLevelTypeId(),basicConfigService)); String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(),