jiangjiazhi / regional-platform

Commit 8d64a6372e2166cca175e8e1825586ba088d2cb3

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 499 additions and 18 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java

...	...	@@ -131,6 +131,14 @@
131	131	List<Map<String,String>> getMatdeliverHivktCheckzqCount(Map param);
132	132	List<Map<String,String>> getHasMatdeliverHivktCheckzqCount(Map param);
133	133
	134	+ List<Map<String,String>> getMatdeliverSyjgCheckCount(Map param);
	135	+ List<Map<String,String>> getMatdeliverSyjgCheckzqCount(Map param);
	136	+ List<Map<String,String>> getHasMatdeliverSyjgCheckzqCount(Map param);
	137	+
	138	+ List<Map<String,String>> getMatdeliverYgbmkyCheckCount(Map param);
	139	+ List<Map<String,String>> getMatdeliverYgbmkyCheckzqCount(Map param);
	140	+ List<Map<String,String>> getHasMatdeliverYgbmkyCheckzqCount(Map param);
	141	+
134	142	int getAllFmCount(Map param);
135	143	int getAllBuildCount(Map param);
136	144	int getNameFmCount(Map param);

...	...	@@ -135,6 +135,15 @@
135	135	List<Map<String,String>> getMatdeliverHivktCheckzqCount(Map param);
136	136	List<Map<String,String>> getHasMatdeliverHivktCheckzqCount(Map param);
137	137
	138	+
	139	+ List<Map<String,String>> getMatdeliverSyjgCheckCount(Map param);
	140	+ List<Map<String,String>> getMatdeliverSyjgCheckzqCount(Map param);
	141	+ List<Map<String,String>> getHasMatdeliverSyjgCheckzqCount(Map param);
	142	+
	143	+ List<Map<String,String>> getMatdeliverYgbmkyCheckCount(Map param);
	144	+ List<Map<String,String>> getMatdeliverYgbmkyCheckzqCount(Map param);
	145	+ List<Map<String,String>> getHasMatdeliverYgbmkyCheckzqCount(Map param);
	146	+
138	147	int getAllFmCount(Map param);
139	148	int getAllBuildCount(Map param);
140	149	int getNameFmCount(Map param);

...	...	@@ -378,6 +378,36 @@
378	378	return masterMysqlAntexcMapper.getHasMatdeliverHivktCheckzqCount(param);
379	379	}
380	380
	381	+
	382	+ @Override
	383	+ public List<Map<String,String>> getMatdeliverSyjgCheckCount(Map param)
	384	+ {
	385	+ return masterMysqlAntexcMapper.getMatdeliverSyjgCheckCount(param);
	386	+ }
	387	+ @Override
	388	+ public List<Map<String,String>> getMatdeliverSyjgCheckzqCount(Map param) {
	389	+ return masterMysqlAntexcMapper.getMatdeliverSyjgCheckzqCount(param);
	390	+ }
	391	+ @Override
	392	+ public List<Map<String,String>> getHasMatdeliverSyjgCheckzqCount(Map param)
	393	+ {
	394	+ return masterMysqlAntexcMapper.getHasMatdeliverSyjgCheckzqCount(param);
	395	+ }
	396	+ @Override
	397	+ public List<Map<String,String>> getMatdeliverYgbmkyCheckCount(Map param)
	398	+ {
	399	+ return masterMysqlAntexcMapper.getMatdeliverYgbmkyCheckCount(param);
	400	+ }
	401	+ @Override
	402	+ public List<Map<String,String>> getMatdeliverYgbmkyCheckzqCount(Map param) {
	403	+ return masterMysqlAntexcMapper.getMatdeliverYgbmkyCheckzqCount(param);
	404	+ }
	405	+ @Override
	406	+ public List<Map<String,String>> getHasMatdeliverYgbmkyCheckzqCount(Map param)
	407	+ {
	408	+ return masterMysqlAntexcMapper.getHasMatdeliverYgbmkyCheckzqCount(param);
	409	+ }
	410	+
