diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 202eaf4..f2f7bdc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -32,7 +32,7 @@ public class ReferralApplyOrderModel { private Integer dueWeek; //末次月经 private Date lastMenses; - + private String otherHighRisk; //身份证号 private String cardNo; //母亲身份证号 @@ -80,6 +80,14 @@ public class ReferralApplyOrderModel { private Integer serviceType; + public String getOtherHighRisk() { + return otherHighRisk; + } + + public void setOtherHighRisk(String otherHighRisk) { + this.otherHighRisk = otherHighRisk; + } + public Date getLastMenses() { return lastMenses; } 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 6fbf3fb..0861508 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 @@ -124,6 +124,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setrRisk(highScoreResult.getHighId()); referralApplyOrderModel.setScore(highScoreResult.getScore()); referralApplyOrderModel.setrLevel(highScoreResult.getLevelId()); + referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(days); referralApplyOrderModel.setServiceType(patients.getServiceType()); @@ -569,7 +570,13 @@ public class ApplyOrderFacade { } } HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); - applyOrderResult.setrRisk(highScoreResult.gethighRiskStr()); + String str = ""; + if(StringUtils.isNotEmpty(highScoreResult.gethighRiskStr())){ + str=highScoreResult.gethighRiskStr()+","+orderModel.getOtherHighRisk(); + }else{ + str=orderModel.getOtherHighRisk(); + } + applyOrderResult.setrRisk(str); applyOrderResult.setScore(orderModel.getScore()); applyOrderResult.setrLevel(highScoreResult.getLevelStr()); data.add(applyOrderResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java index d020bac..c6a1f50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java @@ -79,6 +79,24 @@ public class HighScoreResult { return idList; } + public String getOtherHigh(){ + if (null == highRisk) { + return ""; + } + StringBuilder stringBuilder=new StringBuilder(); + for (int i1 = 0; i1 < highRisk.size(); i1++) { + java.util.Map map = (java.util.Map) highRisk.get(i1); + String id = map.get("id"); + if (StringUtils.isEmpty(id)) { + stringBuilder.append(map.get("name")).append(","); + } + } + if(stringBuilder.length()>0){ + stringBuilder.setLength(stringBuilder.length()-1); + } + return stringBuilder.toString(); + } + public void setScore(Integer score) { this.score = score; }