diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 9b03a38..b661cca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -479,7 +479,7 @@ public class BabyBookbuildingFacade { } //建档开通增值服务,若前端没有传入服务信息,默认加入标准服务 - if (CollectionUtils.isNotEmpty(request.getSerInfos())) { + if (CollectionUtils.isEmpty(request.getSerInfos())) { Map serInfo = new HashMap<>(); serInfo.put("serType",PatientSerEnums.SerTypeEnums.babyBzfw.getId().toString()); request.setSerInfos(Arrays.asList(serInfo)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index cf46ddb..28106cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -256,23 +256,38 @@ public class PatientServiceFacade { babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) { - BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); - babyBookbuildingAddRequest.setId(ps.getParentid()); - babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); + PatientServiceQuery query = new PatientServiceQuery(); + query.setParentid(ps.getParentid()); + query.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId()); + int count = patientServiceService.queryPatientServiceCount(query); + //是否有增值服务--没有则处理标准服务 + if (count == 0) { + BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest(); + babyBookbuildingAddRequest.setId(ps.getParentid()); + babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest); + } } } else {//孕妇建档服务数据处理 if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == Integer.parseInt(serInfo.get("serType"))) {//孕期精准指导同步到建档 + YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){ - YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); - yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + PatientServiceQuery query = new PatientServiceQuery(); + query.setParentid(ps.getParentid()); + query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + int count = patientServiceService.queryPatientServiceCount(query); + //是否有增值服务--没有则处理标准服务 + if (count == 0) { + YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest(); + yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + bookbuildingFacade.updatePregnantById(ps.getParentid(), yunBookbuildingAddRequest, userId); + } } } }