shiyang / regional-platform

Authored by jiangjiazhi over 9 years ago

Showing 6 changed files with 16 additions and 2 deletions

...	...	@@ -20,5 +20,6 @@
20	20
21	21	List<String> queryProvinceIdByOrgId(List<Integer> orgList);
22	22
	23	+ List<Organization> queryHospital();
23	24	}

...	...	@@ -19,6 +19,6 @@
19	19	public List<Organization> queryOrganization(OrganizationQuery query);
20	20
21	21	List<String> queryProvinceIdByOrgId(List<Integer> orgId);
22		-
	22	+ List<Organization> queryHospital();
23	23	}

...	...	@@ -87,5 +87,8 @@
87	87	public List<String> queryProvinceIdByOrgId(List<Integer> orgId) {
88	88	return organizationMapper.queryProvinceIdByOrgId(orgId);
89	89	}
	90	+ public List<Organization> queryHospital(){
	91	+ return organizationMapper.queryHospital();
	92	+ }
90	93	}

...	...	@@ -220,5 +220,8 @@
220	220	</foreach>
221	221	</if>
222	222	</select>
	223	+ <select id="queryHospital" resultMap="OrganizationResultMap">
	224	+ select * from organization where yn=1 and type in(2,3,4,5,6,7)
	225	+ </select>
223	226	</mapper>

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.base.BaseController;
3	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
4	5	import com.lyms.platform.common.result.BaseResponse;
5	6	import com.lyms.platform.operate.web.facade.MatDeliverFacade;
...	...	@@ -18,7 +19,7 @@
18	19	* Created by Administrator on 2016/6/17 0017.
19	20	*/
20	21	@Controller
21		-public class MatDeliverController {
	22	+public class MatDeliverController extends BaseController{
22	23
23	24	@Autowired
24	25	private MatDeliverFacade matDeliverFacade;

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
13	13	import com.lyms.platform.operate.web.result.MatDeliverListResult;
14	14	import com.lyms.platform.operate.web.result.MaternalDeliverResult;
	15	+import com.lyms.platform.permission.service.OrganizationService;
15	16	import com.lyms.platform.pojo.BabyModel;
16	17	import com.lyms.platform.pojo.MaternalDeliverModel;
17	18	import com.lyms.platform.pojo.Patients;
...	...	@@ -39,6 +40,8 @@
39	40	private BabyService babyService;
40	41	@Autowired
41	42	private PatientsService patientsService;
	43	+ @Autowired
	44	+ private OrganizationService organizationService;
42	45
43	46
44	47	/**
45	48
...	...	@@ -198,8 +201,11 @@
198	201	map.put("getTaiPan", getTaiPan());
199	202	map.put("getQidaiYc", getQidaiYc());
200	203	map.put("getRenShenJieJuEnums", getRenShenJieJuEnums());
	204	+ map.put("organizations", organizationService.queryHospital());
201	205	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
202	206	}
	207	+
	208	+
203	209
204	210	//胎方位
205	211	public List<Object> getFetPosition() {