381	411	@Override
382	412	public void addRisk(MysqlRisk model) {
383	413	masterMysqlAntexcMapper.addRisk(model);

...	...	@@ -2274,7 +2274,12 @@
2274	2274	<if test="endDate != null">
2275	2275	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2276	2276	</if>
2277		-
	2277	+ <if test="startDay != null">
	2278	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2279	+ </if>
	2280	+ <if test="endDay != null">
	2281	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2282	+ </if>
2278	2283	GROUP BY o.id
2279	2284
2280	2285	</select>
...	...	@@ -2304,7 +2309,12 @@
2304	2309	<if test="endDate != null">
2305	2310	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2306	2311	</if>
2307		-
	2312	+ <if test="startDay != null">
	2313	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2314	+ </if>
	2315	+ <if test="endDay != null">
	2316	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2317	+ </if>
2308	2318	GROUP BY o.id
2309	2319
2310	2320	</select>
...	...	@@ -2334,7 +2344,12 @@
2334	2344	<if test="endDate != null">
2335	2345	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2336	2346	</if>
2337		-
	2347	+ <if test="startDay != null">
	2348	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2349	+ </if>
	2350	+ <if test="endDay != null">
	2351	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2352	+ </if>
2338	2353	GROUP BY o.id
2339	2354
2340	2355	</select>
...	...	@@ -2365,7 +2380,12 @@
2365	2380	<if test="endDate != null">
2366	2381	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2367	2382	</if>
2368		-
	2383	+ <if test="startDay != null">
	2384	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2385	+ </if>
	2386	+ <if test="endDay != null">
	2387	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2388	+ </if>
2369	2389	GROUP BY o.id
2370	2390
2371	2391	</select>
...	...	@@ -2395,7 +2415,12 @@
2395	2415	<if test="endDate != null">
2396	2416	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2397	2417	</if>
2398		-
	2418	+ <if test="startDay != null">
	2419	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2420	+ </if>
	2421	+ <if test="endDay != null">
	2422	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2423	+ </if>
2399	2424	GROUP BY o.id
2400	2425
2401	2426	</select>
...	...	@@ -2426,7 +2451,12 @@
2426	2451	<if test="endDate != null">
2427	2452	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2428	2453	</if>
2429		-
	2454	+ <if test="startDay != null">
	2455	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2456	+ </if>
	2457	+ <if test="endDay != null">
	2458	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2459	+ </if>
2430	2460	GROUP BY o.id
2431	2461
2432	2462	</select>
...	...	@@ -2456,7 +2486,12 @@
2456	2486	<if test="endDate != null">
2457	2487	and c.checkTime <![CDATA[ <= ]]> #{endDate}
2458	2488	</if>
2459		-
	2489	+ <if test="startDay != null">
	2490	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2491	+ </if>
	2492	+ <if test="endDay != null">
	2493	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2494	+ </if>
2460	2495	GROUP BY o.id
2461	2496
2462	2497	</select>
...	...	@@ -2485,6 +2520,7 @@
2485	2520	<if test="endDate != null">
2486	2521	and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
2487	2522	</if>
	2523	+
2488	2524	group by o.id
2489	2525
2490	2526	</select>
...	...	@@ -2494,6 +2530,7 @@
2494	2530	<select id="getMatdeliverHivktCheckCount" resultType="java.util.Map" parameterType="java.util.Map">
2495	2531	SELECT count(f.id) as matdeliverHivktCheckCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
2496	2532	INNER JOIN report_antexchu c on c.sourceId= f.sourceId
	2533	+ INNER JOIN report_patients p on c.sourceId = p.patientId
2497	2534	where c.hivkt is not null and c.type =1
2498	2535	<if test="hospitalId != null and hospitalId != ''">
2499	2536	and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
...	...	@@ -2514,6 +2551,12 @@
2514	2551	<if test="endDate != null">
2515	2552	and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
2516	2553	</if>
	2554	+ <if test="startDay != null">
	2555	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2556	+ </if>
	2557	+ <if test="endDay != null">
	2558	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2559	+ </if>
2517	2560	group by o.id
2518	2561
2519	2562	</select>
2520	2563
...	...	@@ -2521,10 +2564,8 @@
2521	2564
2522	2565
2523	2566	<select id="getMatdeliverHivktCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map">
2524		-
2525	2567	SELECT count(f.id) as matdeliverHivktCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
2526	2568	INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.hivkt is not null
2527		-
2528	2569	) c on c.sourceId= f.sourceId
2529	2570	where DATEDIFF(c.checkTime,f.lastMenses) <![CDATA[ <= ]]> 83
2530	2571	<if test="hospitalId != null and hospitalId != ''">
...	...	@@ -2578,6 +2619,194 @@
2578	2619	</if>
2579	2620	GROUP BY o.id
2580	2621	</select>
	2622	+
	2623	+ <select id="getMatdeliverSyjgCheckCount" resultType="java.util.Map" parameterType="java.util.Map">
	2624	+ SELECT count(f.id) as matdeliverSyjgCheckCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2625	+ INNER JOIN report_antexchu c on c.sourceId= f.sourceId
	2626	+ INNER JOIN report_patients p on c.sourceId = p.patientId
	2627	+ where c.syjg is not null and c.type =1
	2628	+ <if test="hospitalId != null and hospitalId != ''">
	2629	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2630	+ </if>
	2631	+ <if test="provinceId != null and provinceId != ''">
	2632	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2633	+ </if>
	2634	+ <if test="cityId != null and cityId != ''">
	2635	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2636	+ </if>
	2637	+ <if test="areaId != null and areaId != ''">
	2638	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2639	+ </if>
	2640	+
	2641	+ <if test="startDate != null">
	2642	+ and f.dueDate1 >= #{startDate}
	2643	+ </if>
	2644	+ <if test="endDate != null">
	2645	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2646	+ </if>
	2647	+ <if test="startDay != null">
	2648	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2649	+ </if>
	2650	+ <if test="endDay != null">
	2651	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2652	+ </if>
	2653	+ group by o.id
	2654	+
	2655	+ </select>
	2656	+
	2657	+
	2658	+
	2659	+ <select id="getMatdeliverSyjgCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map">
	2660	+ SELECT count(f.id) as matdeliverSyjgCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2661	+ INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.syjg is not null
	2662	+ ) c on c.sourceId= f.sourceId
	2663	+ where DATEDIFF(c.checkTime,f.lastMenses) <![CDATA[ <= ]]> 83
	2664	+ <if test="hospitalId != null and hospitalId != ''">
	2665	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2666	+ </if>
	2667	+ <if test="provinceId != null and provinceId != ''">
	2668	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2669	+ </if>
	2670	+ <if test="cityId != null and cityId != ''">
	2671	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2672	+ </if>
	2673	+ <if test="areaId != null and areaId != ''">
	2674	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2675	+ </if>
	2676	+
	2677	+ <if test="startDate != null">
	2678	+ and f.dueDate1 >= #{startDate}
	2679	+ </if>
	2680	+ <if test="endDate != null">
	2681	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2682	+ </if>
	2683	+
	2684	+ GROUP BY o.id
	2685	+
	2686	+ </select>
	2687	+
	2688	+
	2689	+ <select id="getHasMatdeliverSyjgCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map">
	2690	+ SELECT count(f.id) as hasMatdeliverSyjgCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2691	+ INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.syjg='yang'
	2692	+
	2693	+ ) c on c.sourceId= f.sourceId
	2694	+ where DATEDIFF(c.checkTime,f.lastMenses) <![CDATA[ <= ]]> 83
	2695	+ <if test="hospitalId != null and hospitalId != ''">
	2696	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2697	+ </if>
	2698	+ <if test="provinceId != null and provinceId != ''">
	2699	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2700	+ </if>
	2701	+ <if test="cityId != null and cityId != ''">
	2702	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2703	+ </if>
	2704	+ <if test="areaId != null and areaId != ''">
	2705	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2706	+ </if>
	2707	+ <if test="startDate != null">
	2708	+ and f.dueDate1 >= #{startDate}
	2709	+ </if>
	2710	+ <if test="endDate != null">
	2711	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2712	+ </if>
	2713	+ GROUP BY o.id
	2714	+ </select>
	2715	+
	2716	+
	2717	+ <select id="getMatdeliverYgbmkyCheckCount" resultType="java.util.Map" parameterType="java.util.Map">
	2718	+ SELECT count(f.id) as matdeliverYgbmkyCheckCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2719	+ INNER JOIN report_antexchu c on c.sourceId= f.sourceId
	2720	+ INNER JOIN report_patients p on c.sourceId = p.patientId
	2721	+ where c.syjg is not null and c.type =1
	2722	+ <if test="hospitalId != null and hospitalId != ''">
	2723	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2724	+ </if>
	2725	+ <if test="provinceId != null and provinceId != ''">
	2726	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2727	+ </if>
	2728	+ <if test="cityId != null and cityId != ''">
	2729	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2730	+ </if>
	2731	+ <if test="areaId != null and areaId != ''">
	2732	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2733	+ </if>
	2734	+
	2735	+ <if test="startDate != null">
	2736	+ and f.dueDate1 >= #{startDate}
	2737	+ </if>
	2738	+ <if test="endDate != null">
	2739	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2740	+ </if>
	2741	+ <if test="startDay != null">
	2742	+ and DATEDIFF(c.checkTime,p.lastMenses) >= #{startDay}
	2743	+ </if>
	2744	+ <if test="endDay != null">
	2745	+ and DATEDIFF(c.checkTime,p.lastMenses) <![CDATA[ <= ]]> #{endDay}
	2746	+ </if>
	2747	+ group by o.id
	2748	+
	2749	+ </select>
	2750	+
	2751	+
	2752	+
	2753	+ <select id="getMatdeliverYgbmkyCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map">
	2754	+ SELECT count(f.id) as matdeliverYgbmkyCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2755	+ INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.syjg is not null
	2756	+ ) c on c.sourceId= f.sourceId
	2757	+ where DATEDIFF(c.checkTime,f.lastMenses) <![CDATA[ <= ]]> 83
	2758	+ <if test="hospitalId != null and hospitalId != ''">
	2759	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2760	+ </if>
	2761	+ <if test="provinceId != null and provinceId != ''">
	2762	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2763	+ </if>
	2764	+ <if test="cityId != null and cityId != ''">
	2765	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2766	+ </if>
	2767	+ <if test="areaId != null and areaId != ''">
	2768	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2769	+ </if>
	2770	+
	2771	+ <if test="startDate != null">
	2772	+ and f.dueDate1 >= #{startDate}
	2773	+ </if>
	2774	+ <if test="endDate != null">
	2775	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2776	+ </if>
	2777	+
	2778	+ GROUP BY o.id
	2779	+
	2780	+ </select>
	2781	+
	2782	+
	2783	+ <select id="getHasMatdeliverYgbmkyCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map">
	2784	+ SELECT count(f.id) as hasMatdeliverYgbmkyCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id
	2785	+ INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.syjg='yang'
	2786	+
	2787	+ ) c on c.sourceId= f.sourceId
	2788	+ where DATEDIFF(c.checkTime,f.lastMenses) <![CDATA[ <= ]]> 83
	2789	+ <if test="hospitalId != null and hospitalId != ''">
	2790	+ and f.fmHospital = #{hospitalId,jdbcType=VARCHAR}
	2791	+ </if>
	2792	+ <if test="provinceId != null and provinceId != ''">
	2793	+ and o.province_id = #{provinceId,jdbcType=VARCHAR}
	2794	+ </if>
	2795	+ <if test="cityId != null and cityId != ''">
	2796	+ and o.city_id = #{cityId,jdbcType=VARCHAR}
	2797	+ </if>
	2798	+ <if test="areaId != null and areaId != ''">
	2799	+ and o.area_id = #{areaId,jdbcType=VARCHAR}
	2800	+ </if>
	2801	+ <if test="startDate != null">
	2802	+ and f.dueDate1 >= #{startDate}
	2803	+ </if>
	2804	+ <if test="endDate != null">
	2805	+ and f.dueDate1 <![CDATA[ <= ]]> #{endDate}
	2806	+ </if>
	2807	+ GROUP BY o.id
	2808	+ </select>
	2809	+
