Commit 053b35520c1482545a30d43ff46af003463e9fa3
1 parent
f6351cc71d
Exists in
master
and in
7 other branches
BUG
Showing 1 changed file with 15 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
053b355
| ... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 | if (CollectionUtils.isEmpty(babyModels)) { |
| 238 | 238 | handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId); |
| 239 | 239 | } else { |
| 240 | - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list)); | |
| 240 | + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients1.getLastMenses())); | |
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | |
| ... | ... | @@ -283,7 +283,8 @@ |
| 283 | 283 | List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies(); |
| 284 | 284 | //修改小孩信息 |
| 285 | 285 | if (CollectionUtils.isNotEmpty(list)) { |
| 286 | - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list)); | |
| 286 | + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses() | |
| 287 | + )); | |
| 287 | 288 | } |
| 288 | 289 | |
| 289 | 290 | matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); |
| ... | ... | @@ -433,7 +434,7 @@ |
| 433 | 434 | * @param list |
| 434 | 435 | * @return |
| 435 | 436 | */ |
| 436 | - private List updateBaby(MatDeliverAddRequest deliverAddRequest,List<MatDeliverAddRequest.Baby> list ){ | |
| 437 | + private List updateBaby(MatDeliverAddRequest deliverAddRequest,List<MatDeliverAddRequest.Baby> list ,Date lastMenses){ | |
| 437 | 438 | List<MaternalDeliverModel.Baby> babyList = new ArrayList<>(); |
| 438 | 439 | for (MatDeliverAddRequest.Baby baby : list) { |
| 439 | 440 | MaternalDeliverModel.Baby babyModel = baby.convertToDataModel(); |
| ... | ... | @@ -456,6 +457,11 @@ |
| 456 | 457 | fmfs = map.get("fmfs").toString(); |
| 457 | 458 | } |
| 458 | 459 | babyModel1.setDueType(fmfs); |
| 460 | + | |
| 461 | + if (null != deliverAddRequest.getDueDate()) { | |
| 462 | + int day = DateUtil.getDays(lastMenses, DateUtil.parseYMD(deliverAddRequest.getDueDate())); | |
| 463 | + babyModel1.setDueWeek(day / 7); | |
| 464 | + } | |
| 459 | 465 | babyModel1.setBabyHeight(baby.getBabyHeight()); |
| 460 | 466 | babyModel1.setBabyWeight(baby.getBabyWeight()); |
| 461 | 467 | babyService.findAndModify(query.convertToQuery(), babyModel1); |
| ... | ... | @@ -725,6 +731,12 @@ |
| 725 | 731 | maternalDeliverModel.setYn(YnEnums.NO.getId()); |
| 726 | 732 | maternalDeliverModel.setId(id); |
| 727 | 733 | matDeliverService.updateOne(maternalDeliverModel, id); |
| 734 | + // 删除时设置patient表为自动分娩 | |
| 735 | + Patients patients = new Patients(); | |
| 736 | + patients.setId(matModel.getParentId()); | |
| 737 | + patients.setIsAutoFm(YnEnums.YES.getId()); | |
| 738 | + patientsService.updatePatient(patients); | |
| 739 | + | |
| 728 | 740 | //删除分娩记录的时候删除分娩的小孩信息 |
| 729 | 741 | BabyModelQuery babyModelQuery=new BabyModelQuery(); |
| 730 | 742 | babyModelQuery.setParentId(matModel.getParentId()); |