Commit 905308d3465012b8450b755614927447c291283b
1 parent
e9a2336550
Exists in
master
and in
6 other branches
产后复查中分娩方式应该是--，现在是顺产
Showing 1 changed file with 24 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
905308d
| ... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 | import com.lyms.platform.operate.web.request.TrackDownQueryRequest; |
| 15 | 15 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 16 | 16 | import com.lyms.platform.pojo.*; |
| 17 | +import com.lyms.platform.query.MatDeliverQuery; | |
| 17 | 18 | import com.lyms.platform.query.PostReviewQuery; |
| 18 | 19 | import com.lyms.platform.query.TrackDownRecordQuery; |
| 19 | 20 | import org.apache.commons.collections.CollectionUtils; |
| 20 | 21 | |
| ... | ... | @@ -93,7 +94,10 @@ |
| 93 | 94 | @Autowired |
| 94 | 95 | private PostReviewService postReviewService; |
| 95 | 96 | |
| 97 | + @Autowired | |
| 98 | + private MatDeliverService matDeliverService; | |
| 96 | 99 | |
| 100 | + | |
| 97 | 101 | @PostConstruct |
| 98 | 102 | private void init() { |
| 99 | 103 | trackDownTypeHandlerMap = new HashMap<>(); |
| 100 | 104 | |
| 101 | 105 | |
| ... | ... | @@ -331,9 +335,28 @@ |
| 331 | 335 | postReviewQuery.setParentId(downRecord.getParentId()); |
| 332 | 336 | |
| 333 | 337 | Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); |
| 334 | - | |
| 338 | + //分娩时间 | |
| 335 | 339 | temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); |
| 340 | + temp.put("scType", "--"); | |
| 341 | + | |
| 342 | + if(patients.getIsAutoFm()!=null&&patients.getIsAutoFm() == 1){ | |
| 343 | + /** 生产方式 */ | |
| 344 | + temp.put("scType", "自动分娩"); | |
| 345 | + }else { | |
| 346 | + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); | |
| 347 | + matDeliverQuery.setParentId(patients.getId()); | |
| 348 | + matDeliverQuery.setYn(YnEnums.YES.getId()); | |
| 349 | + //查询分娩记录 | |
| 350 | + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); | |
| 351 | + if(CollectionUtils.isNotEmpty(list2)){ | |
| 352 | + MaternalDeliverModel maternalDeliverModel = list2.get(0); | |
| 353 | + /** 生产方式 */ | |
| 354 | + temp.put("scType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); | |
| 355 | + } | |
| 356 | + } | |
| 357 | + //初次复查时间 | |
| 336 | 358 | temp.put("ccfcDate", "--"); |
| 359 | + //预约复查日期 | |
| 337 | 360 | temp.put("yyfcDate ", "--"); |
| 338 | 361 | |
| 339 | 362 | |
| ... | ... | @@ -346,8 +369,6 @@ |
| 346 | 369 | /** 预约复查日期 */ |
| 347 | 370 | temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime())); |
| 348 | 371 | } |
| 349 | - /** 生产方式 */ | |
| 350 | - temp.put("scType", FmTypeEnums.getFmNameById2("1")); | |
| 351 | 372 | return temp; |
| 352 | 373 | } |
| 353 | 374 | } |