Commit a5846678b2a1f40a08e352cfaa9b4daaa1830242
1 parent
8cadd882e0
Exists in
master
and in
6 other branches
儿童高危继承
Showing 1 changed file with 20 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
a584667
... | ... | @@ -2652,12 +2652,30 @@ |
2652 | 2652 | result.setDueType(babyModel.getDueType()); |
2653 | 2653 | result.setMalformation(babyModel.getMalformation()); |
2654 | 2654 | result.setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class)); |
2655 | - //母亲高危因素 | |
2656 | - result.setmHighRiskReason2(queryRisk(babyModel.getmHighRiskReason(),false).getHighRisk()); | |
2655 | + | |
2657 | 2656 | result.setFatherProfessionTypeId(babyModel.getFproTypeId()); |
2658 | 2657 | |
2659 | 2658 | result.setDueWeek(babyModel.getDueWeek()); |
2660 | 2659 | result.setDueDay(babyModel.getDueDay()); |
2660 | + | |
2661 | + | |
2662 | + if (babyModel.getmHighRiskReason() == null || babyModel.getmHighRiskReason().size() != 0) | |
2663 | + { | |
2664 | + if (StringUtils.isNotEmpty(babyModel.getParentId())) | |
2665 | + { | |
2666 | + Patients pat = patientsService.findOnePatientById(babyModel.getParentId()); | |
2667 | + | |
2668 | + //母亲高危因素 | |
2669 | + result.setmHighRiskReason2(queryRisk(pat.getRiskFactorId(),false).getHighRisk()); | |
2670 | + //母亲高危因素 | |
2671 | + result.setmHighRiskReason(queryRisk(pat.getRiskFactorId(),false).getHighRisk()); | |
2672 | + } | |
2673 | + } | |
2674 | + else | |
2675 | + { | |
2676 | + //母亲高危因素 | |
2677 | + result.setmHighRiskReason2(queryRisk(babyModel.getmHighRiskReason(),false).getHighRisk()); | |
2678 | + } | |
2661 | 2679 | } else { |
2662 | 2680 | patientsQuery.setPhoneOrCert(cardNo); |
2663 | 2681 | List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |