Commit 117319dd705bb9bdba87e0684d1da20ea7a1be3c
1 parent
4260239121
Exists in
master
and in
6 other branches
出院小结增加听筛结果、是否高危儿、高危儿详情
Showing 4 changed files with 29 additions and 29 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
View file @
117319d
... | ... | @@ -148,9 +148,9 @@ |
148 | 148 | private Integer isUNHS; |
149 | 149 | |
150 | 150 | /** |
151 | - * 听筛结果 | |
151 | + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 | |
152 | 152 | */ |
153 | - private Map<String,Object> hearScrResult; | |
153 | + private Integer hearScrResult; | |
154 | 154 | |
155 | 155 | /** |
156 | 156 | * @auther HuJiaqi |
157 | 157 | |
... | ... | @@ -160,11 +160,11 @@ |
160 | 160 | private Integer isOtherScreen; |
161 | 161 | |
162 | 162 | //是否高危儿童 |
163 | - private boolean isHighRisk; | |
163 | + private String isHighRisk; | |
164 | 164 | /** |
165 | 165 | * 高危详情 |
166 | 166 | */ |
167 | - private Map highRiskResult; | |
167 | + private Map<String,Object> highRiskResult; | |
168 | 168 | |
169 | 169 | /** |
170 | 170 | * @auther HuJiaqi |
171 | 171 | |
172 | 172 | |
173 | 173 | |
174 | 174 | |
175 | 175 | |
... | ... | @@ -182,27 +182,27 @@ |
182 | 182 | |
183 | 183 | private Integer yn; |
184 | 184 | |
185 | - public boolean isHighRisk() { | |
185 | + public String getIsHighRisk() { | |
186 | 186 | return isHighRisk; |
187 | 187 | } |
188 | 188 | |
189 | - public void setHighRisk(boolean highRisk) { | |
190 | - isHighRisk = highRisk; | |
189 | + public void setIsHighRisk(String isHighRisk) { | |
190 | + this.isHighRisk = isHighRisk; | |
191 | 191 | } |
192 | 192 | |
193 | - public Map getHighRiskResult() { | |
193 | + public Map<String, Object> getHighRiskResult() { | |
194 | 194 | return highRiskResult; |
195 | 195 | } |
196 | 196 | |
197 | - public void setHighRiskResult(Map highRiskResult) { | |
197 | + public void setHighRiskResult(Map<String, Object> highRiskResult) { | |
198 | 198 | this.highRiskResult = highRiskResult; |
199 | 199 | } |
200 | 200 | |
201 | - public Map<String, Object> getHearScrResult() { | |
201 | + public Integer getHearScrResult() { | |
202 | 202 | return hearScrResult; |
203 | 203 | } |
204 | 204 | |
205 | - public void setHearScrResult(Map<String, Object> hearScrResult) { | |
205 | + public void setHearScrResult(Integer hearScrResult) { | |
206 | 206 | this.hearScrResult = hearScrResult; |
207 | 207 | } |
208 | 208 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
117319d
... | ... | @@ -2984,8 +2984,8 @@ |
2984 | 2984 | babyMap.put("isCH", FunvCommonUtil.checkIsScreening(temp.getIsCH())); |
2985 | 2985 | babyMap.put("isUNHS", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); |
2986 | 2986 | babyMap.put("hearScrResult", temp.getHearScrResult()); |
2987 | - babyMap.put("isHighRisk", temp.isHighRisk()); | |
2988 | - babyMap.put("highRiskResult", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); | |
2987 | + babyMap.put("isHighRisk", temp.getIsHighRisk()); | |
2988 | + babyMap.put("highRiskResult", temp.getHighRiskResult()); | |
2989 | 2989 | |
2990 | 2990 | String isOtherScreen = ""; |
2991 | 2991 | if (temp.getIsOtherScreen() != null) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
View file @
117319d
... | ... | @@ -210,12 +210,12 @@ |
210 | 210 | */ |
211 | 211 | private Integer isUNHS; |
212 | 212 | /** |
213 | - * 听筛结果 | |
213 | + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 | |
214 | 214 | */ |
215 | - private Map hearScrResult; | |
215 | + private Integer hearScrResult; | |
216 | 216 | |
217 | 217 | //是否高危儿童 |
218 | - private boolean isHighRisk; | |
218 | + private String isHighRisk; | |
219 | 219 | /** |
220 | 220 | * 高危详情 |
221 | 221 | */ |
222 | 222 | |
... | ... | @@ -235,12 +235,12 @@ |
235 | 235 | */ |
236 | 236 | private String orderScreenDescription; |
237 | 237 | |
238 | - public boolean isHighRisk() { | |
238 | + public String getIsHighRisk() { | |
239 | 239 | return isHighRisk; |
240 | 240 | } |
241 | 241 | |
242 | - public void setHighRisk(boolean highRisk) { | |
243 | - isHighRisk = highRisk; | |
242 | + public void setIsHighRisk(String isHighRisk) { | |
243 | + this.isHighRisk = isHighRisk; | |
244 | 244 | } |
245 | 245 | |
246 | 246 | public Map getHighRiskResult() { |
247 | 247 | |
... | ... | @@ -251,11 +251,11 @@ |
251 | 251 | this.highRiskResult = highRiskResult; |
252 | 252 | } |
253 | 253 | |
254 | - public Map getHearScrResult() { | |
254 | + public Integer getHearScrResult() { | |
255 | 255 | return hearScrResult; |
256 | 256 | } |
257 | 257 | |
258 | - public void setHearScrResult(Map hearScrResult) { | |
258 | + public void setHearScrResult(Integer hearScrResult) { | |
259 | 259 | this.hearScrResult = hearScrResult; |
260 | 260 | } |
261 | 261 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
View file @
117319d
... | ... | @@ -137,12 +137,12 @@ |
137 | 137 | private Integer isUNHS; |
138 | 138 | |
139 | 139 | /** |
140 | - * 听筛结果 | |
140 | + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 | |
141 | 141 | */ |
142 | - private Map hearScrResult; | |
142 | + private Integer hearScrResult; | |
143 | 143 | |
144 | 144 | //是否高危儿童 |
145 | - private boolean isHighRisk; | |
145 | + private String isHighRisk; | |
146 | 146 | /** |
147 | 147 | * 高危详情 |
148 | 148 | */ |
149 | 149 | |
... | ... | @@ -162,12 +162,12 @@ |
162 | 162 | */ |
163 | 163 | private String orderScreenDescription; |
164 | 164 | |
165 | - public boolean isHighRisk() { | |
165 | + public String getIsHighRisk() { | |
166 | 166 | return isHighRisk; |
167 | 167 | } |
168 | 168 | |
169 | - public void setHighRisk(boolean highRisk) { | |
170 | - isHighRisk = highRisk; | |
169 | + public void setIsHighRisk(String isHighRisk) { | |
170 | + this.isHighRisk = isHighRisk; | |
171 | 171 | } |
172 | 172 | |
173 | 173 | public Map getHighRiskResult() { |
174 | 174 | |
... | ... | @@ -178,11 +178,11 @@ |
178 | 178 | this.highRiskResult = highRiskResult; |
179 | 179 | } |
180 | 180 | |
181 | - public Map getHearScrResult() { | |
181 | + public Integer getHearScrResult() { | |
182 | 182 | return hearScrResult; |
183 | 183 | } |
184 | 184 | |
185 | - public void setHearScrResult(Map hearScrResult) { | |
185 | + public void setHearScrResult(Integer hearScrResult) { | |
186 | 186 | this.hearScrResult = hearScrResult; |
187 | 187 | } |
188 | 188 |