Commit e1504baed2381fc4a9bb4bc3380e3d3da848cb15
1 parent
dcb9d99ad1
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 22 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
e1504ba
... | ... | @@ -283,8 +283,7 @@ |
283 | 283 | List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies(); |
284 | 284 | //修改小孩信息 |
285 | 285 | if (CollectionUtils.isNotEmpty(list)) { |
286 | - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses() | |
287 | - )); | |
286 | + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses())); | |
288 | 287 | } |
289 | 288 | |
290 | 289 | matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); |
... | ... | @@ -478,6 +477,27 @@ |
478 | 477 | } |
479 | 478 | babyModel1.setBabyHeight(baby.getBabyHeight()); |
480 | 479 | babyModel1.setBabyWeight(baby.getBabyWeight()); |
480 | + | |
481 | + babyModel1.setDeliverOrg(deliverAddRequest.getFmHospital()); | |
482 | + babyModel1.setBirth(DateUtil.parseYMDHM(baby.getDueTime())); | |
483 | + | |
484 | + babyModel1.setDueType(fmfs); | |
485 | + babyModel1.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); | |
486 | + babyModel1.setAsphyxiaM(baby.getAsphyxiaM()); | |
487 | + babyModel1.setFetusCount(deliverAddRequest.getTireNumber() + ""); | |
488 | + if (null != baby.getBabyGender()) { | |
489 | + babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); | |
490 | + } | |
491 | + | |
492 | + babyModel1.setApgarScore(JsonUtil.obj2JsonString(baby.getApgarScore())); | |
493 | + babyModel1.setBabyHealthy(baby.getBabyHealthy()); | |
494 | + babyModel1.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby.getBabyWeight())); | |
495 | + babyModel1.setBabyHeight(baby.getBabyHeight()); | |
496 | + babyModel1.setMalformation(baby.getDeformity()); | |
497 | + babyModel1.setPregnancyOut(baby.getPregnancyOut()); | |
498 | + babyModel1.setContactM(baby.getContactM()); | |
499 | + babyModel1.setContactStartM(baby.getContactStartM()); | |
500 | + babyModel1.setEarlySuck(baby.getEarlySuck()); | |
481 | 501 | babyService.findAndModify(query.convertToQuery(), babyModel1); |
482 | 502 | } |
483 | 503 | babyList.add(babyModel); |