Commit 7bde78883d3747dc1763b45104a3aec92e92e812
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
7bde788
| ... | ... | @@ -92,13 +92,15 @@ |
| 92 | 92 | @Autowired |
| 93 | 93 | private OrganizationGroupsFacade groupsFacade; |
| 94 | 94 | @Autowired |
| 95 | - private BabyBookbuildingService babyBookbuildingService; | |
| 96 | - @Autowired | |
| 97 | 95 | private BabyPatientExtendEarBabyService earBabyService; |
| 98 | 96 | @Autowired |
| 99 | 97 | private PatientServiceFacade patientServiceFacade; |
| 100 | 98 | |
| 99 | + | |
| 101 | 100 | @Autowired |
| 101 | + private BabyBookbuildingFacade babyBookbuildingFacade; | |
| 102 | + | |
| 103 | + @Autowired | |
| 102 | 104 | private OperateLogFacade operateLogFacade; |
| 103 | 105 | |
| 104 | 106 | |
| ... | ... | @@ -489,6 +491,17 @@ |
| 489 | 491 | babyService.updateOneBaby(baby, baby.getId()); |
| 490 | 492 | babyPatientId = baby.getId(); |
| 491 | 493 | } else {//新增 |
| 494 | + | |
| 495 | + for (Map<String, String> serInfo : babyEarBase.getSerInfos()) { | |
| 496 | + if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { | |
| 497 | + baby.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); | |
| 498 | + baby.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); | |
| 499 | + }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { | |
| 500 | + baby.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); | |
| 501 | + baby.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); | |
| 502 | + } | |
| 503 | + } | |
| 504 | + | |
| 492 | 505 | baby.setId(null); |
| 493 | 506 | baby.setPid(pid); |
| 494 | 507 | baby.setHospitalId(hId); |
| ... | ... | @@ -496,7 +509,7 @@ |
| 496 | 509 | baby.setBuildType(1); |
| 497 | 510 | baby.setCreated(new Date()); |
| 498 | 511 | babyPatientId = babyService.addOneBaby(baby).getId(); |
| 499 | - | |
| 512 | + babyBookbuildingFacade.createBuildMsg(baby); | |
| 500 | 513 | //建档开通增值服务 |
| 501 | 514 | if (CollectionUtils.isNotEmpty(babyEarBase.getSerInfos())) { |
| 502 | 515 | PatientService patientService = new PatientService(); |