2581	2810
2582	2811
2583	2812	<select id="getAllFmCount" resultType="java.lang.Integer" parameterType="java.util.Map">

...	...	@@ -468,9 +468,11 @@
468	468	@RequestParam(required = false) String hospitalId,
469	469	@RequestParam(required = false) String provinceId,
470	470	@RequestParam(required = false) String cityId,
471		- @RequestParam(required = false) String areaId) {
	471	+ @RequestParam(required = false) String areaId,
	472	+ @RequestParam(required = false) Integer startWeek,
	473	+ @RequestParam(required = false) Integer endWeek) {
472	474	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
473		- return patientSyncMysqlFacade.getLisCheckCount(time, hospitalId,provinceId,cityId,areaId, loginState.getId());
	475	+ return patientSyncMysqlFacade.getLisCheckCount(time, hospitalId,provinceId,cityId,areaId, loginState.getId(),startWeek,endWeek);
474	476	}
475	477
476	478	}

...	...	@@ -2386,7 +2386,7 @@
2386	2386	return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
2387	2387	}
2388	2388
2389		- public BaseResponse getLisCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer id) {
	2389	+ public BaseResponse getLisCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer id,Integer startWeek,Integer endWeek) {
2390	2390	Date startDate = null;
2391	2391	Date endDate = null;
2392	2392	if (StringUtils.isNotEmpty(time))
...	...	@@ -2403,6 +2403,8 @@
2403	2403	param.put("provinceId",provinceId);
2404	2404	param.put("cityId",cityId);
2405	2405	param.put("areaId", areaId);
	2406	+ param.put("startDay", startWeek == null ? null : startWeek*7);
	2407	+ param.put("endDay", endWeek == null ? null : endWeek*7);
2406	2408	List<Organization> organizations = mysqlAntexcService.getOrganizations(param);
2407	2409	List<Map<String,String>> firstCheckCounts = mysqlAntexcService.getFirstCheckCount(param);
2408	2410	List<Map<String,String>> isHivktCheckCounts = mysqlAntexcService.getIsHivktCheckCount(param);
...	...	@@ -2417,6 +2419,15 @@
2417	2419	List<Map<String,String>> matdeliverHivktCheckzqCounts = mysqlAntexcService.getMatdeliverHivktCheckzqCount(param);
2418	2420	List<Map<String,String>> hasMatdeliverHivktCheckzqCounts = mysqlAntexcService.getHasMatdeliverHivktCheckzqCount(param);
2419	2421
	2422	+ List<Map<String,String>> matdeliverSyjgCheckCounts = mysqlAntexcService.getMatdeliverSyjgCheckCount(param);
	2423	+ List<Map<String,String>> matdeliverSyjgCheckzqCounts = mysqlAntexcService.getMatdeliverSyjgCheckzqCount(param);
	2424	+ List<Map<String,String>> hasMatdeliverSyjgCheckzqCounts = mysqlAntexcService.getHasMatdeliverSyjgCheckzqCount(param);
	2425	+
	2426	+
	2427	+ List<Map<String,String>> matdeliverYgbmkyCheckCounts = mysqlAntexcService.getMatdeliverYgbmkyCheckCount(param);
	2428	+ List<Map<String,String>> matdeliverYgbmkyCheckzqCounts = mysqlAntexcService.getMatdeliverYgbmkyCheckzqCount(param);
	2429	+ List<Map<String,String>> hasMatdeliverYgbmkyCheckzqCounts = mysqlAntexcService.getHasMatdeliverYgbmkyCheckzqCount(param);
	2430	+
2420	2431	List<Map<String, Object>> datas = new ArrayList<>();
2421	2432	if (CollectionUtils.isNotEmpty(organizations)) {
2422	2433	for (Organization org : organizations)
...	...	@@ -2585,6 +2596,86 @@
2585	2596	}
2586	2597	data.put("hasMatdeliverHivktCheckzqCount",hasMatdeliverHivktCheckzqCount);
2587	2598
	2599	+
	2600	+ long matdeliverSyjgCheckCount = 0;
	2601	+ if (CollectionUtils.isNotEmpty(matdeliverSyjgCheckCounts)) {
	2602	+ for (Map<String, String> checkData : matdeliverSyjgCheckCounts) {
	2603	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2604	+ {
	2605	+ matdeliverSyjgCheckCount = Long.valueOf(String.valueOf(checkData.get("matdeliverSyjgCheckCount")));
	2606	+ break;
	2607	+ }
	2608	+ }
	2609	+ }
	2610	+ data.put("matdeliverSyjgCheckCount",matdeliverSyjgCheckCount);
	2611	+
	2612	+
	2613	+ long matdeliverSyjgCheckzqCount = 0;
	2614	+ if (CollectionUtils.isNotEmpty(matdeliverSyjgCheckzqCounts)) {
	2615	+ for (Map<String, String> checkData : matdeliverSyjgCheckzqCounts) {
	2616	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2617	+ {
	2618	+ matdeliverSyjgCheckzqCount = Long.valueOf(String.valueOf(checkData.get("matdeliverSyjgCheckzqCount")));
	2619	+ break;
	2620	+ }
	2621	+ }
	2622	+ }
	2623	+ data.put("matdeliverSyjgCheckzqCount",matdeliverSyjgCheckzqCount);
	2624	+
	2625	+
	2626	+
	2627	+ long hasMatdeliverSyjgCheckzqCount = 0;
	2628	+ if (CollectionUtils.isNotEmpty(hasMatdeliverSyjgCheckzqCounts)) {
	2629	+ for (Map<String, String> checkData : hasMatdeliverSyjgCheckzqCounts) {
	2630	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2631	+ {
	2632	+ hasMatdeliverSyjgCheckzqCount = Long.valueOf(String.valueOf(checkData.get("hasMatdeliverSyjgCheckzqCount")));
	2633	+ break;
	2634	+ }
	2635	+ }
	2636	+ }
	2637	+ data.put("hasMatdeliverSyjgCheckzqCount",hasMatdeliverSyjgCheckzqCount);
	2638	+
	2639	+
	2640	+
	2641	+ long matdeliverYgbmkyCheckCount = 0;
	2642	+ if (CollectionUtils.isNotEmpty(matdeliverYgbmkyCheckCounts)) {
	2643	+ for (Map<String, String> checkData : matdeliverYgbmkyCheckCounts) {
	2644	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2645	+ {
	2646	+ matdeliverYgbmkyCheckCount = Long.valueOf(String.valueOf(checkData.get("matdeliverYgbmkyCheckCount")));
	2647	+ break;
	2648	+ }
	2649	+ }
	2650	+ }
	2651	+ data.put("matdeliverYgbmkyCheckCount",matdeliverYgbmkyCheckCount);
	2652	+
	2653	+
	2654	+ long matdeliverYgbmkyCheckzqCount = 0;
	2655	+ if (CollectionUtils.isNotEmpty(matdeliverYgbmkyCheckzqCounts)) {
	2656	+ for (Map<String, String> checkData : matdeliverYgbmkyCheckzqCounts) {
	2657	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2658	+ {
	2659	+ matdeliverYgbmkyCheckzqCount = Long.valueOf(String.valueOf(checkData.get("matdeliverYgbmkyCheckzqCount")));
	2660	+ break;
	2661	+ }
	2662	+ }
	2663	+ }
	2664	+ data.put("matdeliverYgbmkyCheckzqCount",matdeliverYgbmkyCheckzqCount);
	2665	+
	2666	+
	2667	+ long hasMatdeliverYgbmkyCheckzqCount = 0;
	2668	+ if (CollectionUtils.isNotEmpty(hasMatdeliverYgbmkyCheckzqCounts)) {
	2669	+ for (Map<String, String> checkData : hasMatdeliverYgbmkyCheckzqCounts) {
	2670	+ if (hid.equals(String.valueOf(checkData.get("hospitalId"))))
	2671	+ {
	2672	+ hasMatdeliverYgbmkyCheckzqCount = Long.valueOf(String.valueOf(checkData.get("hasMatdeliverYgbmkyCheckzqCount")));
	2673	+ break;
	2674	+ }
	2675	+ }
	2676	+ }
	2677	+ data.put("hasMatdeliverYgbmkyCheckzqCount",hasMatdeliverYgbmkyCheckzqCount);
	2678	+
2588	2679	datas.add(data);
2589	2680	}
2590	2681	}
...	...	@@ -2602,6 +2693,16 @@
2602	2693	List<Integer> matdeliverHivktCheckzqCountNum = new ArrayList<>();
2603	2694	List<Integer> hasMatdeliverHivktCheckzqCountNum = new ArrayList<>();
2604	2695
	2696	+
	2697	+ List<Integer> matdeliverSyjgCheckCountNum = new ArrayList<>();
	2698	+ List<Integer> matdeliverSyjgCheckzqCountNum = new ArrayList<>();
	2699	+ List<Integer> hasMatdeliverSyjgCheckzqCountNum = new ArrayList<>();
	2700	+
	2701	+
	2702	+ List<Integer> matdeliverYgbmkyCheckCountNum = new ArrayList<>();
	2703	+ List<Integer> matdeliverYgbmkyCheckzqCountNum = new ArrayList<>();
	2704	+ List<Integer> hasMatdeliverYgbmkyCheckzqCountNum = new ArrayList<>();
	2705	+
