Commit faba85d90057edfeb50941027f9cd0541a83e97c
1 parent
eb9070f7b3
Exists in
master
and in
6 other branches
公卫2.0-新增产后42天(产后复查)
Showing 4 changed files with 208 additions and 0 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.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/PostReviewRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
View file @
faba85d
... | ... | @@ -188,6 +188,70 @@ |
188 | 188 | // B超 |
189 | 189 | private String bChao; |
190 | 190 | |
191 | + /** | |
192 | + * 公卫2.0-新增产后42天(产后复查) | |
193 | + */ | |
194 | + //各厂商对接时,再确定具体的值 | |
195 | + private Integer isAppCreate; | |
196 | + //本次随访医师id | |
197 | + private String followupDoctorId; | |
198 | + //本次随访医师姓名 | |
199 | + private String followupDoctorName; | |
200 | + //本人姓名 | |
201 | + private String name; | |
202 | + //本次随访日期 | |
203 | + private String followupDate; | |
204 | + //国家规范版本号 | |
205 | + private String standard; | |
206 | + | |
207 | + public Integer getIsAppCreate() { | |
208 | + return isAppCreate; | |
209 | + } | |
210 | + | |
211 | + public void setIsAppCreate(Integer isAppCreate) { | |
212 | + this.isAppCreate = isAppCreate; | |
213 | + } | |
214 | + | |
215 | + public String getFollowupDoctorId() { | |
216 | + return followupDoctorId; | |
217 | + } | |
218 | + | |
219 | + public void setFollowupDoctorId(String followupDoctorId) { | |
220 | + this.followupDoctorId = followupDoctorId; | |
221 | + } | |
222 | + | |
223 | + public String getFollowupDoctorName() { | |
224 | + return followupDoctorName; | |
225 | + } | |
226 | + | |
227 | + public void setFollowupDoctorName(String followupDoctorName) { | |
228 | + this.followupDoctorName = followupDoctorName; | |
229 | + } | |
230 | + | |
231 | + public String getName() { | |
232 | + return name; | |
233 | + } | |
234 | + | |
235 | + public void setName(String name) { | |
236 | + this.name = name; | |
237 | + } | |
238 | + | |
239 | + public String getFollowupDate() { | |
240 | + return followupDate; | |
241 | + } | |
242 | + | |
243 | + public void setFollowupDate(String followupDate) { | |
244 | + this.followupDate = followupDate; | |
245 | + } | |
246 | + | |
247 | + public String getStandard() { | |
248 | + return standard; | |
249 | + } | |
250 | + | |
251 | + public void setStandard(String standard) { | |
252 | + this.standard = standard; | |
253 | + } | |
254 | + | |
191 | 255 | public String getXhdb() { |
192 | 256 | return xhdb; |
193 | 257 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
faba85d
... | ... | @@ -4738,6 +4738,12 @@ |
4738 | 4738 | map.put("bld", data.getBld()); |
4739 | 4739 | map.put("ncgOther", data.getNcgOther()); |
4740 | 4740 | map.put("bChao", data.getbChao()); |
4741 | + map.put("isAppCreate", data.getIsAppCreate()); | |
4742 | + map.put("followupDoctorId", data.getFollowupDoctorId()); | |
4743 | + map.put("followupDoctorName", data.getFollowupDoctorName()); | |
4744 | + map.put("followupDate", data.getFollowupDate()); | |
4745 | + map.put("name", data.getName()); | |
4746 | + map.put("standard", data.getStandard()); | |
4741 | 4747 | |
4742 | 4748 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
4743 | 4749 | br.setErrormsg("成功"); |
... | ... | @@ -6525,6 +6531,7 @@ |
6525 | 6531 | model.setFollowupVisitDoctorName(checkModel.getFollowupVisitDoctorName()); |
6526 | 6532 | model.setChildHealthExamFormNo(checkModel.getChildHealthExamFormNo()); |
6527 | 6533 | model.setVisitType(checkModel.getVisitType()); |
6534 | + model.setRecordChoice(checkModel.getRecordChoice()); | |
6528 | 6535 | return model; |
6529 | 6536 | |
6530 | 6537 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
View file @
faba85d
... | ... | @@ -185,8 +185,70 @@ |
185 | 185 | |
186 | 186 | // B超 |
187 | 187 | private String bChao; |
188 | + /** | |
189 | + * 公卫2.0-新增产后42天(产后复查) | |
190 | + */ | |
191 | + //各厂商对接时,再确定具体的值 | |
192 | + private Integer isAppCreate; | |
193 | + //本次随访医师id | |
194 | + private String followupDoctorId; | |
195 | + //本次随访医师姓名 | |
196 | + private String followupDoctorName; | |
197 | + //本人姓名 | |
198 | + private String name; | |
199 | + //本次随访日期 | |
200 | + private String followupDate; | |
201 | + //国家规范版本号 | |
202 | + private String standard; | |
188 | 203 | |
204 | + public Integer getIsAppCreate() { | |
205 | + return isAppCreate; | |
206 | + } | |
189 | 207 | |
208 | + public void setIsAppCreate(Integer isAppCreate) { | |
209 | + this.isAppCreate = isAppCreate; | |
210 | + } | |
211 | + | |
212 | + public String getFollowupDoctorId() { | |
213 | + return followupDoctorId; | |
214 | + } | |
215 | + | |
216 | + public void setFollowupDoctorId(String followupDoctorId) { | |
217 | + this.followupDoctorId = followupDoctorId; | |
218 | + } | |
219 | + | |
220 | + public String getFollowupDoctorName() { | |
221 | + return followupDoctorName; | |
222 | + } | |
223 | + | |
224 | + public void setFollowupDoctorName(String followupDoctorName) { | |
225 | + this.followupDoctorName = followupDoctorName; | |
226 | + } | |
227 | + | |
228 | + public String getName() { | |
229 | + return name; | |
230 | + } | |
231 | + | |
232 | + public void setName(String name) { | |
233 | + this.name = name; | |
234 | + } | |
235 | + | |
236 | + public String getFollowupDate() { | |
237 | + return followupDate; | |
238 | + } | |
239 | + | |
240 | + public void setFollowupDate(String followupDate) { | |
241 | + this.followupDate = followupDate; | |
242 | + } | |
243 | + | |
244 | + public String getStandard() { | |
245 | + return standard; | |
246 | + } | |
247 | + | |
248 | + public void setStandard(String standard) { | |
249 | + this.standard = standard; | |
250 | + } | |
251 | + | |
190 | 252 | public String getXhdb() { |
191 | 253 | return xhdb; |
192 | 254 | } |
... | ... | @@ -879,6 +941,12 @@ |
879 | 941 | postReviewModel.setNcgOther(ncgOther); |
880 | 942 | postReviewModel.setbChao(bChao); |
881 | 943 | |
944 | + postReviewModel.setIsAppCreate(isAppCreate); | |
945 | + postReviewModel.setFollowupDoctorId(followupDoctorId); | |
946 | + postReviewModel.setFollowupDoctorName(followupDoctorName); | |
947 | + postReviewModel.setFollowupDate(followupDate); | |
948 | + postReviewModel.setName(name); | |
949 | + postReviewModel.setStandard(standard); | |
882 | 950 | return postReviewModel; |
883 | 951 | } |
884 | 952 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
View file @
faba85d
... | ... | @@ -174,6 +174,21 @@ |
174 | 174 | // B超 |
175 | 175 | private String bChao; |
176 | 176 | |
177 | + /** | |
178 | + * 公卫2.0-新增产后42天(产后复查) | |
179 | + */ | |
180 | + //各厂商对接时,再确定具体的值 | |
181 | + private Integer isAppCreate; | |
182 | + //本次随访医师id | |
183 | + private String followupDoctorId; | |
184 | + //本次随访医师姓名 | |
185 | + private String followupDoctorName; | |
186 | + //本人姓名 | |
187 | + private String name; | |
188 | + //本次随访日期 | |
189 | + private String followupDate; | |
190 | + //国家规范版本号 | |
191 | + private String standard; | |
177 | 192 | |
178 | 193 | |
179 | 194 | public PostReviewResult convertToResult(PostReviewModel postReviewModel) { |
180 | 195 | |
... | ... | @@ -252,7 +267,61 @@ |
252 | 267 | setNcgOther(postReviewModel.getNcgOther()); |
253 | 268 | setbChao(postReviewModel.getbChao()); |
254 | 269 | |
270 | + setIsAppCreate(postReviewModel.getIsAppCreate()); | |
271 | + setFollowupDoctorId(postReviewModel.getFollowupDoctorId()); | |
272 | + setFollowupDoctorName(postReviewModel.getFollowupDoctorName()); | |
273 | + setFollowupDate(postReviewModel.getFollowupDate()); | |
274 | + setName(postReviewModel.getName()); | |
275 | + setStandard(postReviewModel.getStandard()); | |
255 | 276 | return this; |
277 | + } | |
278 | + | |
279 | + public Integer getIsAppCreate() { | |
280 | + return isAppCreate; | |
281 | + } | |
282 | + | |
283 | + public void setIsAppCreate(Integer isAppCreate) { | |
284 | + this.isAppCreate = isAppCreate; | |
285 | + } | |
286 | + | |
287 | + public String getFollowupDoctorId() { | |
288 | + return followupDoctorId; | |
289 | + } | |
290 | + | |
291 | + public void setFollowupDoctorId(String followupDoctorId) { | |
292 | + this.followupDoctorId = followupDoctorId; | |
293 | + } | |
294 | + | |
295 | + public String getFollowupDoctorName() { | |
296 | + return followupDoctorName; | |
297 | + } | |
298 | + | |
299 | + public void setFollowupDoctorName(String followupDoctorName) { | |
300 | + this.followupDoctorName = followupDoctorName; | |
301 | + } | |
302 | + | |
303 | + public String getName() { | |
304 | + return name; | |
305 | + } | |
306 | + | |
307 | + public void setName(String name) { | |
308 | + this.name = name; | |
309 | + } | |
310 | + | |
311 | + public String getFollowupDate() { | |
312 | + return followupDate; | |
313 | + } | |
314 | + | |
315 | + public void setFollowupDate(String followupDate) { | |
316 | + this.followupDate = followupDate; | |
317 | + } | |
318 | + | |
319 | + public String getStandard() { | |
320 | + return standard; | |
321 | + } | |
322 | + | |
323 | + public void setStandard(String standard) { | |
324 | + this.standard = standard; | |
256 | 325 | } |
257 | 326 | |
258 | 327 | public String getXhdb() { |