diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index e014158..0882af6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -565,7 +565,7 @@ public class MatDeliverFacade { babyModel.setDueDate(patients.getDueDate()); babyModel.setDueType(patients.getDueType()); babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); - babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); babyModel.setCreated(new Date()); babyModel.setModified(new Date()); @@ -887,27 +887,27 @@ public class MatDeliverFacade { babyIds.add(babyService.addOneBaby(babyModel).getId()); baby1.setId(babyModel.getId()); - //儿童分娩自动建档开通增值服务 - if (babyModel.getServiceType() != null) { - PatientService patientService = new PatientService(); - patientService.setPerType(2); - List> serInfos = new ArrayList<>(); - Map serMap = new HashMap<>(); - serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); - serInfos.add(serMap); - patientService.setSerInfos(serInfos); - patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); - //开通日期与建档日期一致 - patientService.setCreateDate(new Date()); - patientService.setParentid(babyModel.getId()); - patientService.setPid(babyModel.getPid()); - try { - patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()), babyModel.getHospitalId()); - } catch (Exception e) { - System.out.println("儿童建档服务开通异常!"); - e.printStackTrace(); - } - } +// //儿童分娩自动建档开通增值服务 +// if (babyModel.getServiceType() != null && ) { +// PatientService patientService = new PatientService(); +// patientService.setPerType(2); +// List> serInfos = new ArrayList<>(); +// Map serMap = new HashMap<>(); +// serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); +// serInfos.add(serMap); +// patientService.setSerInfos(serInfos); +// patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); +// //开通日期与建档日期一致 +// patientService.setCreateDate(new Date()); +// patientService.setParentid(babyModel.getId()); +// patientService.setPid(babyModel.getPid()); +// try { +// patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()), babyModel.getHospitalId()); +// } catch (Exception e) { +// System.out.println("儿童建档服务开通异常!"); +// e.printStackTrace(); +// } +// } if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index b0b01c6..6adb9ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -868,7 +868,7 @@ public class SmsConfigFacade { public List getSendTemplateByServiceStatus(List temps,Integer serviceType,Integer serviceStatus) { List sendList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(temps)) { + if (CollectionUtils.isNotEmpty(temps) && serviceStatus != null) { for (SmsTemplateModel temp : temps) { if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { sendList.add(temp);