jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2b1853276e65e58d5e46d6b37418b30713a49177

Authored by jiangjiazhi
2 parents 1623744c0f 5ec7ee3b0b
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 2b18532
... ... @@ -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();
... ... @@ -470,6 +471,11 @@
470 471 fmfs = map.get("fmfs").toString();
471 472 }
472 473 babyModel1.setDueType(fmfs);
  474 +
  475 + if (null != deliverAddRequest.getDueDate()) {
  476 + int day = DateUtil.getDays(lastMenses, DateUtil.parseYMD(deliverAddRequest.getDueDate()));
  477 + babyModel1.setDueWeek(day / 7);
  478 + }
473 479 babyModel1.setBabyHeight(baby.getBabyHeight());
474 480 babyModel1.setBabyWeight(baby.getBabyWeight());
475 481 babyService.findAndModify(query.convertToQuery(), babyModel1);
... ... @@ -739,6 +745,12 @@
739 745 maternalDeliverModel.setYn(YnEnums.NO.getId());
740 746 maternalDeliverModel.setId(id);
741 747 matDeliverService.updateOne(maternalDeliverModel, id);
  748 + // 删除时设置patient表为自动分娩
  749 + Patients patients = new Patients();
  750 + patients.setId(matModel.getParentId());
  751 + patients.setIsAutoFm(YnEnums.YES.getId());
  752 + patientsService.updatePatient(patients);
  753 +
742 754 //删除分娩记录的时候删除分娩的小孩信息
743 755 BabyModelQuery babyModelQuery=new BabyModelQuery();
744 756 babyModelQuery.setParentId(matModel.getParentId());