diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 02e6c12..d745734 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -109,6 +109,9 @@ public class ViewFacade { map.put("isSendCoupon", data.isSendCoupon() == null ? false : data.isSendCoupon()); + map.put("mensStartDay", data.getMensStartDay()); + map.put("mensEndDay", data.getMensEndDay()); + map.put("id", data.getId()); /* 孕妇基础数据 */ map.put("username", data.getUsername()); @@ -1121,6 +1124,7 @@ public class ViewFacade { map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2())); + map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2())); // map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); map.put("quickenRemark",data.getQuickenRemark()); @@ -1735,6 +1739,24 @@ public class ViewFacade { return br; } + private String getTreatmentOpinion3(Map> ids) { + StringBuilder sb = new StringBuilder(); + if(MapUtils.isEmpty(ids)) { + return sb.toString(); + } + Iterator>> iterator = ids.entrySet().iterator(); + while (iterator.hasNext()) { + List list = iterator.next().getValue(); + if(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) { + for (int i = 0; i < list.size(); i++) { + sb.append(i + 1).append(".").append(list.get(i)).append(","); + } + return sb.toString().substring(0, sb.toString().length() - 1); + } + } + return sb.toString(); + } + /** * 复诊查询 * @@ -1809,6 +1831,7 @@ public class ViewFacade { // map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2())); + map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2())); map.put("quicken", QuickenEnums.getName(data.getQuicken())); map.put("quickenRemark", data.getQuickenRemark());