jiangjiazhi / regional-platform

Authored by dongqin over 6 years ago

1 parent 05bf2077ee

Exists in master and in 6 other branches

Showing 7 changed files with 45 additions and 16 deletions

...	...	@@ -40,5 +40,7 @@
40	40	* @return
41	41	*/
42	42	List<Map<String, Object>> findIdByTownOrgId(@Param("townOrgId") String townOrgId);
	43	+
	44	+ List<Organization> getOrganizationByHosps(@Param("hospPermissions") List<String> hospPermissions);
43	45	}

...	...	@@ -45,5 +45,7 @@
45	45	public String getOrganizationName(String id);
46	46
47	47	List<Map<String, Object>> findIdByTownOrgId(String townOrgId);
	48	+
	49	+ List<Organization> getOrganizationByHosps(List<String> hospPermissions);
48	50	}

...	...	@@ -308,5 +308,10 @@
308	308	return masterOrganizationMapper.findIdByTownOrgId(townOrgId);
309	309	}
310	310
	311	+ @Override
	312	+ public List<Organization> getOrganizationByHosps(List<String> hospPermissions) {
	313	+ return masterOrganizationMapper.getOrganizationByHosps(hospPermissions);
	314	+ }
	315	+
311	316	}

...	...	@@ -275,6 +275,21 @@
275	275	select o.id as "id" from organization o where o.townOrgId = #{townOrgId}
276	276	</select>
277	277
	278	+ <select id="getOrganizationByHosps" resultType="com.lyms.platform.permission.model.Organization">
	279	+ SELECT
	280	+ o2.id,
	281	+ o2.NAME as "name"
	282	+ FROM
	283	+ organization o
	284	+ LEFT JOIN organization o2 ON o2.city_id = o.city_id
	285	+ WHERE
	286	+ o.yn = 1 and o2.yn = 1 and
	287	+ o.id IN
	288	+ <foreach collection="hospPermissions" item="item" open="(" close=")" separator=",">
	289	+ #{item}
	290	+ </foreach>
	291	+ </select>
	292	+
278	293
279	294	</mapper>

...	...	@@ -65,10 +65,7 @@
65	65	import java.text.SimpleDateFormat;
66	66	import java.util.*;
67	67	import java.util.Date;
68		-import java.util.concurrent.ExecutorService;
69		-import java.util.concurrent.Executors;
70		-import java.util.concurrent.Future;
71		-import java.util.concurrent.TimeUnit;
	68	+import java.util.concurrent.*;
72	69	import java.util.concurrent.atomic.AtomicLong;
73	70	import java.util.regex.Pattern;
74	71
...	...	@@ -2448,8 +2445,8 @@
2448	2445	*/
2449	2446	public BaseResponse batchUpdateLymsPatient(HttpServletRequest request) {
2450	2447
2451		- List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("fmDate").exists(false).and("yn").is(1)), Patients.class);
2452		- ExecutorService service = Executors.newFixedThreadPool(5);
	2448	+ List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("townOrgId").exists(true).and("yn").is(1)), Patients.class);
	2449	+ ExecutorService service = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
2453	2450	for (Patients patient : patients) {
2454	2451	/* if ("18328353220".equals(patient.getCardNo())) {
2455	2452	System.out.println(patient);

...	...	@@ -1863,7 +1863,8 @@
1863	1863	// }
1864	1864	// }
1865	1865
1866		- matDeliverQuery.setFmHospitalList(hospitalList);
	1866	+ // 访视列表无需加上分娩医院，因此注释
	1867	+ //matDeliverQuery.setFmHospitalList(hospitalList);
1867	1868	matDeliverQuery.setFsHospital(hospitalId);
1868	1869	if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) {
1869	1870	matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());

...	...	@@ -79,6 +79,9 @@
79	79	@Autowired
80	80	private AssistBuildService assistBuildService;
81	81
	82	+ @Autowired
	83	+ private AreaCountFacade areaCountFacade;
	84	+
82	85	public BaseResponse babyServiceInit(Integer userId) {
83	86	Map map = new HashMap();
84	87	//服务类型
85	88
...	...	@@ -197,17 +200,21 @@
197	200	List<Map> towns = new ArrayList<>();
198	201
199	202	//所有数据由原来的baseConfing ==> Organization
200		- OrganizationQuery organizationQuery = new OrganizationQuery();
201		- List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
202		-
203		- if (CollectionUtils.isNotEmpty(organizations)) {
204		- for (Organization model : organizations) {
205		- Map data = new HashMap();
206		- data.put("id", model.getId());
207		- data.put("name", model.getName());
208		- towns.add(data);
	203	+ List<String> hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null);
	204	+ if (CollectionUtils.isNotEmpty(hospPermissions)) {
	205	+ List<Organization> organizations = organizationService.getOrganizationByHosps(hospPermissions);
	206	+ if (CollectionUtils.isNotEmpty(organizations)) {
	207	+ for (Organization model : organizations) {
	208	+ Map data = new HashMap();
	209	+ data.put("id", model.getId());
	210	+ data.put("name", model.getName());
	211	+ towns.add(data);
	212	+ }
209	213	}
210	214	}
	215	+
	216	+
	217	+
211	218
212	219	map.put("towns", towns);
213	220