diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 6e963b5..faddce2 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -143,6 +143,10 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + patientsQuery.setBuildTypeList(buildType); //1孕妇 3 产妇 patientsQuery.setType(1); //分娩状态 @@ -517,6 +521,11 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setType(3); patientsQuery.setDueStatus(0); + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + patientsQuery.setBuildTypeList(buildType); + // //末次月经必须大于当前时间减去42周视为为分娩孕妇 // Date lastMensesMax = DateUtil.addDay(new Date(), -42); // patientsQuery.setLastMensesStart(lastMensesMax); @@ -703,6 +712,11 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + patientsQuery.setBuildTypeList(buildType); + //1孕妇 patientsQuery.setType(1); // 0未终止妊娠 1终止妊娠 @@ -1362,6 +1376,11 @@ public class SmsServiceImpl implements SmsService{ PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); + + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + patientsQuery.setBuildTypeList(buildType); //1孕妇 3产妇 patientsQuery.setType(3); //0未终止妊娠的产妇 @@ -1610,22 +1629,26 @@ public class SmsServiceImpl implements SmsService{ //全部发送对象 else if (serviceObj == ServiceObjEnums.ALLOBJ.getId()) { + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + + //3产妇 PatientsQuery chanPatientsQuery = new PatientsQuery(); chanPatientsQuery.setYn(YnEnums.YES.getId()); chanPatientsQuery.setHospitalId(hospitalId); - - //3产妇 + chanPatientsQuery.setBuildTypeList(buildType); chanPatientsQuery.setType(3); chanPatientsQuery.setDueStatus(0); getServicePatientQuery(serviceType, serviceStatus, chanPatientsQuery); - + //1孕妇 PatientsQuery yunPatientsQuery = new PatientsQuery(); yunPatientsQuery.setYn(YnEnums.YES.getId()); yunPatientsQuery.setHospitalId(hospitalId); - //1孕妇 yunPatientsQuery.setType(1); - chanPatientsQuery.setDueStatus(0); + yunPatientsQuery.setDueStatus(0); + yunPatientsQuery.setBuildTypeList(buildType); getServicePatientQuery(serviceType, serviceStatus, yunPatientsQuery);