jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 19 additions and 3 deletions

...	...	@@ -288,6 +288,21 @@
288	288	}
289	289
290	290	/**
	291	+ * 根据区县产妇统计不加医院条件限制
	292	+ *
	293	+ * @return
	294	+ */
	295	+ @RequestMapping(value = "/allPuerpera", method = RequestMethod.GET)
	296	+ @ResponseBody
	297	+ @TokenRequired
	298	+ public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
	299	+ patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
	300	+
	301	+ return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,0,"true",Boolean.FALSE);
	302	+ }
	303	+
	304	+
	305	+ /**
291	306	*区域全部孕妇管理
292	307	*
293	308	* @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象)

...	...	@@ -369,7 +369,7 @@
369	369	buildType.add(0);
370	370	buildType.add(2);
371	371	patientsQuery.setBuildTypeList(buildType);
372		- //居住地注意需要反起查询，不要搞错l
	372	+ //居住地注意需要反起查询，不要搞错l，原因：前端小弟把数据存反了
373	373	patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaId());
374	374	patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId());
375	375	patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId());
...	...	@@ -476,8 +476,9 @@
476	476	patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital());
477	477
478	478	String hospital = autoMatchFacade.getHospitalId(userId);
479		- patientsQuery.setHospitalId(hospital);
480		-
	479	+ if (null != hospital) {
	480	+ patientsQuery.setHospitalId(hospital);
	481	+ }
481	482	/* boolean result = autoMatchFacade.checkBStatus(userId);
482	483	if(!result){
483	484	patientsQuery.setEnable("0");