Commit ae28ce863d2609f813bbc98d35d75e14ebe70561
1 parent
1ae162ebf7
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 30 additions and 21 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
ae28ce8
| ... | ... | @@ -437,27 +437,29 @@ |
| 437 | 437 | List<MaternalDeliverModel.Baby> babyList = new ArrayList<>(); |
| 438 | 438 | for (MatDeliverAddRequest.Baby baby : list) { |
| 439 | 439 | MaternalDeliverModel.Baby babyModel = baby.convertToDataModel(); |
| 440 | - //判断妊娠结局是活产才添加数据 | |
| 441 | - BabyModel babyModel1=new BabyModel(); | |
| 442 | - MatDeliverQuery query=new MatDeliverQuery(); | |
| 443 | - query.setId(deliverAddRequest.getId()); | |
| 444 | - babyModel1.setParentId(deliverAddRequest.getParentId()); | |
| 445 | - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 446 | - babyModel1.setYn(YnEnums.YES.getId()); | |
| 447 | - }else{ | |
| 448 | - babyModel1.setYn(YnEnums.NO.getId()); | |
| 440 | + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getId())){ | |
| 441 | + //判断妊娠结局是活产才添加数据 | |
| 442 | + BabyModel babyModel1=new BabyModel(); | |
| 443 | + BabyModelQuery query=new BabyModelQuery(); | |
| 444 | + query.setId(babyModel.getId()); | |
| 445 | + babyModel1.setParentId(deliverAddRequest.getParentId()); | |
| 446 | + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 447 | + babyModel1.setYn(YnEnums.YES.getId()); | |
| 448 | + }else{ | |
| 449 | + babyModel1.setYn(YnEnums.NO.getId()); | |
| 450 | + } | |
| 451 | + babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); | |
| 452 | + babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); | |
| 453 | + Map map = deliverAddRequest.getDeliveryMode(); | |
| 454 | + String fmfs = null; | |
| 455 | + if (!map.isEmpty()) { | |
| 456 | + fmfs = map.get("fmfs").toString(); | |
| 457 | + } | |
| 458 | + babyModel1.setDueType(fmfs); | |
| 459 | + babyModel1.setBabyHeight(baby.getBabyHeight()); | |
| 460 | + babyModel1.setBabyWeight(baby.getBabyWeight()); | |
| 461 | + babyService.findAndModify(query.convertToQuery(), babyModel1); | |
| 449 | 462 | } |
| 450 | - babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); | |
| 451 | - babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); | |
| 452 | - Map map = deliverAddRequest.getDeliveryMode(); | |
| 453 | - String fmfs = null; | |
| 454 | - if (!map.isEmpty()) { | |
| 455 | - fmfs = map.get("fmfs").toString(); | |
| 456 | - } | |
| 457 | - babyModel1.setDueType(fmfs); | |
| 458 | - babyModel1.setBabyHeight(baby.getBabyHeight()); | |
| 459 | - babyModel1.setBabyWeight(baby.getBabyWeight()); | |
| 460 | - babyService.findAndModify(query.convertToQuery(), babyModel1); | |
| 461 | 463 | babyList.add(babyModel); |
| 462 | 464 | } |
| 463 | 465 | return babyList; |
| ... | ... | @@ -679,7 +681,6 @@ |
| 679 | 681 | } |
| 680 | 682 | } |
| 681 | 683 | |
| 682 | - | |
| 683 | 684 | AntExQuery antExQuery = new AntExQuery(); |
| 684 | 685 | antExQuery.setParentId(patients.getId()); |
| 685 | 686 | antExQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -724,6 +725,14 @@ |
| 724 | 725 | maternalDeliverModel.setYn(YnEnums.NO.getId()); |
| 725 | 726 | maternalDeliverModel.setId(id); |
| 726 | 727 | matDeliverService.updateOne(maternalDeliverModel, id); |
| 728 | + //删除分娩记录的时候删除分娩的小孩信息 | |
| 729 | + BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
| 730 | + babyModelQuery.setParentId(matModel.getParentId()); | |
| 731 | + babyModelQuery.setYn(YnEnums.YES.getId()); | |
| 732 | + | |
| 733 | + BabyModel babyModel=new BabyModel(); | |
| 734 | + babyModel.setYn(YnEnums.NO.getId()); | |
| 735 | + babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel); | |
| 727 | 736 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 728 | 737 | } |
| 729 | 738 | return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("不能删除该条数据"); |