diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java index ccf5817..cab4398 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java @@ -6,6 +6,7 @@ import com.lyms.platform.pojo.AppointmentModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service("appointmentService") public class AppointmentServiceImpl implements AppointmentService { diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml index 4cbb972..9b5fa39 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -31,7 +31,7 @@ and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%')) - and dept like concat(#{dept},'%') + and (dept like concat(#{dept},'%') or dept like concat("产后",'%')) and =#{startTime}]]> and diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a13c427..e315af4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2072,7 +2072,9 @@ public class PatientFacade extends BaseServiceImpl { } //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion,hospital); - + if ("2100002419".equals(hospital)){ + patientsQuery.setDtFm(true); + } //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient2 -" + hospital); stopWatch.start(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 54eed92..93f9cfe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -400,12 +400,12 @@ public class RiskReportFacade { patientsQuery.setHospitalId(hospitalId); if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) { + if ("2100002419".equals(hospitalId)){ + patientsQuery.setDtFm(true); + } if ("2".equals(riskPatientsQueryRequest.getType())) { //1孕妇 patientsQuery.setType(1); - if ("2100002419".equals(hospitalId)){ - patientsQuery.setDtFm(true); - } } else if ("3".equals(riskPatientsQueryRequest.getType())) { //3产妇 patientsQuery.setType(3); @@ -684,12 +684,13 @@ public class RiskReportFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) { + if ("2100002419".equals(hospitalId)){ + patientsQuery.setDtFm(true); + } if ("2".equals(riskPatientsQueryRequest.getType())) { //1孕妇 patientsQuery.setType(1); - if ("2100002419".equals(hospitalId)){ - patientsQuery.setDtFm(true); - } + } else if ("3".equals(riskPatientsQueryRequest.getType())) { //3产妇 patientsQuery.setType(3);