diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index 1497249..7aa5a2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -191,7 +191,16 @@ public class TempFacade { data.put("certeTypeId", patients.getPcerteTypeId()); data.put("status", null == tmp.getNow() ? "" : getTempStatus(Double.valueOf(tmp.getNow()))); data.put("level", commonService.findRiskLevel(patients.getRiskLevelId())); - data.put("rFactor", commonService.resloveFactor(patients.getRiskFactorId())); + String rFactor = commonService.resloveFactor(patients.getRiskFactorId()); + if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) + { + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)){ + rFactor+=","+patients.getoRiskFactor(); + }else{ + rFactor = patients.getoRiskFactor(); + } + } + data.put("rFactor", rFactor); // 高危因素 data.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); dataList.add(data); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 6948c46..b079c67 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -392,6 +392,8 @@ public class AntExAddRequest implements IBasicRequestConvert