diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 35f9f57..06c793c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -120,6 +120,7 @@ public class PatientServiceController extends BaseController { * 根据条件查询开通服务记录 * * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) + * @param perType 服务对象类型 1-孕妇、2-儿童 * @param serDoct 服务医生 * @param createStartDate 开通开始时间 * @param createEndDate 开通结束时间 @@ -130,6 +131,7 @@ public class PatientServiceController extends BaseController { @TokenRequired @RequestMapping(value = "/patSer/list", method = RequestMethod.GET) public BaseListResponse getPatientService(@RequestParam(value = "serType", required = false) Integer serType, + @RequestParam(value = "perType", required = false) Integer perType, @RequestParam(value = "serDoct", required = false) String serDoct, @RequestParam(value = "createStartDate", required = false) Date createStartDate, @RequestParam(value = "createEndDate", required = false) Date createEndDate, @@ -138,7 +140,7 @@ public class PatientServiceController extends BaseController { HttpServletRequest request ) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientServiceFacade.getPatientService(serType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId()); + return patientServiceFacade.getPatientService(serType,perType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 68cc1d6..d2128f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -432,6 +432,7 @@ public class PatientServiceFacade { * 根据条件查询开通服务记录 * * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) + * @param perType 服务医生 * @param serDoct 服务医生 * @param createStartDate 开通开始时间 * @param createEndDate 开通结束时间 @@ -439,13 +440,19 @@ public class PatientServiceFacade { * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停) * @return */ - public BaseListResponse getPatientService(Integer serType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) { + public BaseListResponse getPatientService(Integer serType,Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(hospitalId); patientQuery.setSerType(serType); patientQuery.setSerDoct(serDoct); + //服务类型 + if(perType==null){ + patientQuery.setPerType(1); + }else{ + patientQuery.setPerType(perType); + } patientQuery.setCreateStartDate(createStartDate); patientQuery.setCreateEndDate(createEndDate); patientQuery.setSerStatus(serStatus);