Commit d2e80d623c2b917c916a0b81c0655532458385b6
1 parent
abc0446adc
Exists in
master
and in
6 other branches
update
Showing 7 changed files with 954 additions and 2 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/model/ReportAntexchu.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-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
View file @
d2e80d6
... | ... | @@ -115,5 +115,21 @@ |
115 | 115 | List<Map<String,String>> getMatDeliverTwoRiskCounts(Map param); |
116 | 116 | List<Map<String,String>> getMatDeliverThreeRiskCounts(Map param); |
117 | 117 | List<Map<String,String>> getMatDeliverFourRiskCounts(Map param); |
118 | + | |
119 | + List<Organization> getOrganizations(Map param); | |
120 | + | |
121 | + List<Map<String,String>> getFirstCheckCount(Map param); | |
122 | + List<Map<String,String>> getIsHivktCheckCount(Map param); | |
123 | + List<Map<String,String>> getHasHivktCheckCount(Map param); | |
124 | + List<Map<String,String>> getIsSyjgCheckCount(Map param); | |
125 | + List<Map<String,String>> getHasSyjgCheckCount(Map param); | |
126 | + List<Map<String,String>> getIsYgbmkyCheckCount(Map param); | |
127 | + List<Map<String,String>> getHasYgbmkyCheckCount(Map param); | |
128 | + | |
129 | + List<Map<String,String>> getMatdeliverCount(Map param); | |
130 | + List<Map<String,String>> getMatdeliverHivktCheckCount(Map param); | |
131 | + List<Map<String,String>> getMatdeliverHivktCheckzqCount(Map param); | |
132 | + List<Map<String,String>> getHasMatdeliverHivktCheckzqCount(Map param); | |
133 | + | |
118 | 134 | } |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java
View file @
d2e80d6
... | ... | @@ -16,6 +16,36 @@ |
16 | 16 | private String sourceId; |
17 | 17 | private Date created; |
18 | 18 | private Integer type; // 1初诊 2 复诊 |
19 | + // 乙肝表面抗原 | |
20 | + private String ygbmky; | |
21 | + // hit抗体检测 | |
22 | + private String hivkt; | |
23 | + //梅毒血清实验结果 | |
24 | + private String syjg; | |
25 | + | |
26 | + public String getYgbmky() { | |
27 | + return ygbmky; | |
28 | + } | |
29 | + | |
30 | + public void setYgbmky(String ygbmky) { | |
31 | + this.ygbmky = ygbmky; | |
32 | + } | |
33 | + | |
34 | + public String getSyjg() { | |
35 | + return syjg; | |
36 | + } | |
37 | + | |
38 | + public void setSyjg(String syjg) { | |
39 | + this.syjg = syjg; | |
40 | + } | |
41 | + | |
42 | + public String getHivkt() { | |
43 | + return hivkt; | |
44 | + } | |
45 | + | |
46 | + public void setHivkt(String hivkt) { | |
47 | + this.hivkt = hivkt; | |
48 | + } | |
19 | 49 | |
20 | 50 | public Integer getType() { |
21 | 51 | return type; |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java
View file @
d2e80d6
... | ... | @@ -119,5 +119,20 @@ |
119 | 119 | List<Map<String,String>> getMatDeliverTwoRiskCounts(Map param); |
120 | 120 | List<Map<String,String>> getMatDeliverThreeRiskCounts(Map param); |
121 | 121 | List<Map<String,String>> getMatDeliverFourRiskCounts(Map param); |
122 | + | |
123 | + List<Organization> getOrganizations(Map param); | |
124 | + | |
125 | + List<Map<String,String>> getFirstCheckCount(Map param); | |
126 | + List<Map<String,String>> getIsHivktCheckCount(Map param); | |
127 | + List<Map<String,String>> getHasHivktCheckCount(Map param); | |
128 | + List<Map<String,String>> getIsSyjgCheckCount(Map param); | |
129 | + List<Map<String,String>> getHasSyjgCheckCount(Map param); | |
130 | + List<Map<String,String>> getIsYgbmkyCheckCount(Map param); | |
131 | + List<Map<String,String>> getHasYgbmkyCheckCount(Map param); | |
132 | + | |
133 | + List<Map<String,String>> getMatdeliverCount(Map param); | |
134 | + List<Map<String,String>> getMatdeliverHivktCheckCount(Map param); | |
135 | + List<Map<String,String>> getMatdeliverHivktCheckzqCount(Map param); | |
136 | + List<Map<String,String>> getHasMatdeliverHivktCheckzqCount(Map param); | |
122 | 137 | } |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
View file @
d2e80d6
... | ... | @@ -326,6 +326,58 @@ |
326 | 326 | return masterMysqlAntexcMapper.getMatDeliverFourRiskCounts(param); |
327 | 327 | } |
328 | 328 | |
329 | + | |
330 | + @Override | |
331 | + public List<Organization> getOrganizations(Map param){ | |
332 | + return masterMysqlAntexcMapper.getOrganizations(param); | |
333 | + } | |
334 | + | |
335 | + @Override | |
336 | + public List<Map<String,String>> getFirstCheckCount(Map param){ | |
337 | + return masterMysqlAntexcMapper.getFirstCheckCount(param); | |
338 | + } | |
339 | + @Override | |
340 | + public List<Map<String,String>> getIsHivktCheckCount(Map param){ | |
341 | + return masterMysqlAntexcMapper.getIsHivktCheckCount(param); | |
342 | + } | |
343 | + @Override | |
344 | + public List<Map<String,String>> getHasHivktCheckCount(Map param){ | |
345 | + return masterMysqlAntexcMapper.getHasHivktCheckCount(param); | |
346 | + } | |
347 | + @Override | |
348 | + public List<Map<String,String>> getIsSyjgCheckCount(Map param){ | |
349 | + return masterMysqlAntexcMapper.getIsSyjgCheckCount(param); | |
350 | + } | |
351 | + @Override | |
352 | + public List<Map<String,String>> getHasSyjgCheckCount(Map param){ | |
353 | + return masterMysqlAntexcMapper.getHasSyjgCheckCount(param); | |
354 | + } | |
355 | + @Override | |
356 | + public List<Map<String,String>> getIsYgbmkyCheckCount(Map param){ | |
357 | + return masterMysqlAntexcMapper.getIsYgbmkyCheckCount(param); | |
358 | + } | |
359 | + @Override | |
360 | + public List<Map<String,String>> getHasYgbmkyCheckCount(Map param){ | |
361 | + return masterMysqlAntexcMapper.getHasYgbmkyCheckCount(param); | |
362 | + } | |
363 | + | |
364 | + @Override | |
365 | + public List<Map<String,String>> getMatdeliverCount(Map param){ | |
366 | + return masterMysqlAntexcMapper.getMatdeliverCount(param); | |
367 | + } | |
368 | + @Override | |
369 | + public List<Map<String,String>> getMatdeliverHivktCheckCount(Map param){ | |
370 | + return masterMysqlAntexcMapper.getMatdeliverHivktCheckCount(param); | |
371 | + } | |
372 | + @Override | |
373 | + public List<Map<String,String>> getMatdeliverHivktCheckzqCount(Map param){ | |
374 | + return masterMysqlAntexcMapper.getMatdeliverHivktCheckzqCount(param); | |
375 | + } | |
376 | + @Override | |
377 | + public List<Map<String,String>> getHasMatdeliverHivktCheckzqCount(Map param){ | |
378 | + return masterMysqlAntexcMapper.getHasMatdeliverHivktCheckzqCount(param); | |
379 | + } | |
380 | + | |
329 | 381 | @Override |
330 | 382 | public void addRisk(MysqlRisk model) { |
331 | 383 | masterMysqlAntexcMapper.addRisk(model); |
platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
View file @
d2e80d6
... | ... | @@ -1184,7 +1184,10 @@ |
1184 | 1184 | parentId, |
1185 | 1185 | created, |
1186 | 1186 | sourceId, |
1187 | - type | |
1187 | + type, | |
1188 | + ygbmky, | |
1189 | + hivkt, | |
1190 | + syjg | |
1188 | 1191 | ) VALUES ( |
1189 | 1192 | #{cid}, |
1190 | 1193 | #{checkTime}, |
... | ... | @@ -1194,7 +1197,10 @@ |
1194 | 1197 | #{parentId}, |
1195 | 1198 | #{created}, |
1196 | 1199 | #{sourceId}, |
1197 | - #{type} | |
1200 | + #{type}, | |
1201 | + #{ygbmky}, | |
1202 | + #{hivkt}, | |
1203 | + #{syjg} | |
1198 | 1204 | ) |
1199 | 1205 | |
1200 | 1206 | </insert> |
... | ... | @@ -2218,6 +2224,354 @@ |
2218 | 2224 | where r.type = 2 and r.riskLevel >1 group by r.foreignId having t=4 |
2219 | 2225 | ) l on l.foreignId = a.cid GROUP BY tp.name |
2220 | 2226 | </select> |
2227 | + | |
2228 | + <select id="getOrganizations" resultType="com.lyms.platform.permission.model.Organization" parameterType="java.util.Map"> | |
2229 | + select o.id,o.name,o.province_id as provinceId,o.city_id as cityId,o.area_id as areaId from organization o where | |
2230 | + o.yn=1 and locate('卫生服务站',o.name) = 0 and locate('卫生院',o.name) = 0 and locate('社区卫生服务中心',o.name) = 0 | |
2231 | + and locate('区卫生和计划生育局',o.name) = 0 and locate('计划生育服务中心',o.name) = 0 | |
2232 | + <if test="hospitalId != null and hospitalId != ''"> | |
2233 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2234 | + </if> | |
2235 | + <if test="provinceId != null and provinceId != ''"> | |
2236 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2237 | + </if> | |
2238 | + <if test="cityId != null and cityId != ''"> | |
2239 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2240 | + </if> | |
2241 | + <if test="areaId != null and areaId != ''"> | |
2242 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2243 | + </if> | |
2244 | + </select> | |
2245 | + | |
2246 | + | |
2247 | + <select id="getFirstCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2248 | + SELECT count(c.id) as firstCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2249 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2250 | + on o.id = c.hospitalId where p.type=1 and c.type=1 | |
2251 | + | |
2252 | + <if test="hospitalId != null and hospitalId != ''"> | |
2253 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2254 | + </if> | |
2255 | + <if test="provinceId != null and provinceId != ''"> | |
2256 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2257 | + </if> | |
2258 | + <if test="cityId != null and cityId != ''"> | |
2259 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2260 | + </if> | |
2261 | + <if test="areaId != null and areaId != ''"> | |
2262 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2263 | + </if> | |
2264 | + | |
2265 | + <if test="startDate != null"> | |
2266 | + and c.checkTime >= #{startDate} | |
2267 | + </if> | |
2268 | + <if test="endDate != null"> | |
2269 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2270 | + </if> | |
2271 | + | |
2272 | + GROUP BY o.id | |
2273 | + | |
2274 | + </select> | |
2275 | + | |
2276 | + | |
2277 | + <select id="getIsHivktCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2278 | + SELECT count(c.id) as isHivktCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2279 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2280 | + on o.id = c.hospitalId where c.hivkt is not null and p.type=1 and c.type=1 | |
2281 | + | |
2282 | + <if test="hospitalId != null and hospitalId != ''"> | |
2283 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2284 | + </if> | |
2285 | + <if test="provinceId != null and provinceId != ''"> | |
2286 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2287 | + </if> | |
2288 | + <if test="cityId != null and cityId != ''"> | |
2289 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2290 | + </if> | |
2291 | + <if test="areaId != null and areaId != ''"> | |
2292 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2293 | + </if> | |
2294 | + | |
2295 | + <if test="startDate != null"> | |
2296 | + and c.checkTime >= #{startDate} | |
2297 | + </if> | |
2298 | + <if test="endDate != null"> | |
2299 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2300 | + </if> | |
2301 | + | |
2302 | + GROUP BY o.id | |
2303 | + | |
2304 | + </select> | |
2305 | + | |
2306 | + | |
2307 | + <select id="getHasHivktCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2308 | + SELECT count(c.id) as hasHivktCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2309 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2310 | + on o.id = c.hospitalId where c.hivkt='yang' and p.type=1 and c.type=1 | |
2311 | + | |
2312 | + <if test="hospitalId != null and hospitalId != ''"> | |
2313 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2314 | + </if> | |
2315 | + <if test="provinceId != null and provinceId != ''"> | |
2316 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2317 | + </if> | |
2318 | + <if test="cityId != null and cityId != ''"> | |
2319 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2320 | + </if> | |
2321 | + <if test="areaId != null and areaId != ''"> | |
2322 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2323 | + </if> | |
2324 | + | |
2325 | + <if test="startDate != null"> | |
2326 | + and c.checkTime >= #{startDate} | |
2327 | + </if> | |
2328 | + <if test="endDate != null"> | |
2329 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2330 | + </if> | |
2331 | + | |
2332 | + GROUP BY o.id | |
2333 | + | |
2334 | + </select> | |
2335 | + | |
2336 | + | |
2337 | + | |
2338 | + <select id="getIsSyjgCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2339 | + SELECT count(c.id) as isSyjgCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2340 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2341 | + on o.id = c.hospitalId where c.syjg is not null and p.type=1 and c.type=1 | |
2342 | + | |
2343 | + <if test="hospitalId != null and hospitalId != ''"> | |
2344 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2345 | + </if> | |
2346 | + <if test="provinceId != null and provinceId != ''"> | |
2347 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2348 | + </if> | |
2349 | + <if test="cityId != null and cityId != ''"> | |
2350 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2351 | + </if> | |
2352 | + <if test="areaId != null and areaId != ''"> | |
2353 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2354 | + </if> | |
2355 | + | |
2356 | + <if test="startDate != null"> | |
2357 | + and c.checkTime >= #{startDate} | |
2358 | + </if> | |
2359 | + <if test="endDate != null"> | |
2360 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2361 | + </if> | |
2362 | + | |
2363 | + GROUP BY o.id | |
2364 | + | |
2365 | + </select> | |
2366 | + | |
2367 | + | |
2368 | + <select id="getHasSyjgCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2369 | + SELECT count(c.id) as hasSyjgCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2370 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2371 | + on o.id = c.hospitalId where c.syjg='yang' and p.type=1 and c.type=1 | |
2372 | + | |
2373 | + <if test="hospitalId != null and hospitalId != ''"> | |
2374 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2375 | + </if> | |
2376 | + <if test="provinceId != null and provinceId != ''"> | |
2377 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2378 | + </if> | |
2379 | + <if test="cityId != null and cityId != ''"> | |
2380 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2381 | + </if> | |
2382 | + <if test="areaId != null and areaId != ''"> | |
2383 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2384 | + </if> | |
2385 | + | |
2386 | + <if test="startDate != null"> | |
2387 | + and c.checkTime >= #{startDate} | |
2388 | + </if> | |
2389 | + <if test="endDate != null"> | |
2390 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2391 | + </if> | |
2392 | + | |
2393 | + GROUP BY o.id | |
2394 | + | |
2395 | + </select> | |
2396 | + | |
2397 | + | |
2398 | + | |
2399 | + <select id="getIsYgbmkyCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2400 | + SELECT count(c.id) as isYgbmkyCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2401 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2402 | + on o.id = c.hospitalId where c.ygbmky is not null and p.type=1 and c.type=1 | |
2403 | + | |
2404 | + <if test="hospitalId != null and hospitalId != ''"> | |
2405 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2406 | + </if> | |
2407 | + <if test="provinceId != null and provinceId != ''"> | |
2408 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2409 | + </if> | |
2410 | + <if test="cityId != null and cityId != ''"> | |
2411 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2412 | + </if> | |
2413 | + <if test="areaId != null and areaId != ''"> | |
2414 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2415 | + </if> | |
2416 | + | |
2417 | + <if test="startDate != null"> | |
2418 | + and c.checkTime >= #{startDate} | |
2419 | + </if> | |
2420 | + <if test="endDate != null"> | |
2421 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2422 | + </if> | |
2423 | + | |
2424 | + GROUP BY o.id | |
2425 | + | |
2426 | + </select> | |
2427 | + | |
2428 | + | |
2429 | + <select id="getHasYgbmkyCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2430 | + SELECT count(c.id) as hasYgbmkyCheckCount,c.hospitalId from report_antexchu c left JOIN report_patients p | |
2431 | + on c.sourceId = p.patientId INNER JOIN organization o | |
2432 | + on o.id = c.hospitalId where c.ygbmky='yang' and p.type=1 and c.type=1 | |
2433 | + | |
2434 | + <if test="hospitalId != null and hospitalId != ''"> | |
2435 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2436 | + </if> | |
2437 | + <if test="provinceId != null and provinceId != ''"> | |
2438 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2439 | + </if> | |
2440 | + <if test="cityId != null and cityId != ''"> | |
2441 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2442 | + </if> | |
2443 | + <if test="areaId != null and areaId != ''"> | |
2444 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2445 | + </if> | |
2446 | + | |
2447 | + <if test="startDate != null"> | |
2448 | + and c.checkTime >= #{startDate} | |
2449 | + </if> | |
2450 | + <if test="endDate != null"> | |
2451 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2452 | + </if> | |
2453 | + | |
2454 | + GROUP BY o.id | |
2455 | + | |
2456 | + </select> | |
2457 | + | |
2458 | + | |
2459 | + | |
2460 | + | |
2461 | + <select id="getMatdeliverCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2462 | + SELECT count(f.id) as matdeliverCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id | |
2463 | + <if test="hospitalId != null and hospitalId != ''"> | |
2464 | + and o.id = #{hospitalId,jdbcType=VARCHAR} | |
2465 | + </if> | |
2466 | + <if test="provinceId != null and provinceId != ''"> | |
2467 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2468 | + </if> | |
2469 | + <if test="cityId != null and cityId != ''"> | |
2470 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2471 | + </if> | |
2472 | + <if test="areaId != null and areaId != ''"> | |
2473 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2474 | + </if> | |
2475 | + | |
2476 | + <if test="startDate != null"> | |
2477 | + and f.dueDate1 >= #{startDate} | |
2478 | + </if> | |
2479 | + <if test="endDate != null"> | |
2480 | + and f.dueDate1 <![CDATA[ <= ]]> #{endDate} | |
2481 | + </if> | |
2482 | + group by o.id | |
2483 | + | |
2484 | + </select> | |
2485 | + | |
2486 | + | |
2487 | + | |
2488 | + <select id="getMatdeliverHivktCheckCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2489 | + SELECT count(f.id) as matdeliverHivktCheckCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id | |
2490 | + INNER JOIN report_antexchu c on c.sourceId= f.sourceId | |
2491 | + where c.hivkt is not null and c.type =1 | |
2492 | + <if test="hospitalId != null and hospitalId != ''"> | |
2493 | + and f.fmHospital = #{hospitalId,jdbcType=VARCHAR} | |
2494 | + </if> | |
2495 | + <if test="provinceId != null and provinceId != ''"> | |
2496 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2497 | + </if> | |
2498 | + <if test="cityId != null and cityId != ''"> | |
2499 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2500 | + </if> | |
2501 | + <if test="areaId != null and areaId != ''"> | |
2502 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2503 | + </if> | |
2504 | + | |
2505 | + <if test="startDate != null"> | |
2506 | + and f.dueDate1 >= #{startDate} | |
2507 | + </if> | |
2508 | + <if test="endDate != null"> | |
2509 | + and f.dueDate1 <![CDATA[ <= ]]> #{endDate} | |
2510 | + </if> | |
2511 | + group by o.id | |
2512 | + | |
2513 | + </select> | |
2514 | + | |
2515 | + | |
2516 | + | |
2517 | + <select id="getMatdeliverHivktCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2518 | + SELECT count(f.id) as matdeliverHivktCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id | |
2519 | + INNER JOIN report_antexchu c on c.sourceId= f.sourceId | |
2520 | + INNER JOIN report_patients p on p.patientId = c.sourceId | |
2521 | + where c.hivkt is not null and c.type =1 and DATEDIFF(p.lastMenses,c.checkTime) <![CDATA[ <= ]]> 83 | |
2522 | + <if test="hospitalId != null and hospitalId != ''"> | |
2523 | + and f.fmHospital = #{hospitalId,jdbcType=VARCHAR} | |
2524 | + </if> | |
2525 | + <if test="provinceId != null and provinceId != ''"> | |
2526 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2527 | + </if> | |
2528 | + <if test="cityId != null and cityId != ''"> | |
2529 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2530 | + </if> | |
2531 | + <if test="areaId != null and areaId != ''"> | |
2532 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2533 | + </if> | |
2534 | + | |
2535 | + <if test="startDate != null"> | |
2536 | + and c.checkTime >= #{startDate} | |
2537 | + </if> | |
2538 | + <if test="endDate != null"> | |
2539 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2540 | + </if> | |
2541 | + group by o.id | |
2542 | + | |
2543 | + </select> | |
2544 | + | |
2545 | + | |
2546 | + <select id="getHasMatdeliverHivktCheckzqCount" resultType="java.util.Map" parameterType="java.util.Map"> | |
2547 | + SELECT count(f.id) as hasMatdeliverHivktCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id | |
2548 | + INNER JOIN report_antexchu c on c.sourceId= f.sourceId | |
2549 | + INNER JOIN report_patients p on p.patientId = c.sourceId | |
2550 | + where c.hivkt='yang' and c.type =1 and DATEDIFF(p.lastMenses,c.checkTime) <![CDATA[ <= ]]> 83 | |
2551 | + <if test="hospitalId != null and hospitalId != ''"> | |
2552 | + and f.fmHospital = #{hospitalId,jdbcType=VARCHAR} | |
2553 | + </if> | |
2554 | + <if test="provinceId != null and provinceId != ''"> | |
2555 | + and o.province_id = #{provinceId,jdbcType=VARCHAR} | |
2556 | + </if> | |
2557 | + <if test="cityId != null and cityId != ''"> | |
2558 | + and o.city_id = #{cityId,jdbcType=VARCHAR} | |
2559 | + </if> | |
2560 | + <if test="areaId != null and areaId != ''"> | |
2561 | + and o.area_id = #{areaId,jdbcType=VARCHAR} | |
2562 | + </if> | |
2563 | + | |
2564 | + <if test="startDate != null"> | |
2565 | + and c.checkTime >= #{startDate} | |
2566 | + </if> | |
2567 | + <if test="endDate != null"> | |
2568 | + and c.checkTime <![CDATA[ <= ]]> #{endDate} | |
2569 | + </if> | |
2570 | + group by o.id | |
2571 | + | |
2572 | + </select> | |
2573 | + | |
2574 | + | |
2221 | 2575 | |
2222 | 2576 | </mapper> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
View file @
d2e80d6
... | ... | @@ -459,5 +459,19 @@ |
459 | 459 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
460 | 460 | return patientSyncMysqlFacade.geMatDeliverAreaCheckCount(time, hospitalId, loginState.getId()); |
461 | 461 | } |
462 | + | |
463 | + @RequestMapping(method = RequestMethod.GET, value = "/getLisCheckCount") | |
464 | + @ResponseBody | |
465 | + @TokenRequired | |
466 | + public BaseResponse getLisCheckCount(HttpServletRequest request, | |
467 | + @RequestParam(required = false) String time, | |
468 | + @RequestParam(required = false) String hospitalId, | |
469 | + @RequestParam(required = false) String provinceId, | |
470 | + @RequestParam(required = false) String cityId, | |
471 | + @RequestParam(required = false) String areaId) { | |
472 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
473 | + return patientSyncMysqlFacade.getLisCheckCount(time, hospitalId,provinceId,cityId,areaId, loginState.getId()); | |
474 | + } | |
475 | + | |
462 | 476 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
d2e80d6
... | ... | @@ -25,7 +25,9 @@ |
25 | 25 | import org.apache.commons.beanutils.locale.converters.DateLocaleConverter; |
26 | 26 | import org.apache.commons.collections.CollectionUtils; |
27 | 27 | import org.springframework.beans.factory.annotation.Autowired; |
28 | +import org.springframework.beans.factory.annotation.Qualifier; | |
28 | 29 | import org.springframework.data.domain.Sort; |
30 | +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | |
29 | 31 | import org.springframework.stereotype.Component; |
30 | 32 | import org.springframework.web.bind.annotation.RequestMapping; |
31 | 33 | import org.springframework.web.bind.annotation.RequestMethod; |
... | ... | @@ -34,6 +36,7 @@ |
34 | 36 | |
35 | 37 | import java.lang.reflect.InvocationTargetException; |
36 | 38 | import java.util.*; |
39 | +import java.util.concurrent.Future; | |
37 | 40 | |
38 | 41 | /** |
39 | 42 | * Created by Administrator on 2020-11-30. |
... | ... | @@ -1387,6 +1390,55 @@ |
1387 | 1390 | } |
1388 | 1391 | ConvertUtils.register(new DateLocaleConverter(), Date.class); |
1389 | 1392 | BeanUtils.copyProperties(reportAntexchu, antExChu); |
1393 | + if (StringUtils.isEmpty(antExChu.getYgbmky()) && StringUtils.isNotEmpty(antExChu.getYgbmkyValue())) | |
1394 | + { | |
1395 | + try { | |
1396 | + if (Double.parseDouble(antExChu.getYgbmkyValue()) > 1) | |
1397 | + { | |
1398 | + reportAntexchu.setYgbmky("yang"); | |
1399 | + } | |
1400 | + else | |
1401 | + { | |
1402 | + reportAntexchu.setYgbmky("yin"); | |
1403 | + } | |
1404 | + }catch (Exception e) | |
1405 | + { | |
1406 | + | |
1407 | + } | |
1408 | + } | |
1409 | + if (StringUtils.isEmpty(antExChu.getHivkt()) && StringUtils.isNotEmpty(antExChu.getHivktValue())) | |
1410 | + { | |
1411 | + try { | |
1412 | + if (Double.parseDouble(antExChu.getHivktValue()) > 1) | |
1413 | + { | |
1414 | + reportAntexchu.setHivkt("yang"); | |
1415 | + } | |
1416 | + else | |
1417 | + { | |
1418 | + reportAntexchu.setHivkt("yin"); | |
1419 | + } | |
1420 | + }catch (Exception e) | |
1421 | + { | |
1422 | + | |
1423 | + } | |
1424 | + } | |
1425 | + if (StringUtils.isNotEmpty(antExChu.getSyjg()) && StringUtils.isNotEmpty(antExChu.getSyjgValue())) | |
1426 | + { | |
1427 | + try { | |
1428 | + if (Double.parseDouble(antExChu.getSyjgValue()) > 1) | |
1429 | + { | |
1430 | + reportAntexchu.setSyjg("yang"); | |
1431 | + } | |
1432 | + else | |
1433 | + { | |
1434 | + reportAntexchu.setSyjg("yin"); | |
1435 | + } | |
1436 | + }catch (Exception e) | |
1437 | + { | |
1438 | + | |
1439 | + } | |
1440 | + } | |
1441 | + | |
1390 | 1442 | } catch (IllegalAccessException e) { |
1391 | 1443 | e.printStackTrace(); |
1392 | 1444 | } catch (InvocationTargetException e) { |
... | ... | @@ -2301,5 +2353,424 @@ |
2301 | 2353 | |
2302 | 2354 | return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); |
2303 | 2355 | } |
2356 | + | |
2357 | + public BaseResponse getLisCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer id) { | |
2358 | + Date startDate = null; | |
2359 | + Date endDate = null; | |
2360 | + if (StringUtils.isNotEmpty(time)) | |
2361 | + { | |
2362 | + String[] arrs = time.split(" - "); | |
2363 | + startDate = DateUtil.parseYMD(arrs[0]); | |
2364 | + endDate = DateUtil.parseYMD(arrs[1]); | |
2365 | + } | |
2366 | + | |
2367 | + Map param = new HashMap(); | |
2368 | + param.put("startDate",startDate); | |
2369 | + param.put("endDate",endDate); | |
2370 | + param.put("hospitalId",hospitalId); | |
2371 | + param.put("provinceId",provinceId); | |
2372 | + param.put("cityId",cityId); | |
2373 | + param.put("areaId", areaId); | |
2374 | + List<Organization> organizations = mysqlAntexcService.getOrganizations(param); | |
2375 | + List<Map<String,String>> firstCheckCounts = mysqlAntexcService.getFirstCheckCount(param); | |
2376 | + List<Map<String,String>> isHivktCheckCounts = mysqlAntexcService.getIsHivktCheckCount(param); | |
2377 | + List<Map<String,String>> hasHivktCheckCounts = mysqlAntexcService.getHasHivktCheckCount(param); | |
2378 | + List<Map<String,String>> isSyjgCheckCounts = mysqlAntexcService.getIsSyjgCheckCount(param); | |
2379 | + List<Map<String,String>> hasSyjgCheckCounts = mysqlAntexcService.getHasSyjgCheckCount(param); | |
2380 | + List<Map<String,String>> isYgbmkyCheckCounts = mysqlAntexcService.getIsYgbmkyCheckCount(param); | |
2381 | + List<Map<String,String>> hasYgbmkyCheckCounts = mysqlAntexcService.getHasYgbmkyCheckCount(param); | |
2382 | + | |
2383 | + List<Map<String,String>> matdeliverCounts = mysqlAntexcService.getMatdeliverCount(param); | |
2384 | + List<Map<String,String>> matdeliverHivktCheckCounts = mysqlAntexcService.getMatdeliverHivktCheckCount(param); | |
2385 | + List<Map<String,String>> matdeliverHivktCheckzqCounts = mysqlAntexcService.getMatdeliverHivktCheckzqCount(param); | |
2386 | + List<Map<String,String>> hasMatdeliverHivktCheckzqCounts = mysqlAntexcService.getHasMatdeliverHivktCheckzqCount(param); | |
2387 | + | |
2388 | + List<Map<String, Object>> datas = new ArrayList<>(); | |
2389 | + if (CollectionUtils.isNotEmpty(organizations)) { | |
2390 | + for (Organization org : organizations) | |
2391 | + { | |
2392 | + | |
2393 | + Map<String, Object> data = new HashMap<String, Object>(); | |
2394 | + | |
2395 | + String provId = String.valueOf(org.getProvinceId()); | |
2396 | + String cId = String.valueOf(org.getCityId()); | |
2397 | + String aId = String.valueOf(org.getAreaId()); | |
2398 | + String hospitalName = org.getName(); | |
2399 | + String hid = String.valueOf(org.getId()); | |
2400 | + String provinceName = getAddressName(provId); | |
2401 | + String cityName = getAddressName(cId); | |
2402 | + String areaName = getAddressName(aId); | |
2403 | + | |
2404 | + data.put("hospitalId",org.getId()); | |
2405 | + data.put("hospitalName",hospitalName); | |
2406 | + data.put("provinceName",provinceName); | |
2407 | + data.put("cityName",cityName); | |
2408 | + data.put("areaName",areaName); | |
2409 | + data.put("provinceId",provId); | |
2410 | + data.put("cityId",cId); | |
2411 | + data.put("areaId",aId); | |
2412 | + | |
2413 | + long firstCheckCount = 0; | |
2414 | + if (CollectionUtils.isNotEmpty(firstCheckCounts)) { | |
2415 | + for (Map<String, String> checkData : firstCheckCounts) { | |
2416 | + if (hid.equals(checkData.get("hospitalId"))) | |
2417 | + { | |
2418 | + firstCheckCount = Long.valueOf(String.valueOf(checkData.get("firstCheckCount"))); | |
2419 | + break; | |
2420 | + } | |
2421 | + } | |
2422 | + } | |
2423 | + data.put("firstCheckCount",firstCheckCount); | |
2424 | + | |
2425 | + | |
2426 | + long isHivktCheckCount = 0; | |
2427 | + if (CollectionUtils.isNotEmpty(isHivktCheckCounts)) { | |
2428 | + for (Map<String, String> checkData : isHivktCheckCounts) { | |
2429 | + if (hid.equals(checkData.get("hospitalId"))) | |
2430 | + { | |
2431 | + isHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("isHivktCheckCount"))); | |
2432 | + break; | |
2433 | + } | |
2434 | + } | |
2435 | + } | |
2436 | + data.put("isHivktCheckCount",isHivktCheckCount); | |
2437 | + | |
2438 | + | |
2439 | + long hasHivktCheckCount = 0; | |
2440 | + if (CollectionUtils.isNotEmpty(hasHivktCheckCounts)) { | |
2441 | + for (Map<String, String> checkData : hasHivktCheckCounts) { | |
2442 | + if (hid.equals(checkData.get("hospitalId"))) | |
2443 | + { | |
2444 | + hasHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("hasHivktCheckCount"))); | |
2445 | + break; | |
2446 | + } | |
2447 | + } | |
2448 | + } | |
2449 | + data.put("hasHivktCheckCount",hasHivktCheckCount); | |
2450 | + | |
2451 | + | |
2452 | + long isSyjgCheckCount = 0; | |
2453 | + if (CollectionUtils.isNotEmpty(isSyjgCheckCounts)) { | |
2454 | + for (Map<String, String> checkData : isSyjgCheckCounts) { | |
2455 | + if (hid.equals(checkData.get("hospitalId"))) | |
2456 | + { | |
2457 | + isSyjgCheckCount = Long.valueOf(String.valueOf(checkData.get("isSyjgCheckCount"))); | |
2458 | + break; | |
2459 | + } | |
2460 | + } | |
2461 | + } | |
2462 | + data.put("isSyjgCheckCount",isSyjgCheckCount); | |
2463 | + | |
2464 | + | |
2465 | + long hasSyjgCheckCount = 0; | |
2466 | + if (CollectionUtils.isNotEmpty(hasSyjgCheckCounts)) { | |
2467 | + for (Map<String, String> checkData : hasSyjgCheckCounts) { | |
2468 | + if (hid.equals(checkData.get("hospitalId"))) | |
2469 | + { | |
2470 | + hasSyjgCheckCount = Long.valueOf(String.valueOf(checkData.get("hasSyjgCheckCount"))); | |
2471 | + break; | |
2472 | + } | |
2473 | + } | |
2474 | + } | |
2475 | + data.put("hasSyjgCheckCount",hasSyjgCheckCount); | |
2476 | + | |
2477 | + | |
2478 | + long isYgbmkyCheckCount = 0; | |
2479 | + if (CollectionUtils.isNotEmpty(isYgbmkyCheckCounts)) { | |
2480 | + for (Map<String, String> checkData : isYgbmkyCheckCounts) { | |
2481 | + if (hid.equals(checkData.get("hospitalId"))) | |
2482 | + { | |
2483 | + isYgbmkyCheckCount = Long.valueOf(String.valueOf(checkData.get("isYgbmkyCheckCount"))); | |
2484 | + break; | |
2485 | + } | |
2486 | + } | |
2487 | + } | |
2488 | + data.put("isYgbmkyCheckCount",isYgbmkyCheckCount); | |
2489 | + | |
2490 | + | |
2491 | + | |
2492 | + long hasYgbmkyCheckCount = 0; | |
2493 | + if (CollectionUtils.isNotEmpty(hasYgbmkyCheckCounts)) { | |
2494 | + for (Map<String, String> checkData : hasYgbmkyCheckCounts) { | |
2495 | + if (hid.equals(checkData.get("hospitalId"))) | |
2496 | + { | |
2497 | + hasYgbmkyCheckCount = Long.valueOf(String.valueOf(checkData.get("hasYgbmkyCheckCount"))); | |
2498 | + break; | |
2499 | + } | |
2500 | + } | |
2501 | + } | |
2502 | + data.put("hasYgbmkyCheckCount",hasYgbmkyCheckCount); | |
2503 | + | |
2504 | + | |
2505 | + long matdeliverCount = 0; | |
2506 | + if (CollectionUtils.isNotEmpty(matdeliverCounts)) { | |
2507 | + for (Map<String, String> checkData : matdeliverCounts) { | |
2508 | + if (hid.equals(checkData.get("hospitalId"))) | |
2509 | + { | |
2510 | + matdeliverCount = Long.valueOf(String.valueOf(checkData.get("matdeliverCount"))); | |
2511 | + break; | |
2512 | + } | |
2513 | + } | |
2514 | + } | |
2515 | + data.put("matdeliverCount",matdeliverCount); | |
2516 | + | |
2517 | + | |
2518 | + long matdeliverHivktCheckCount = 0; | |
2519 | + if (CollectionUtils.isNotEmpty(matdeliverHivktCheckCounts)) { | |
2520 | + for (Map<String, String> checkData : matdeliverHivktCheckCounts) { | |
2521 | + if (hid.equals(checkData.get("hospitalId"))) | |
2522 | + { | |
2523 | + matdeliverHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("matdeliverHivktCheckCount"))); | |
2524 | + break; | |
2525 | + } | |
2526 | + } | |
2527 | + } | |
2528 | + data.put("matdeliverHivktCheckCount",matdeliverHivktCheckCount); | |
2529 | + | |
2530 | + | |
2531 | + long matdeliverHivktCheckzqCount = 0; | |
2532 | + if (CollectionUtils.isNotEmpty(matdeliverHivktCheckzqCounts)) { | |
2533 | + for (Map<String, String> checkData : matdeliverHivktCheckzqCounts) { | |
2534 | + if (hid.equals(checkData.get("hospitalId"))) | |
2535 | + { | |
2536 | + matdeliverHivktCheckzqCount = Long.valueOf(String.valueOf(checkData.get("matdeliverHivktCheckzqCount"))); | |
2537 | + break; | |
2538 | + } | |
2539 | + } | |
2540 | + } | |
2541 | + data.put("matdeliverHivktCheckzqCount",matdeliverHivktCheckzqCount); | |
2542 | + | |
2543 | + | |
2544 | + long hasMatdeliverHivktCheckzqCount = 0; | |
2545 | + if (CollectionUtils.isNotEmpty(hasMatdeliverHivktCheckzqCounts)) { | |
2546 | + for (Map<String, String> checkData : hasMatdeliverHivktCheckzqCounts) { | |
2547 | + if (hid.equals(checkData.get("hospitalId"))) | |
2548 | + { | |
2549 | + hasMatdeliverHivktCheckzqCount = Long.valueOf(String.valueOf(checkData.get("hasMatdeliverHivktCheckzqCount"))); | |
2550 | + break; | |
2551 | + } | |
2552 | + } | |
2553 | + } | |
2554 | + data.put("hasMatdeliverHivktCheckzqCount",hasMatdeliverHivktCheckzqCount); | |
2555 | + | |
2556 | + datas.add(data); | |
2557 | + } | |
2558 | + } | |
2559 | + | |
2560 | + List<String> chartData = new ArrayList<>(); | |
2561 | + List<Integer> firstCheckCountNum = new ArrayList<>(); | |
2562 | + List<Integer> isHivktCheckCountNum = new ArrayList<>(); | |
2563 | + List<Integer> hasHivktCheckCountNum = new ArrayList<>(); | |
2564 | + List<Integer> isSyjgCheckCountNum = new ArrayList<>(); | |
2565 | + List<Integer> hasSyjgCheckCountNum = new ArrayList<>(); | |
2566 | + List<Integer> isYgbmkyCheckCountNum = new ArrayList<>(); | |
2567 | + List<Integer> hasYgbmkyCheckCountNum = new ArrayList<>(); | |
2568 | + List<Integer> matdeliverCountNum = new ArrayList<>(); | |
2569 | + List<Integer> matdeliverHivktCheckCountNum = new ArrayList<>(); | |
2570 | + List<Integer> matdeliverHivktCheckzqCountNum = new ArrayList<>(); | |
2571 | + List<Integer> hasMatdeliverHivktCheckzqCountNum = new ArrayList<>(); | |
2572 | + | |
2573 | + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) { | |
2574 | + for (Map<String, Object> map : datas) { | |
2575 | + chartData.add(map.get("hospitalName").toString()); | |
2576 | + firstCheckCountNum.add(getInteger(map.get("firstCheckCount"))); | |
2577 | + isHivktCheckCountNum.add(getInteger(map.get("isHivktCheckCount"))); | |
2578 | + hasHivktCheckCountNum.add(getInteger(map.get("hasHivktCheckCount"))); | |
2579 | + isSyjgCheckCountNum.add(getInteger(map.get("isSyjgCheckCount"))); | |
2580 | + hasSyjgCheckCountNum.add(getInteger(map.get("hasSyjgCheckCount"))); | |
2581 | + isYgbmkyCheckCountNum.add(getInteger(map.get("isYgbmkyCheckCount"))); | |
2582 | + hasYgbmkyCheckCountNum.add(getInteger(map.get("hasYgbmkyCheckCount"))); | |
2583 | + matdeliverCountNum.add(getInteger(map.get("matdeliverCount"))); | |
2584 | + matdeliverHivktCheckCountNum.add(getInteger(map.get("matdeliverHivktCheckCount"))); | |
2585 | + matdeliverHivktCheckzqCountNum.add(getInteger(map.get("matdeliverHivktCheckzqCount"))); | |
2586 | + hasMatdeliverHivktCheckzqCountNum.add(getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); | |
2587 | + | |
2588 | + } | |
2589 | + } else if (StringUtils.isNotEmpty(cityId)) { | |
2590 | + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, | |
2591 | + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, | |
2592 | + hasMatdeliverHivktCheckzqCountNum, chartData, "areaId", "areaName"); | |
2593 | + } else if (StringUtils.isNotEmpty(provinceId)) { | |
2594 | + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, | |
2595 | + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, | |
2596 | + hasMatdeliverHivktCheckzqCountNum, chartData, "cityId", "cityName"); | |
2597 | + } else { | |
2598 | + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, | |
2599 | + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, | |
2600 | + hasMatdeliverHivktCheckzqCountNum, chartData, "provinceId", "provinceName"); | |
2601 | + } | |
2602 | + | |
2603 | + Map<String, Object> data = new HashMap<>(); | |
2604 | + data.put("list", datas); | |
2605 | + data.put("chartData", chartData); | |
2606 | + data.put("firstCheckCount", firstCheckCountNum); | |
2607 | + data.put("isHivktCheckCount", isHivktCheckCountNum); | |
2608 | + data.put("hasHivktCheckCount", hasHivktCheckCountNum); | |
2609 | + data.put("isSyjgCheckCount", isSyjgCheckCountNum); | |
2610 | + data.put("hasSyjgCheckCount", hasSyjgCheckCountNum); | |
2611 | + data.put("isYgbmkyCheckCount", isYgbmkyCheckCountNum); | |
2612 | + data.put("hasYgbmkyCheckCount", hasYgbmkyCheckCountNum); | |
2613 | + data.put("matdeliverCount", matdeliverCountNum); | |
2614 | + data.put("matdeliverHivktCheckCount",matdeliverHivktCheckCountNum); | |
2615 | + data.put("matdeliverHivktCheckzqCount", matdeliverHivktCheckzqCountNum); | |
2616 | + data.put("hasMatdeliverHivktCheckzqCount", hasMatdeliverHivktCheckzqCountNum); | |
2617 | + | |
2618 | + | |
2619 | + return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); | |
2620 | + } | |
2621 | + private void getData(List<Map<String, Object>> datas, | |
2622 | + List<Integer> firstCheckCountNum, | |
2623 | + List<Integer> isHivktCheckCountNum, | |
2624 | + List<Integer> hasHivktCheckCountNum, | |
2625 | + List<Integer> isSyjgCheckCountNum, | |
2626 | + List<Integer> hasSyjgCheckCountNum, | |
2627 | + List<Integer> isYgbmkyCheckCountNum, | |
2628 | + List<Integer> hasYgbmkyCheckCountNum, | |
2629 | + List<Integer> matdeliverCountNum, | |
2630 | + List<Integer> matdeliverHivktCheckCountNum, | |
2631 | + List<Integer> matdeliverHivktCheckzqCountNum, | |
2632 | + List<Integer> hasMatdeliverHivktCheckzqCountNum, | |
2633 | + List<String> chartData, | |
2634 | + String idKey, String nameKey | |
2635 | + ) { | |
2636 | + Map<String, Integer> result = new LinkedHashMap<>(); | |
2637 | + for (Map<String, Object> map : datas) { | |
2638 | + | |
2639 | + String key = "firstCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2640 | + if (result.get(key) != null) { | |
2641 | + Integer value = result.get(key); | |
2642 | + result.put(key, value + getInteger(map.get("firstCheckCount"))); | |
2643 | + } else { | |
2644 | + result.put(key, getInteger(map.get("firstCheckCount"))); | |
2645 | + } | |
2646 | + | |
2647 | + String key15 = "isHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2648 | + if (result.get(key15) != null) { | |
2649 | + Integer value = result.get(key15); | |
2650 | + result.put(key15, value + getInteger(map.get("isHivktCheckCount"))); | |
2651 | + } else { | |
2652 | + result.put(key15, getInteger(map.get("isHivktCheckCount"))); | |
2653 | + } | |
2654 | + | |
2655 | + String key1 = "hasHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2656 | + if (result.get(key1) != null) { | |
2657 | + Integer value = result.get(key1); | |
2658 | + result.put(key1, value + getInteger(map.get("hasHivktCheckCount"))); | |
2659 | + } else { | |
2660 | + result.put(key1, getInteger(map.get("hasHivktCheckCount"))); | |
2661 | + } | |
2662 | + | |
2663 | + String key2 = "isSyjgCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2664 | + if (result.get(key2) != null) { | |
2665 | + Integer value = result.get(key2); | |
2666 | + result.put(key2, value + getInteger(map.get("isSyjgCheckCount"))); | |
2667 | + } else { | |
2668 | + result.put(key2, getInteger(map.get("isSyjgCheckCount"))); | |
2669 | + } | |
2670 | + | |
2671 | + | |
2672 | + String key27 = "hasSyjgCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2673 | + if (result.get(key27) != null) { | |
2674 | + Integer value = result.get(key27); | |
2675 | + result.put(key27, value + getInteger(map.get("hasSyjgCheckCount"))); | |
2676 | + } else { | |
2677 | + result.put(key27, getInteger(map.get("hasSyjgCheckCount"))); | |
2678 | + } | |
2679 | + | |
2680 | + String key3 = "isYgbmkyCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2681 | + if (result.get(key3) != null) { | |
2682 | + Integer value = result.get(key3); | |
2683 | + result.put(key3, value + getInteger(map.get("isYgbmkyCheckCount"))); | |
2684 | + } else { | |
2685 | + result.put(key3, getInteger(map.get("isYgbmkyCheckCount"))); | |
2686 | + } | |
2687 | + | |
2688 | + String key31 = "hasYgbmkyCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2689 | + if (result.get(key31) != null) { | |
2690 | + Integer value = result.get(key31); | |
2691 | + result.put(key31, value + getInteger(map.get("hasYgbmkyCheckCount"))); | |
2692 | + } else { | |
2693 | + result.put(key31, getInteger(map.get("hasYgbmkyCheckCount"))); | |
2694 | + } | |
2695 | + | |
2696 | + String key32 = "matdeliverCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2697 | + if (result.get(key32) != null) { | |
2698 | + Integer value = result.get(key32); | |
2699 | + result.put(key32, value + getInteger(map.get("matdeliverCount"))); | |
2700 | + } else { | |
2701 | + result.put(key32, getInteger(map.get("matdeliverCount"))); | |
2702 | + } | |
2703 | + | |
2704 | + | |
2705 | + String key33 = "matdeliverHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2706 | + if (result.get(key33) != null) { | |
2707 | + Integer value = result.get(key33); | |
2708 | + result.put(key33, value + getInteger(map.get("matdeliverHivktCheckCount"))); | |
2709 | + } else { | |
2710 | + result.put(key33, getInteger(map.get("matdeliverHivktCheckCount"))); | |
2711 | + } | |
2712 | + | |
2713 | + | |
2714 | + String key34 = "matdeliverHivktCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2715 | + if (result.get(key34) != null) { | |
2716 | + Integer value = result.get(key34); | |
2717 | + result.put(key34, value + getInteger(map.get("matdeliverHivktCheckzqCount"))); | |
2718 | + } else { | |
2719 | + result.put(key34, getInteger(map.get("matdeliverHivktCheckzqCount"))); | |
2720 | + } | |
2721 | + | |
2722 | + String key35 = "hasMatdeliverHivktCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); | |
2723 | + if (result.get(key35) != null) { | |
2724 | + Integer value = result.get(key35); | |
2725 | + result.put(key35, value + getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); | |
2726 | + } else { | |
2727 | + result.put(key35, getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); | |
2728 | + } | |
2729 | + | |
2730 | + } | |
2731 | + | |
2732 | + for (String key : result.keySet()) { | |
2733 | + String name = key.split(":")[2]; | |
2734 | + if (!chartData.contains(name)) { | |
2735 | + chartData.add(name); | |
2736 | + } | |
2737 | + if (key.contains("firstCheckCount")) { | |
2738 | + firstCheckCountNum.add(result.get(key)); | |
2739 | + } else if (key.contains("isHivktCheckCount")) { | |
2740 | + isHivktCheckCountNum.add(result.get(key)); | |
2741 | + } | |
2742 | + else if (key.contains("hasHivktCheckCount")) { | |
2743 | + hasHivktCheckCountNum.add(result.get(key)); | |
2744 | + } | |
2745 | + else if (key.contains("isSyjgCheckCount")) { | |
2746 | + isSyjgCheckCountNum.add(result.get(key)); | |
2747 | + } | |
2748 | + else if (key.contains("hasSyjgCheckCount")) { | |
2749 | + hasSyjgCheckCountNum.add(result.get(key)); | |
2750 | + } | |
2751 | + else if (key.contains("isYgbmkyCheckCount")) { | |
2752 | + isYgbmkyCheckCountNum.add(result.get(key)); | |
2753 | + } | |
2754 | + else if (key.contains("hasYgbmkyCheckCount")) { | |
2755 | + hasYgbmkyCheckCountNum.add(result.get(key)); | |
2756 | + } | |
2757 | + else if (key.contains("matdeliverCount")) { | |
2758 | + matdeliverCountNum.add(result.get(key)); | |
2759 | + } | |
2760 | + else if (key.contains("matdeliverHivktCheckCount")) { | |
2761 | + matdeliverHivktCheckCountNum.add(result.get(key)); | |
2762 | + } | |
2763 | + else if (key.contains("matdeliverHivktCheckzqCount")) { | |
2764 | + matdeliverHivktCheckzqCountNum.add(result.get(key)); | |
2765 | + } | |
2766 | + else if (key.contains("hasMatdeliverHivktCheckzqCount")) { | |
2767 | + hasMatdeliverHivktCheckzqCountNum.add(result.get(key)); | |
2768 | + } | |
2769 | + } | |
2770 | + } | |
2771 | + | |
2772 | + @Autowired | |
2773 | + @Qualifier("commonThreadPool") | |
2774 | + private ThreadPoolTaskExecutor commonThreadPool; | |
2304 | 2775 | } |