jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 17 additions and 12 deletions

...	...	@@ -306,8 +306,6 @@
306	306	Date startTime = null;
307	307	Date endTime = null;
308	308
309		- String currentHospitalId = autoMatchFacade.getHospitalId(userId);
310		-
311	309	Date checkStartTime = null;
312	310	Date checkEndTime = null;
313	311	if (StringUtils.isNotEmpty(time)) {
...	...	@@ -334,13 +332,6 @@
334	332	List<Integer> num40 = new ArrayList<>();
335	333
336	334
337		-
338		- //衡水区域并且不是衡水市第六人民医院
339		- if(!"2100002324".equals(currentHospitalId))
340		- {
341		- hospitalIds.remove("2100002324");//衡水市第六人民医院
342		- }
343		-
344	335	List<Map<String, Object>> checkPointtList = new ArrayList<>();
345	336	if (CollectionUtils.isNotEmpty(hospitalIds)) {
346	337	int batchSize = 2;
...	...	@@ -537,6 +528,14 @@
537	528	String areaId,
538	529	Integer userId, PatientsQuery patientsQuery) {
539	530	List<String> hospitalIds = new ArrayList<>();
	531	+
	532	+ List<Map<String, Object>> list = new ArrayList<>();
	533	+ //衡水区域并且不是衡水市第六人民医院
	534	+ if("2100002324".equals(hospitalId))
	535	+ {
	536	+ return list;
	537	+ }
	538	+
540	539	if (StringUtils.isNotEmpty(hospitalId)) {
541	540	hospitalIds.add(hospitalId);
542	541	} else {
...	...	@@ -564,7 +563,6 @@
564	563	patientsQuery.setBookbuildingDateEnd(endTime);
565	564
566	565
567		- List<Map<String, Object>> list = new ArrayList<>();
568	566	//建档人数
569	567	List<Patients> patientses = patientsService.queryPatient(patientsQuery);
570	568	if (CollectionUtils.isNotEmpty(patientses)) {

...	...	@@ -93,8 +93,15 @@
93	93	patientsQuery.setBookbuildingDateStart(startTime);
94	94	patientsQuery.setBookbuildingDateEnd(endTime);
95	95
96		- //建档人数
97		- int buildCount = patientsService.queryPatientCount(patientsQuery);
	96	+
	97	+
	98	+ int buildCount = 0;
	99	+ //衡水区域并且不是衡水市第六人民医院
	100	+ if(!"2100002324".equals(hId))
	101	+ {
	102	+ //建档人数
	103	+ buildCount = patientsService.queryPatientCount(patientsQuery);
	104	+ }
98	105
99	106	AntExChuQuery antExChuQuery1 = new AntExChuQuery();
100	107	antExChuQuery1.setHospitalId(hId);