jiangjiazhi / regional-platform

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 10 additions and 6 deletions

...	...	@@ -86,8 +86,8 @@
86	86	@RequestMapping(value = "/getDiagnosisList",method = RequestMethod.GET)
87	87	public DiagnosisManagerResult getDiagnosisList(DiagnosisAddRequest dataresult,HttpServletRequest request){
88	88	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
89		- dataresult.setHospitalId(loginState.getId().toString());
90		- return diagnosisFacaed.queryDiagnosisList(dataresult);
	89	+ //dataresult.setHospitalId("1000000185");
	90	+ return diagnosisFacaed.queryDiagnosisList(dataresult,loginState.getId());
91	91	}
92	92
93	93
...	...	@@ -102,8 +102,8 @@
102	102	@RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET)
103	103	public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){
104	104	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
105		- dataresult.setHospitalId(loginState.getId().toString());
106		- return diagnosisFacaed.queryDiagnosisLab(dataresult);
	105	+ //dataresult.setHospitalId(loginState.getId().toString());
	106	+ return diagnosisFacaed.queryDiagnosisLab(dataresult,loginState.getId());
107	107	}
108	108
109	109

...	...	@@ -255,8 +255,10 @@
255	255	* @param dataresult
256	256	* @return
257	257	*/
258		- public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){
	258	+ public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult,Integer userId){
259	259	DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
	260	+ String hospital = autoMatchFacade.getHospitalId(userId);
	261	+ dataresult.setHospitalId(hospital);
260	262	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
261	263	List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
262	264	if(null != dataresult.getDiaResult()){
263	265
...	...	@@ -437,9 +439,11 @@
437	439	* @param dataresult
438	440	* @return
439	441	*/
440		- public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){
	442	+ public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult,Integer userId){
441	443	List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
442	444	DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult();
	445	+ String hospital = autoMatchFacade.getHospitalId(userId);
	446	+ dataresult.setHospitalId(hospital);
443	447	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
444	448	if(StringUtils.isNotEmpty(dataresult.getApplyDate())){
445	449	String[] dates = dataresult.getApplyDate().split(" - ");