Commit b54ac83aa3c5be53879cd5b3eaa792b5bba7ff58
1 parent
f8646c3484
Exists in
master
and in
6 other branches
服务
Showing 2 changed files with 23 additions and 23 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
b54ac83
| ... | ... | @@ -565,7 +565,7 @@ |
| 565 | 565 | babyModel.setDueDate(patients.getDueDate()); |
| 566 | 566 | babyModel.setDueType(patients.getDueType()); |
| 567 | 567 | babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); |
| 568 | - babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); | |
| 568 | + babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); | |
| 569 | 569 | babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); |
| 570 | 570 | babyModel.setCreated(new Date()); |
| 571 | 571 | babyModel.setModified(new Date()); |
| ... | ... | @@ -887,27 +887,27 @@ |
| 887 | 887 | babyIds.add(babyService.addOneBaby(babyModel).getId()); |
| 888 | 888 | baby1.setId(babyModel.getId()); |
| 889 | 889 | |
| 890 | - //儿童分娩自动建档开通增值服务 | |
| 891 | - if (babyModel.getServiceType() != null) { | |
| 892 | - PatientService patientService = new PatientService(); | |
| 893 | - patientService.setPerType(2); | |
| 894 | - List<Map<String, String>> serInfos = new ArrayList<>(); | |
| 895 | - Map<String, String> serMap = new HashMap<>(); | |
| 896 | - serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); | |
| 897 | - serInfos.add(serMap); | |
| 898 | - patientService.setSerInfos(serInfos); | |
| 899 | - patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); | |
| 900 | - //开通日期与建档日期一致 | |
| 901 | - patientService.setCreateDate(new Date()); | |
| 902 | - patientService.setParentid(babyModel.getId()); | |
| 903 | - patientService.setPid(babyModel.getPid()); | |
| 904 | - try { | |
| 905 | - patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()), babyModel.getHospitalId()); | |
| 906 | - } catch (Exception e) { | |
| 907 | - System.out.println("儿童建档服务开通异常！"); | |
| 908 | - e.printStackTrace(); | |
| 909 | - } | |
| 910 | - } | |
| 890 | +// //儿童分娩自动建档开通增值服务 | |
| 891 | +// if (babyModel.getServiceType() != null && ) { | |
| 892 | +// PatientService patientService = new PatientService(); | |
| 893 | +// patientService.setPerType(2); | |
| 894 | +// List<Map<String, String>> serInfos = new ArrayList<>(); | |
| 895 | +// Map<String, String> serMap = new HashMap<>(); | |
| 896 | +// serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId())); | |
| 897 | +// serInfos.add(serMap); | |
| 898 | +// patientService.setSerInfos(serInfos); | |
| 899 | +// patientService.setCreateUser(String.valueOf("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29")); | |
| 900 | +// //开通日期与建档日期一致 | |
| 901 | +// patientService.setCreateDate(new Date()); | |
| 902 | +// patientService.setParentid(babyModel.getId()); | |
| 903 | +// patientService.setPid(babyModel.getPid()); | |
| 904 | +// try { | |
| 905 | +// patientServiceFacade.addPatientService(patientService, Integer.parseInt(patients.getBookbuildingDoctor()), babyModel.getHospitalId()); | |
| 906 | +// } catch (Exception e) { | |
| 907 | +// System.out.println("儿童建档服务开通异常！"); | |
| 908 | +// e.printStackTrace(); | |
| 909 | +// } | |
| 910 | +// } | |
| 911 | 911 | |
| 912 | 912 | |
| 913 | 913 | if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
b54ac83
| ... | ... | @@ -868,7 +868,7 @@ |
| 868 | 868 | public List<SmsTemplateModel> getSendTemplateByServiceStatus(List<SmsTemplateModel> temps,Integer serviceType,Integer serviceStatus) |
| 869 | 869 | { |
| 870 | 870 | List<SmsTemplateModel> sendList = new ArrayList<>(); |
| 871 | - if (CollectionUtils.isNotEmpty(temps)) { | |
| 871 | + if (CollectionUtils.isNotEmpty(temps) && serviceStatus != null) { | |
| 872 | 872 | for (SmsTemplateModel temp : temps) { |
| 873 | 873 | if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { |
| 874 | 874 | sendList.add(temp); |