jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f631b82e020f7c2b14c3f24caae424fd3a120e52

Authored by liquanyu
1 parent 773f804a32
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

未开通服务服务开通推送

Showing 2 changed files with 31 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ f631b82
... ... @@ -726,8 +726,16 @@
726 726  
727 727 Integer serviceType = 0;
728 728 Integer serviceStatus = 0;
  729 +
  730 + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceTypeEnums.STANDARD_SERVICE.getId()
  731 + && patient.getServiceType() == ServiceStatusEnums.NO_OPEN.getId()))
  732 + {
  733 + serviceType = ServiceTypeEnums.ALL_SERVICE.getId();
  734 + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
  735 + }
  736 +
729 737 //根据服务状态和服务类型获取可以发送的模板
730   - List<SmsTemplateModel> sendList = smsConfigFacade.getSendTemplateByServiceStatus(temps, serviceType, serviceStatus);
  738 + List<SmsTemplateModel> sendList = smsConfigFacade.getSendTemplateEqServiceStatus(temps, serviceType, serviceStatus);
731 739  
732 740 if (CollectionUtils.isNotEmpty(temps)) {
733 741 if (CollectionUtils.isNotEmpty(sendList)) {
... ... @@ -785,7 +793,6 @@
785 793 mr.setServiceType((templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) ? 1 : 3); //判断发送类型
786 794  
787 795 mr.setTypeId(templateModel.getHealthType());
788   - System.out.println("patient.getLastCheckEmployeeId()=" +doctorId);
789 796  
790 797  
791 798 mr.setKeyword2(DateUtil.getymd());
792 799  
... ... @@ -847,8 +854,15 @@
847 854 Integer serviceType = 0;
848 855 Integer serviceStatus = 0;
849 856  
  857 + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceTypeEnums.STANDARD_SERVICE.getId()
  858 + && patient.getServiceType() == ServiceStatusEnums.NO_OPEN.getId()))
  859 + {
  860 + serviceType = ServiceTypeEnums.ALL_SERVICE.getId();
  861 + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
  862 + }
  863 +
850 864 //根据服务状态和服务类型获取可以发送的模板
851   - List<SmsTemplateModel> sendList = smsConfigFacade.getSendTemplateByServiceStatus(temps, serviceType, serviceStatus);
  865 + List<SmsTemplateModel> sendList = smsConfigFacade.getSendTemplateEqServiceStatus(temps, serviceType, serviceStatus);
852 866  
853 867 if (CollectionUtils.isNotEmpty(temps)) {
854 868 if (CollectionUtils.isNotEmpty(sendList)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ f631b82
... ... @@ -903,6 +903,20 @@
903 903 }
904 904  
905 905  
  906 + public List<SmsTemplateModel> getSendTemplateEqServiceStatus(List<SmsTemplateModel> temps,Integer serviceType,Integer serviceStatus)
  907 + {
  908 + List<SmsTemplateModel> sendList = new ArrayList<>();
  909 + if (CollectionUtils.isNotEmpty(temps) && serviceStatus != null && serviceType != null) {
  910 + for (SmsTemplateModel temp : temps) {
  911 + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) {
  912 + sendList.add(temp);
  913 + }
  914 + }
  915 + }
  916 + return sendList;
  917 + }
  918 +
  919 +
906 920 /**
907 921 * 判断对应服务是否启动
908 922 * return 1 推送服务， 2 推送和短信服务 3短信服务，