2605	2706	if (StringUtils.isNotEmpty(hospitalId) \|\| StringUtils.isNotEmpty(areaId)) {
2606	2707	for (Map<String, Object> map : datas) {
2607	2708	chartData.add(map.get("hospitalName").toString());
2608	2709
2609	2710
2610	2711
...	...	@@ -2617,19 +2718,31 @@
2617	2718	matdeliverHivktCheckzqCountNum.add(getInteger(map.get("matdeliverHivktCheckzqCount")));
2618	2719	hasMatdeliverHivktCheckzqCountNum.add(getInteger(map.get("hasMatdeliverHivktCheckzqCount")));
2619	2720
	2721	+ matdeliverSyjgCheckCountNum.add(getInteger(map.get("matdeliverSyjgCheckCount")));
	2722	+ matdeliverSyjgCheckzqCountNum.add(getInteger(map.get("matdeliverSyjgCheckzqCount")));
	2723	+ hasMatdeliverSyjgCheckzqCountNum.add(getInteger(map.get("hasMatdeliverSyjgCheckzqCount")));
	2724	+
	2725	+
	2726	+ matdeliverYgbmkyCheckCountNum.add(getInteger(map.get("matdeliverYgbmkyCheckCount")));
	2727	+ matdeliverYgbmkyCheckzqCountNum.add(getInteger(map.get("matdeliverYgbmkyCheckzqCount")));
	2728	+ hasMatdeliverYgbmkyCheckzqCountNum.add(getInteger(map.get("hasMatdeliverYgbmkyCheckzqCount")));
	2729	+
2620	2730	}
2621	2731	} else if (StringUtils.isNotEmpty(cityId)) {
2622	2732	getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum,
2623	2733	isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum,
2624		- hasMatdeliverHivktCheckzqCountNum, chartData, "areaId", "areaName");
	2734	+ hasMatdeliverHivktCheckzqCountNum, matdeliverSyjgCheckCountNum,matdeliverSyjgCheckzqCountNum,hasMatdeliverSyjgCheckzqCountNum,matdeliverYgbmkyCheckCountNum
	2735	+ ,matdeliverYgbmkyCheckzqCountNum,hasMatdeliverYgbmkyCheckzqCountNum, chartData, "areaId", "areaName");
