jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 03fd15f9d1d3dac2ca5568e750fa464e10c705dc

Authored by gengxiaokai
1 parent 0cb689b537
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

婚检统计

Showing 1 changed file with 41 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 03fd15f
... ... @@ -2198,13 +2198,14 @@
2198 2198 //图标数据
2199 2199 List<Map<String, Object>> series = new LinkedList<>();
2200 2200 Map<String,Object> hjMap = new HashMap<String,Object>();
2201   - hjMap.put("name","婚前检查");
  2201 + hjMap.put("name","婚前医学检查人数");
2202 2202 hjMap.put("type","bar");
2203 2203 Map<String,Object> hqwsMap = new HashMap<String,Object>();
2204 2204 hqwsMap.put("name","婚前卫生咨询情况");
2205 2205 hqwsMap.put("type","bar");
2206 2206 List<String> hjList = new ArrayList<String>();
2207 2207 List<String> hqwsList = new ArrayList<String>();
  2208 + List<List<String>> result = new ArrayList<>();
2208 2209 //标题名称
2209 2210 List<String> titleItems = new LinkedList<>();
2210 2211 titleItems.add("男婚检人数");
2211 2212  
... ... @@ -2218,13 +2219,14 @@
2218 2219 if(StringUtils.isNotEmpty(areaId)){//按照医院统计
2219 2220  
2220 2221 for(String hospitalId : currentUserHospPermissions){
2221   - List<String> shu = new ArrayList<String>();
2222   - Map<String, Object> map = new HashMap<String, Object>();
  2222 + List<String> item = new ArrayList<String>();
2223 2223 //查询X轴标题数据
2224 2224 OrganizationQuery idQuery = new OrganizationQuery();
2225 2225 idQuery.setYn(YnEnums.YES.getId());
2226 2226 idQuery.setId(Integer.parseInt(hospitalId));
2227 2227 List<Organization> orgs = organizationService.queryOrganization(idQuery);
  2228 + //填报单位
  2229 + item.add(orgs.get(0).getName());
2228 2230  
2229 2231 PremaritalCheckupQuery query = new PremaritalCheckupQuery();
2230 2232 if (dates != null) {
2231 2233  
2232 2234  
2233 2235  
2234 2236  
2235 2237  
2236 2238  
2237 2239  
... ... @@ -2265,30 +2267,45 @@
2265 2267 xAxis.add(orgs.get(0).getName());
2266 2268 if(man == 1){
2267 2269 hjList.add("0");
  2270 + item.add("0");
2268 2271 if(woman == 1){
2269 2272 hjList.add("0");
2270 2273 hqwsList.add("0");
2271 2274 hqwsList.add("0");
  2275 + item.add("0");
  2276 + item.add("0");
  2277 + item.add("0");
2272 2278 }else{
2273 2279 hjList.add(String.valueOf(dataNv.size()));
2274 2280 hqwsList.add("0");
2275 2281 hqwsList.add(String.valueOf(hunqianHealthWoman));
  2282 + item.add(String.valueOf(dataNv.size()));
  2283 + item.add("0");
  2284 + item.add(String.valueOf(hunqianHealthWoman));
2276 2285 }
2277 2286 }else{
2278 2287 hjList.add(String.valueOf(dataNan.size()));
  2288 + item.add(String.valueOf(dataNan.size()));
2279 2289 if(woman == 1){
2280 2290 hjList.add("0");
2281 2291 hqwsList.add(String.valueOf(hunqianHealthMan));
2282 2292 hqwsList.add("0");
  2293 + item.add("0");
  2294 + item.add(String.valueOf(hunqianHealthMan));
  2295 + item.add("0");
2283 2296 }else{
2284 2297 hjList.add(String.valueOf(dataNv.size()));
2285 2298 hqwsList.add(String.valueOf(hunqianHealthMan));
2286 2299 hqwsList.add(String.valueOf(hunqianHealthWoman));
  2300 + item.add(String.valueOf(dataNv.size()));
  2301 + item.add(String.valueOf(hunqianHealthMan));
  2302 + item.add(String.valueOf(hunqianHealthWoman));
2287 2303 }
2288 2304 }
  2305 + result.add(item);
2289 2306 }
2290 2307 hjMap.put("data",hjList);
2291   - hqwsMap.put("data",hqwsList);
  2308 + hqwsMap.put("data", hqwsList);
2292 2309 series.add(hjMap);
2293 2310 series.add(hqwsMap);
2294 2311 }else{
2295 2312  
... ... @@ -2358,9 +2375,11 @@
2358 2375  
2359 2376  
2360 2377 for (BasicConfig c : configList) {
2361   - Map<String, Object> map = new HashMap<String, Object>();
  2378 + List<String> item = new ArrayList<String>();
2362 2379 OrganizationQuery idQuery = new OrganizationQuery();
2363 2380 idQuery.setYn(YnEnums.YES.getId());
  2381 + //填报单位
  2382 + item.add(c.getName());
2364 2383  
2365 2384 //查询机构数
2366 2385 if (addrType == 1) {
2367 2386  
2368 2387  
2369 2388  
2370 2389  
2371 2390  
2372 2391  
... ... @@ -2412,29 +2431,43 @@
2412 2431 xAxis.add(orgs.get(0).getName());
2413 2432 if(man == 1){
2414 2433 hjList.add("0");
  2434 + item.add("0");
2415 2435 if(woman == 1){
2416 2436 hjList.add("0");
2417 2437 hqwsList.add("0");
2418 2438 hqwsList.add("0");
  2439 + item.add("0");
  2440 + item.add("0");
  2441 + item.add("0");
2419 2442 }else{
2420 2443 hjList.add(String.valueOf(dataNv.size()));
2421 2444 hqwsList.add("0");
2422 2445 hqwsList.add(String.valueOf(hunqianHealthWoman));
  2446 + item.add(String.valueOf(dataNv.size()));
  2447 + item.add("0");
  2448 + item.add(String.valueOf(hunqianHealthWoman));
2423 2449 }
2424 2450 }else{
2425 2451 hjList.add(String.valueOf(dataNan.size()));
  2452 + item.add(String.valueOf(dataNan.size()));
2426 2453 if(woman == 1){
2427 2454 hjList.add("0");
2428 2455 hqwsList.add(String.valueOf(hunqianHealthMan));
2429 2456 hqwsList.add("0");
  2457 + item.add("0");
  2458 + item.add(String.valueOf(hunqianHealthMan));
  2459 + item.add("0");
2430 2460 }else{
2431 2461 hjList.add(String.valueOf(dataNv.size()));
2432 2462 hqwsList.add(String.valueOf(hunqianHealthMan));
2433 2463 hqwsList.add(String.valueOf(hunqianHealthWoman));
  2464 + item.add(String.valueOf(dataNv.size()));
  2465 + item.add(String.valueOf(hunqianHealthMan));
  2466 + item.add(String.valueOf(hunqianHealthWoman));
2434 2467 }
2435 2468 }
2436 2469 }
2437   -
  2470 + result.add(item);
2438 2471 }
2439 2472 hjMap.put("data",hjList);
2440 2473 hqwsMap.put("data",hqwsList);
2441 2474  
2442 2475  
... ... @@ -2444,9 +2477,10 @@
2444 2477 }
2445 2478  
2446 2479 Map<String, Object> datas = new HashMap<>();
  2480 + datas.put("legend",titleItems);
2447 2481 datas.put("series", series);
  2482 + datas.put("tableDatas",result);
2448 2483 datas.put("xAxis", xAxis);
2449   - datas.put("legend",titleItems);
2450 2484 return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas);
2451 2485  
2452 2486 }