Commit 478c85e37bc5ae70301f0aacfc1debecd0af973b
Exists in
master
and in
2 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
478c85e
... | ... | @@ -479,7 +479,7 @@ |
479 | 479 | if (patients != null) { |
480 | 480 | // 顺便跑成产妇 |
481 | 481 | patients.setType(3); |
482 | - patients.setFmHospital(maternalDeliverModel.getFmHospital()); | |
482 | + patients.setFmHospital(maternalDeliverModel.getHospitalId()); | |
483 | 483 | patients.setFmType(maternalDeliverModel.getDeliveryMode()); |
484 | 484 | try { |
485 | 485 | patients.setFmAge(DateUtil.getAge(patients.getBirth(), patients.getFmDate())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
478c85e
... | ... | @@ -1404,6 +1404,12 @@ |
1404 | 1404 | childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy")); |
1405 | 1405 | |
1406 | 1406 | } |
1407 | + | |
1408 | + // 产后1/2/24小时失血量 | |
1409 | + childbirthManagerQueryModel.setOhloseBloodL(maternalDeliverModel.getoHloseBloodL()); | |
1410 | + childbirthManagerQueryModel.setThloseBloodL(maternalDeliverModel.gettHloseBloodL()); | |
1411 | + childbirthManagerQueryModel.setRhloseBloodL(maternalDeliverModel.getrHloseBloodL()); | |
1412 | + | |
1407 | 1413 | // 胎盘娩出方式,胎盘大小,胎盘重量,脐带长度,脐带是否异常,脐带异常类型 |
1408 | 1414 | if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) { |
1409 | 1415 | List<MaternalDeliverModel.ExtPlacenta> extPlacentaList = maternalDeliverModel.getExtPlacentas(); |