2625	2736	} else if (StringUtils.isNotEmpty(provinceId)) {
2626	2737	getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum,
2627	2738	isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum,
2628		- hasMatdeliverHivktCheckzqCountNum, chartData, "cityId", "cityName");
	2739	+ hasMatdeliverHivktCheckzqCountNum,matdeliverSyjgCheckCountNum,matdeliverSyjgCheckzqCountNum,hasMatdeliverSyjgCheckzqCountNum,matdeliverYgbmkyCheckCountNum
	2740	+ ,matdeliverYgbmkyCheckzqCountNum,hasMatdeliverYgbmkyCheckzqCountNum, chartData, "cityId", "cityName");
2629	2741	} else {
2630	2742	getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum,
2631	2743	isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum,
2632		- hasMatdeliverHivktCheckzqCountNum, chartData, "provinceId", "provinceName");
	2744	+ hasMatdeliverHivktCheckzqCountNum,matdeliverSyjgCheckCountNum,matdeliverSyjgCheckzqCountNum,hasMatdeliverSyjgCheckzqCountNum,matdeliverYgbmkyCheckCountNum
	2745	+ ,matdeliverYgbmkyCheckzqCountNum,hasMatdeliverYgbmkyCheckzqCountNum, chartData, "provinceId", "provinceName");
