diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index a214404..d2d4485 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -14,10 +14,7 @@ import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; -import com.lyms.platform.operate.web.result.ApplyOrderOutResult; -import com.lyms.platform.operate.web.result.BabyApplyOrderResult; -import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; -import com.lyms.platform.operate.web.result.SieveApplyOrderResult; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; @@ -370,6 +367,10 @@ public class ApplyOrderFacade { applyOrderResult.setApplyDoctor(users.getName()); } } + HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(orderModel.getParentId(), true); + applyOrderResult.setrRisk(highScoreResult.gethighRiskStr()); + applyOrderResult.setScore(highScoreResult.getScore()); + applyOrderResult.setrLevel(highScoreResult.getLevelStr()); data.add(applyOrderResult); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index 98d10c9..0c7a36b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -30,7 +30,7 @@ public class ApplyOrderOutResult { //高危等级 private String rLevel; //风险因素 - private List rRisk; + private String rRisk; private Integer score=0; //病情描述 private String diseaseDesc; @@ -225,17 +225,14 @@ public class ApplyOrderOutResult { this.rLevel = rLevel; } - public List getrRisk() { - if(CollectionUtils.isEmpty(rRisk)){ - List list = new ArrayList<>(); - list.add("-"); - return list; + public String getrRisk() { + if(null==rRisk){ + return SPIT; } - return rRisk; } - public void setrRisk(List rRisk) { + public void setrRisk(String rRisk) { this.rRisk = rRisk; } @@ -284,7 +281,6 @@ public class ApplyOrderOutResult { int days= DateUtil.daysBetween(new Date(),destModel.getDueDate()); this.dueWeek= StringUtils.dueWeek(days); } - setrRisk(destModel.getrRisk()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setApplyDoctor(destModel.getApplyDoctor()); setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated()));