jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 11 additions and 2 deletions

...	...	@@ -120,6 +120,7 @@
120	120	* 根据条件查询开通服务记录
121	121	*
122	122	* @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
	123	+ * @param perType 服务对象类型 1-孕妇、2-儿童
123	124	* @param serDoct 服务医生
124	125	* @param createStartDate 开通开始时间
125	126	* @param createEndDate 开通结束时间
...	...	@@ -130,6 +131,7 @@
130	131	@TokenRequired
131	132	@RequestMapping(value = "/patSer/list", method = RequestMethod.GET)
132	133	public BaseListResponse getPatientService(@RequestParam(value = "serType", required = false) Integer serType,
	134	+ @RequestParam(value = "perType", required = false) Integer perType,
133	135	@RequestParam(value = "serDoct", required = false) String serDoct,
134	136	@RequestParam(value = "createStartDate", required = false) Date createStartDate,
135	137	@RequestParam(value = "createEndDate", required = false) Date createEndDate,
...	...	@@ -138,7 +140,7 @@
138	140	HttpServletRequest request
139	141	) {
140	142	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
141		- return patientServiceFacade.getPatientService(serType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId());
	143	+ return patientServiceFacade.getPatientService(serType,perType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId());
142	144	}
143	145
144	146	/**

...	...	@@ -432,6 +432,7 @@
432	432	* 根据条件查询开通服务记录
433	433	*
434	434	* @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
	435	+ * @param perType 服务医生
435	436	* @param serDoct 服务医生
436	437	* @param createStartDate 开通开始时间
437	438	* @param createEndDate 开通结束时间
438	439
...	...	@@ -439,13 +440,19 @@
439	440	* @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
440	441	* @return
441	442	*/
442		- public BaseListResponse getPatientService(Integer serType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) {
	443	+ public BaseListResponse getPatientService(Integer serType,Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) {
443	444	//根据用户id获取医院ID
444	445	String hospitalId = autoMatchFacade.getHospitalId(id);
445	446	PatientServiceQuery patientQuery = new PatientServiceQuery();
446	447	patientQuery.setHospitalId(hospitalId);
447	448	patientQuery.setSerType(serType);
448	449	patientQuery.setSerDoct(serDoct);
	450	+ //服务类型
	451	+ if(perType==null){
	452	+ patientQuery.setPerType(1);
	453	+ }else{
	454	+ patientQuery.setPerType(perType);
	455	+ }
449	456	patientQuery.setCreateStartDate(createStartDate);
450	457	patientQuery.setCreateEndDate(createEndDate);
451	458	patientQuery.setSerStatus(serStatus);