jiangjiazhi / regional-platform

Commit 2c6d1ca70159739f9e0322c5b64242ec2cfd3338

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 2 changed files with 22 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java

...	...	@@ -31,17 +31,29 @@
31	31	private PatientMarkHospServiceFacade patientMarkHospFacade;
32	32
33	33	/**
	34	+ * 初始化接口
	35	+ *
	36	+ * @return
	37	+ */
	38	+ @ResponseBody
	39	+ @RequestMapping(value = "/init", method = RequestMethod.GET)
	40	+ public BaseResponse patientMarkServiceInit() {
	41	+ return patientMarkHospFacade.patientMarkHospitalInit();
	42	+ }
	43	+
	44	+
	45	+ /**
34	46	* 预约住院提醒列表
35	47	* @param request
36	48	* @return
37	49	*/
38	50	@RequestMapping(value = "/list", method = {RequestMethod.POST, RequestMethod.GET})
39	51	@ResponseBody
	52	+ @TokenRequired
40	53	public BaseResponse list(PatientMarkRequest patientMarkRequest
41	54	, HttpServletRequest request) {
42	55	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
43		- patientMarkHospFacade.getPatientMarkHospital(patientMarkRequest,loginState.getId());
44		- return null;
	56	+ return patientMarkHospFacade.getPatientMarkHospital(patientMarkRequest,loginState.getId());
45	57	}
46	58
47	59
...	...	@@ -54,6 +66,7 @@
54	66	*/
55	67	@RequestMapping(value = "/create", method = RequestMethod.POST)
56	68	@ResponseBody
	69	+ @TokenRequired
57	70	public BaseResponse create(PatientMarkHospital patientMarkHospital, HttpServletRequest request) {
58	71	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
59	72	return patientMarkHospFacade.addPatientMarkHospital(patientMarkHospital, loginState.getId());
...	...	@@ -69,6 +82,7 @@
69	82	*/
70	83	@RequestMapping(value = "/update", method = {RequestMethod.POST})
71	84	@ResponseBody
	85	+ @TokenRequired
72	86	public BaseResponse update(PatientMarkHospital patientMarkHospital, int type, HttpServletRequest request) {
73	87	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
74	88	return patientMarkHospFacade.updatePatientMarkHospital(patientMarkHospital, type, loginState.getId());

...	...	@@ -52,7 +52,7 @@
52	52	*
53	53	* @return
54	54	*/
55		- public BaseResponse PatientMarkHospitalInit() {
	55	+ public BaseResponse patientMarkHospitalInit() {
56	56	Map map = new HashMap();
57	57	map.put("makeType",MakeHospitalEnums.getMakeHospital());
58	58
...	...	@@ -197,7 +197,9 @@
197	197	result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate()));
198	198	result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate()));
199	199	result.setBackRemark(ps.getBackRemark());
200		- result.setBackFailure(MakeHospitalEnums.getTitle(ps.getBackFailure()));
	200	+ if(ps.getBackFailure()!=null){
	201	+ result.setBackFailure(MakeHospitalEnums.getTitle(ps.getBackFailure()));
	202	+ }
201	203	result.setInHospitStatus(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒");
202	204	result.setInHospitResult(ps.getInHospitResult() == 1 ? "成功" : "失败");
203	205	users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor()));
...	...	@@ -282,7 +284,7 @@
282	284	patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate());
283	285	}
284	286
285		- patientMarkHospQuery.setSort("create_date");
	287	+ patientMarkHospQuery.setSort("hospit_date");
286	288	patientMarkHospQuery.setNeed("y");
287	289	patientMarkHospQuery.setOffset((patientMarkRequest.getPage() - 1) * patientMarkRequest.getLimit());
288	290	patientMarkHospQuery.setLimit(patientMarkRequest.getLimit());
...	...	@@ -309,7 +311,7 @@
309	311	public void synLlHisData(int offset,int page){
310	312
311	313	PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
312		- patientMarkHospQuery.setSort("create_date");
	314	+ patientMarkHospQuery.setSort("hospit_date");
313	315	patientMarkHospQuery.setNeed("y");
314	316	patientMarkHospQuery.setOffset(offset);
315	317	patientMarkHospQuery.setLimit(100);