2633	2746	}
2634	2747
2635	2748	Map<String, Object> data = new HashMap<>();
2636	2749
...	...	@@ -2647,7 +2760,15 @@
2647	2760	data.put("matdeliverHivktCheckzqCount", matdeliverHivktCheckzqCountNum);
2648	2761	data.put("hasMatdeliverHivktCheckzqCount", hasMatdeliverHivktCheckzqCountNum);
2649	2762
	2763	+ data.put("matdeliverSyjgCheckCount",matdeliverSyjgCheckCountNum);
	2764	+ data.put("matdeliverSyjgCheckzqCount", matdeliverSyjgCheckzqCountNum);
	2765	+ data.put("hasMatdeliverSyjgCheckzqCount", hasMatdeliverSyjgCheckzqCountNum);
2650	2766
	2767	+ data.put("matdeliverYgbmkyCheckCount",matdeliverYgbmkyCheckCountNum);
	2768	+ data.put("matdeliverYgbmkyCheckzqCount", matdeliverYgbmkyCheckzqCountNum);
	2769	+ data.put("hasMatdeliverYgbmkyCheckzqCount", hasMatdeliverYgbmkyCheckzqCountNum);
	2770	+
	2771	+
2651	2772	return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
2652	2773	}
2653	2774	private void getData(List<Map<String, Object>> datas,
...	...	@@ -2662,6 +2783,15 @@
2662	2783	List<Integer> matdeliverHivktCheckCountNum,
2663	2784	List<Integer> matdeliverHivktCheckzqCountNum,
2664	2785	List<Integer> hasMatdeliverHivktCheckzqCountNum,
	2786	+
	2787	+ List<Integer> matdeliverSyjgCheckCountNum,
	2788	+ List<Integer> matdeliverSyjgCheckzqCountNum,
	2789	+ List<Integer> hasMatdeliverSyjgCheckzqCountNum,
	2790	+
	2791	+ List<Integer> matdeliverYgbmkyCheckCountNum,
	2792	+ List<Integer> matdeliverYgbmkyCheckzqCountNum,
	2793	+ List<Integer> hasMatdeliverYgbmkyCheckzqCountNum,
	2794	+
2665	2795	List<String> chartData,
2666	2796	String idKey, String nameKey
2667	2797	) {
...	...	@@ -2759,6 +2889,54 @@
2759	2889	result.put(key35, getInteger(map.get("hasMatdeliverHivktCheckzqCount")));
2760	2890	}
2761	2891
	2892	+ String key36 = "matdeliverSyjgCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2893	+ if (result.get(key36) != null) {
	2894	+ Integer value = result.get(key36);
	2895	+ result.put(key36, value + getInteger(map.get("matdeliverSyjgCheckCount")));
	2896	+ } else {
	2897	+ result.put(key36, getInteger(map.get("matdeliverSyjgCheckCount")));
	2898	+ }
	2899	+
	2900	+ String key37 = "matdeliverSyjgCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2901	+ if (result.get(key37) != null) {
	2902	+ Integer value = result.get(key37);
	2903	+ result.put(key37, value + getInteger(map.get("matdeliverSyjgCheckzqCount")));
	2904	+ } else {
	2905	+ result.put(key37, getInteger(map.get("matdeliverSyjgCheckzqCount")));
	2906	+ }
	2907	+
	2908	+
	2909	+ String key38 = "hasMatdeliverSyjgCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2910	+ if (result.get(key38) != null) {
	2911	+ Integer value = result.get(key38);
	2912	+ result.put(key38, value + getInteger(map.get("hasMatdeliverSyjgCheckzqCount")));
	2913	+ } else {
	2914	+ result.put(key38, getInteger(map.get("hasMatdeliverSyjgCheckzqCount")));
	2915	+ }
	2916	+
	2917	+ String key39 = "matdeliverYgbmkyCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2918	+ if (result.get(key39) != null) {
	2919	+ Integer value = result.get(key39);
	2920	+ result.put(key39, value + getInteger(map.get("matdeliverYgbmkyCheckCount")));
	2921	+ } else {
	2922	+ result.put(key39, getInteger(map.get("matdeliverYgbmkyCheckCount")));
	2923	+ }
	2924	+
	2925	+ String key40 = "matdeliverYgbmkyCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2926	+ if (result.get(key40) != null) {
	2927	+ Integer value = result.get(key40);
	2928	+ result.put(key40, value + getInteger(map.get("matdeliverYgbmkyCheckzqCount")));
	2929	+ } else {
	2930	+ result.put(key40, getInteger(map.get("matdeliverYgbmkyCheckzqCount")));
	2931	+ }
	2932	+
	2933	+ String key41 = "hasMatdeliverYgbmkyCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
	2934	+ if (result.get(key41) != null) {
	2935	+ Integer value = result.get(key41);
	2936	+ result.put(key41, value + getInteger(map.get("hasMatdeliverYgbmkyCheckzqCount")));
	2937	+ } else {
	2938	+ result.put(key41, getInteger(map.get("hasMatdeliverYgbmkyCheckzqCount")));
	2939	+ }
