Commit a90f17d8e7bb020a67090ef79f47f7caffe11fe3
1 parent
c88232a3a2
Exists in
master
and in
1 other branch
出院小结
Showing 3 changed files with 31 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
a90f17d
| ... | ... | @@ -2341,7 +2341,6 @@ |
| 2341 | 2341 | patientsQuery.setEnable("2"); |
| 2342 | 2342 | } |
| 2343 | 2343 | Patients patients = null; |
| 2344 | - System.out.println("复诊时查询当前医院是否有隐藏建档条件：" + patientsQuery.convertToQuery().convertToMongoQuery()); | |
| 2345 | 2344 | List<Patients> list = patientsService.queryPatient1(patientsQuery, "modified"); |
| 2346 | 2345 | if (CollectionUtils.isNotEmpty(list)) { |
| 2347 | 2346 | return list.get(0); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
a90f17d
| ... | ... | @@ -598,15 +598,32 @@ |
| 598 | 598 | BabyModelQuery query = new BabyModelQuery(); |
| 599 | 599 | query.setId(babyModel.getId()); |
| 600 | 600 | babyModel1.setParentId(deliverAddRequest.getParentId()); |
| 601 | - //修改分娩后自动建档了 的原因修改成这样 20180703 | |
| 602 | -// if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 603 | -// babyModel1.setYn(YnEnums.YES.getId()); | |
| 604 | -// } else { | |
| 605 | - babyModel1.setYn(YnEnums.NO.getId()); | |
| 606 | 601 | |
| 607 | - //修改满足条件的person数据 | |
| 608 | - List<BabyModel> updateBaby = babyService.queryBabyWithQuery(query); | |
| 602 | + //修改满足条件的person数据 | |
| 603 | + List<BabyModel> updateBaby = babyService.queryBabyWithQuery(query); | |
| 609 | 604 | |
| 605 | + //修改分娩后自动建档了 的原因修改成这样 20180703 | |
| 606 | + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 607 | + //判断是否已经建档 | |
| 608 | + if (CollectionUtils.isNotEmpty(updateBaby) && updateBaby.get(0).getDataStatus() != null && updateBaby.get(0).getDataStatus() == 0) | |
| 609 | + { | |
| 610 | + babyModel1.setYn(YnEnums.YES.getId()); | |
| 611 | + | |
| 612 | + if (CollectionUtils.isNotEmpty(updateBaby)) { | |
| 613 | + for (BabyModel babydel : updateBaby) { | |
| 614 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babydel.getPid())) { | |
| 615 | + PersonModel p = new PersonModel(); | |
| 616 | + p.setYn(YnEnums.YES.getId()); | |
| 617 | + p.setId(babydel.getPid()); | |
| 618 | + personService.updatePerson(p, babydel.getPid()); | |
| 619 | + } | |
| 620 | + } | |
| 621 | + } | |
| 622 | + } | |
| 623 | + } | |
| 624 | + else | |
| 625 | + { | |
| 626 | + babyModel1.setYn(YnEnums.NO.getId()); | |
| 610 | 627 | if (CollectionUtils.isNotEmpty(updateBaby)) { |
| 611 | 628 | for (BabyModel babydel : updateBaby) { |
| 612 | 629 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babydel.getPid())) { |
| ... | ... | @@ -617,7 +634,7 @@ |
| 617 | 634 | } |
| 618 | 635 | } |
| 619 | 636 | } |
| 620 | -// } | |
| 637 | + } | |
| 621 | 638 | babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); |
| 622 | 639 | babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); |
| 623 | 640 | Map map = deliverAddRequest.getDeliveryMode(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
a90f17d
| ... | ... | @@ -114,7 +114,12 @@ |
| 114 | 114 | |
| 115 | 115 | // 查询活产数 |
| 116 | 116 | // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形 |
| 117 | - if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut") || initQuery.contains("sex") || initQuery.contains("babyWeight") || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") || initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") || initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") || initQuery.contains("malformation")) { | |
| 117 | + if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut") | |
| 118 | + || initQuery.contains("sex") || initQuery.contains("babyWeight") | |
| 119 | + || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") || | |
| 120 | + initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") || | |
| 121 | + initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") || | |
| 122 | + initQuery.contains("malformation")) { | |
| 118 | 123 | BabyModelQuery babyModelQuery = new BabyModelQuery(); |
| 119 | 124 | // babyModelQuery.setYn(YnEnums.YES.getId()); |
| 120 | 125 | babyModelQuery.setParentId(patients.getId()); |