Commit 48665bdaa9a2d45667dfe3500ee0700b81333573
1 parent
a0f158e7e5
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 30 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
48665bd
... | ... | @@ -1081,6 +1081,9 @@ |
1081 | 1081 | Query query=Query.query(criteria); |
1082 | 1082 | BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class); |
1083 | 1083 | base.setCyzd(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzd() : ""); |
1084 | + base.setCyzdList(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzdList() : null); | |
1085 | + //预产期 | |
1086 | + base.setBirthDueDate(babyHighRiskBabyModel.getBirthDueDate()); | |
1084 | 1087 | } |
1085 | 1088 | resMap.put("baseInfo", base); |
1086 | 1089 | resMap.put("checkList", list); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
View file @
48665bd
1 | 1 | package com.lyms.platform.operate.web.result; |
2 | 2 | |
3 | +import java.util.Date; | |
3 | 4 | import java.util.List; |
4 | 5 | import java.util.Map; |
5 | 6 | |
... | ... | @@ -133,6 +134,32 @@ |
133 | 134 | private List<Map<String,String>> qhdHighRiskInfo; |
134 | 135 | //基本信息里的出院诊断 |
135 | 136 | private String cyzd; |
137 | + | |
138 | + /** | |
139 | + * 秦皇岛-出院诊断模块整合(住院号,住院时间,出院诊断) | |
140 | + */ | |
141 | + //出院诊断list<map> | |
142 | + private List<Map<String,Object>> cyzdList; | |
143 | + | |
144 | + public List<Map<String, Object>> getCyzdList() { | |
145 | + return cyzdList; | |
146 | + } | |
147 | + | |
148 | + public void setCyzdList(List<Map<String, Object>> cyzdList) { | |
149 | + this.cyzdList = cyzdList; | |
150 | + } | |
151 | + /***********************************************************/ | |
152 | + | |
153 | + //秦皇岛-新增检查页面需要预产期 | |
154 | + private Date birthDueDate; | |
155 | + | |
156 | + public Date getBirthDueDate() { | |
157 | + return birthDueDate; | |
158 | + } | |
159 | + | |
160 | + public void setBirthDueDate(Date birthDueDate) { | |
161 | + this.birthDueDate = birthDueDate; | |
162 | + } | |
136 | 163 | |
137 | 164 | public String getCyzd() { |
138 | 165 | return cyzd; |