2762	2940	}
2763	2941
2764	2942	for (String key : result.keySet()) {
...	...	@@ -2797,6 +2975,24 @@
2797	2975	}
2798	2976	else if (key.contains("hasMatdeliverHivktCheckzqCount")) {
2799	2977	hasMatdeliverHivktCheckzqCountNum.add(result.get(key));
	2978	+ }
	2979	+ else if (key.contains("matdeliverSyjgCheckCount")) {
	2980	+ matdeliverSyjgCheckCountNum.add(result.get(key));
	2981	+ }
	2982	+ else if (key.contains("matdeliverSyjgCheckzqCount")) {
	2983	+ matdeliverSyjgCheckzqCountNum.add(result.get(key));
	2984	+ }
	2985	+ else if (key.contains("hasMatdeliverSyjgCheckzqCount")) {
	2986	+ hasMatdeliverSyjgCheckzqCountNum.add(result.get(key));
	2987	+ }
	2988	+ else if (key.contains("matdeliverYgbmkyCheckCount")) {
	2989	+ matdeliverYgbmkyCheckCountNum.add(result.get(key));
	2990	+ }
	2991	+ else if (key.contains("matdeliverYgbmkyCheckzqCount")) {
	2992	+ matdeliverYgbmkyCheckzqCountNum.add(result.get(key));
	2993	+ }
	2994	+ else if (key.contains("hasMatdeliverYgbmkyCheckzqCount")) {
	2995	+ hasMatdeliverYgbmkyCheckzqCountNum.add(result.get(key));
2800	2996	}
2801	2997	}
2802	2998	}

...	...	@@ -413,9 +413,16 @@
413	413	postReviewListResult.setLastBuildTime(DateUtil.getyyyy_MM_dd(postReviewModels.get(0).getCheckTime()));
414	414	}
415	415	if(StringUtils.isNotEmpty(patientsList.getGcdfDoctorId())){
416		- Users users = usersService.getUsers(Integer.parseInt(patientsList.getGcdfDoctorId()));
417		- if (users != null) {
418		- postReviewListResult.setGcdfDoctorName(users.getName());
	416	+ if (com.lyms.platform.common.utils.StringUtils.isNum(patientsList.getGcdfDoctorId()))
	417	+ {
	418	+ Users users = usersService.getUsers(Integer.parseInt(patientsList.getGcdfDoctorId()));
	419	+ if (users != null) {
	420	+ postReviewListResult.setGcdfDoctorName(users.getName());
	421	+ }
	422	+ }
	423	+ else
	424	+ {
	425	+ postReviewListResult.setGcdfDoctorName(patientsList.getGcdfDoctorId());
419	426	}
420	427	}
421	428	Collections.reverse(dataList);