jiangjiazhi / regional-platform | GitLab

Commit 18f2478e6bff1ea5ecc121a68b3f4de327ec8208

Authored by gengxiaokai over 6 years ago

1 parent 5798d1e161

Exists in master and in 6 other branches

唐山复诊随访表打印接口修改

Showing 2 changed files with 8 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -135,6 +135,7 @@
135	135	* @return
136	136	*/
137	137	@RequestMapping(value = "/printExChuData", method = RequestMethod.GET)
	138	+ @ResponseBody
138	139	@TokenRequired
139	140	public BaseResponse printExChuData(@RequestParam("id") String id, HttpServletRequest request){
140	141	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
...	...	@@ -198,6 +199,7 @@
198	199	* @return
199	200	*/
200	201	@RequestMapping(value = "/printExFuData", method = RequestMethod.GET)
	202	+ @ResponseBody
201	203	@TokenRequired
202	204	public BaseResponse printExFuData(@RequestParam("id") String id, HttpServletRequest request){
203	205	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");

...	...	@@ -534,10 +534,12 @@
534	534	//复诊
535	535	List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate"));
536	536	if(list != null && list.size() > 0){
537		- exData[0] = list.get(0);
538		- exData[1] = list.get(1);
539		- exData[2] = list.get(2);
540		- exData[3] = list.get(3);
	537	+ for(int i =0;i<list.size();i++){
	538	+ if(i>=4){
	539	+ break;
	540	+ }
	541	+ exData[i] = list.get(i);
	542	+ }
541	543	}else{
542	544	return mList;
543	545	}