jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 255f578c5ea26cbe62133c01f982da19b7758566

Authored by yangfei
2 parents 416356df02 dfa2533210
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java View file @ 255f578
... ... @@ -151,6 +151,8 @@
151 151 Map<String, Object> resultMap = new HashMap<>();
152 152 resultMap.put("errorcode", ErrorCodeConstants.SYSTEM_ERROR);
153 153 resultMap.put("errormsg", "服务器异常.");
  154 + resultMap.put("message", e.getMessage());
  155 + resultMap.put("exception", e.getClass());
154 156 if(!e.getClass().getSimpleName() .equals("ClientAbortException") ){
155 157 ExceptionUtils.catchException(e, "ExceptionHandlerController Exception. queryStr: " +httpServletRequest.getRequestURI() + "?"+httpServletRequest.getQueryString());
156 158 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java View file @ 255f578
... ... @@ -42,7 +42,7 @@
42 42 @ResponseBody
43 43 @TokenRequired
44 44 @RequestMapping(value = "/patients", method = RequestMethod.GET)
45   - public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer statistType, Integer statistVal,
  45 + public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer statistVal,
46 46 Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) {
47 47 return reportService.patients(provinceId, cityId, areaId, streetId, statistType, statistVal, ageType, patientType, startDate, endDate, getUserId(request));
48 48 }
... ... @@ -57,7 +57,7 @@
57 57 @ResponseBody
58 58 @TokenRequired
59 59 @RequestMapping(value = "/patients/export", method = RequestMethod.GET)
60   - public void patientsExport(String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer statistType,
  60 + public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType,
61 61 Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) {
62 62 reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response);
63 63 // reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 255f578
... ... @@ -304,182 +304,177 @@
304 304 int orgNumTotal = 0;
305 305  
306 306 //统计城市和区县表格数据
307   -// if (addrType < 3)
308   -// {
309   -// List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
310   -// OrganizationQuery query = new OrganizationQuery();
311   -// query.setYn(YnEnums.YES.getId());
312   -// if (CollectionUtils.isNotEmpty(configList))
313   -// {
314   -// for(BasicConfig c : configList)
315   -// {
316   -// if (addrType == 1)
317   -// {
318   -// query.setCityId(c.getId());
319   -// }
320   -// else if(addrType == 2)
321   -// {
322   -// query.setAreaId(c.getId());
323   -// }
324   -// //查询机构数
325   -// List<Organization> orgs = organizationService.queryOrganization(query);
  307 + if (addrType < 3)
  308 + {
  309 + List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
  310 + OrganizationQuery query = new OrganizationQuery();
  311 + query.setYn(YnEnums.YES.getId());
  312 + if (CollectionUtils.isNotEmpty(configList))
  313 + {
  314 + for(BasicConfig c : configList)
  315 + {
  316 + if (addrType == 1)
  317 + {
  318 + query.setCityId(c.getId());
  319 + }
  320 + else if(addrType == 2)
  321 + {
  322 + query.setAreaId(c.getId());
  323 + }
  324 + //查询机构数
  325 + List<Organization> orgs = organizationService.queryOrganization(query);
  326 +
  327 + orgNumTotal += CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0 ;
  328 +
  329 + List<String> hids = getConditionHospitalIds(currentUserHospPermissions,orgs);
  330 +
  331 + for (BasicConfig level : riskLevelConfig)
  332 + {
  333 + List<String> topList = new ArrayList<>();
  334 + topList.add(String.valueOf(++seq));
  335 + topList.add(c.getName());
  336 + topList.add(orgs == null ? "0" : String.valueOf(orgs.size()));
  337 + topList.add(level.getName());
  338 + int riskPatientCount = 0;
  339 +
  340 + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) )
  341 + {
  342 + if (CollectionUtils.isNotEmpty(times))
  343 + {
  344 + for (Map<String, Date> time : times)
  345 + {
  346 + if (CollectionUtils.isNotEmpty(hids))
  347 + {
  348 + patientsQuery.setBookbuildingDateStart(time.get("start"));
  349 + patientsQuery.setBookbuildingDateEnd(time.get("end"));
  350 +
  351 + //权限
  352 + patientsQuery.setHospitalList(hids);
  353 +
  354 + //高危等级
  355 + patientsQuery.setrLevel(level.getId());
  356 +
  357 + riskPatientCount = patientsService.queryPatientCount(patientsQuery);
  358 + }
  359 + topList.add(String.valueOf(riskPatientCount));
  360 + }
  361 + }
  362 + }
  363 +
  364 + //权限和筛选条件不未空的时候就查询孕妇高危数量
  365 + if (CollectionUtils.isNotEmpty(hids))
  366 + {
  367 + //权限
  368 + patientsQuery.setHospitalList(hids);
  369 +
  370 + //高危等级
  371 + patientsQuery.setrLevel(level.getId());
  372 +
  373 + //单个高危因素孕产妇条数
  374 + riskPatientCount = patientsService.queryPatientCount(patientsQuery);
  375 + }
  376 +
  377 + topList.add(String.valueOf(riskPatientCount));
  378 + result.add(topList);
  379 + }
  380 + }
  381 + }
  382 + }
  383 + //统计医院的表格数据
  384 + else
  385 + {
  386 + OrganizationQuery query = new OrganizationQuery();
  387 + query.setYn(YnEnums.YES.getId());
  388 + query.setAreaId(countRequest.getAreaId());
  389 + List<Organization> orgs = organizationService.queryOrganization(query);
  390 + if (CollectionUtils.isNotEmpty(orgs)) {
  391 + for (Organization org : orgs) {
  392 + for (BasicConfig level : riskLevelConfig) {
  393 + List<String> topList = new ArrayList<>();
  394 + topList.add(String.valueOf(++seq));
  395 + topList.add(org.getName());
  396 + topList.add(level.getName());
  397 +
  398 + int riskPatientCount = 0;
  399 +
  400 + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) )
  401 + {
  402 + if (CollectionUtils.isNotEmpty(times))
  403 + {
  404 + for (Map<String, Date> time : times)
  405 + {
  406 + if (currentUserHospPermissions.contains(String.valueOf(org.getId())))
  407 + {
  408 + patientsQuery.setBookbuildingDateStart(time.get("start"));
  409 + patientsQuery.setBookbuildingDateEnd(time.get("end"));
  410 +
  411 + List<String> hids = new ArrayList<>();
  412 + hids.add(String.valueOf(org.getId()));
  413 + //权限
  414 + patientsQuery.setHospitalList(hids);
  415 +
  416 + //高危等级
  417 + patientsQuery.setrLevel(level.getId());
  418 +
  419 + riskPatientCount = patientsService.queryPatientCount(patientsQuery);
  420 + }
  421 + topList.add(String.valueOf(riskPatientCount));
  422 + }
  423 + }
  424 + }
  425 +
  426 + if (currentUserHospPermissions.contains(String.valueOf(org.getId())))
  427 + {
  428 + List<String> hids = new ArrayList<>();
  429 + hids.add(String.valueOf(org.getId()));
  430 + //权限
  431 + patientsQuery.setHospitalList(hids);
  432 + //高危等级
  433 + patientsQuery.setrLevel(level.getId());
  434 + //单个高危因素孕产妇条数
  435 + riskPatientCount = patientsService.queryPatientCount(patientsQuery);
  436 + }
  437 +
  438 + topList.add(String.valueOf(riskPatientCount));
  439 + result.add(topList);
  440 + }
  441 + }
  442 + }
  443 + }
  444 +
  445 + //表格合计计算
  446 + if(CollectionUtils.isNotEmpty(result))
  447 + {
  448 + List<List<String>> totalAllList = new ArrayList<>();
  449 + for (BasicConfig level : riskLevelConfig) {
  450 + List<String> totalList = new ArrayList<>();
  451 + totalList.add(String.valueOf(++seq));
  452 + totalList.add("合计");
  453 +
  454 + if (addrType < 3) {
  455 + totalList.add(String.valueOf(orgNumTotal));
  456 + }
  457 + totalList.add(level.getName());
  458 +
  459 + int index = addrType < 3 ? 4 : 3;
  460 +
  461 + for (int i = index ; i <= (times == null ? 0+index : times.size()+index) ; i++)
  462 + {
  463 + int total = 0;
  464 + for (List<String> items : result)
  465 + {
  466 + if (items.contains(level.getName()))
  467 + {
  468 + total+=Integer.valueOf(items.get(i));
  469 + }
  470 + }
  471 + totalList.add(String.valueOf(total));
  472 + }
  473 + totalAllList.add(totalList);
  474 + }
  475 + result.addAll(totalAllList);
  476 + }
326 477 //
327   -// orgNumTotal += CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0 ;
328   -//
329   -// List<String> hids = getConditionHospitalIds(currentUserHospPermissions,orgs);
330   -//
331   -// for (BasicConfig level : riskLevelConfig)
332   -// {
333   -//
334   -// List<String> topList = new ArrayList<>();
335   -// topList.add(String.valueOf(++seq));
336   -// topList.add(c.getName());
337   -// topList.add(orgs == null ? "0" : String.valueOf(orgs.size()));
338   -// topList.add(level.getName());
339   -// int riskPatientCount = 0;
340   -//
341   -// if (StringUtils.isNotEmpty(countRequest.getTimeStart()) )
342   -// {
343   -// if (CollectionUtils.isNotEmpty(times))
344   -// {
345   -// for (Map<String, Date> time : times)
346   -// {
347   -// if (CollectionUtils.isNotEmpty(hids))
348   -// {
349   -// patientsQuery.setBookbuildingDateStart(time.get("start"));
350   -// patientsQuery.setBookbuildingDateEnd(time.get("end"));
351   -//
352   -// //权限
353   -// patientsQuery.setHospitalList(hids);
354   -//
355   -// //高危等级
356   -// patientsQuery.setrLevel(level.getId());
357   -//
358   -// riskPatientCount = patientsService.queryPatientCount(patientsQuery);
359   -// }
360   -// topList.add(String.valueOf(riskPatientCount));
361   -// }
362   -// }
363   -// }
364   -//
365   -//
366   -// //权限和筛选条件不未空的时候就查询孕妇高危数量
367   -// if (CollectionUtils.isNotEmpty(hids))
368   -// {
369   -//
370   -// //权限
371   -// patientsQuery.setHospitalList(hids);
372   -//
373   -// //高危等级
374   -// patientsQuery.setrLevel(level.getId());
375   -//
376   -//
377   -// //单个高危因素孕产妇条数
378   -// riskPatientCount = patientsService.queryPatientCount(patientsQuery);
379   -// }
380   -//
381   -// topList.add(String.valueOf(riskPatientCount));
382   -// result.add(topList);
383   -// }
384   -// }
385   -// }
386   -// }
387   -// //统计医院的表格数据
388   -// else
389   -// {
390   -// OrganizationQuery query = new OrganizationQuery();
391   -// query.setYn(YnEnums.YES.getId());
392   -// query.setAreaId(countRequest.getAreaId());
393   -// List<Organization> orgs = organizationService.queryOrganization(query);
394   -// if (CollectionUtils.isNotEmpty(orgs)) {
395   -// for (Organization org : orgs) {
396   -// for (BasicConfig level : riskLevelConfig) {
397   -// List<String> topList = new ArrayList<>();
398   -// topList.add(String.valueOf(++seq));
399   -// topList.add(org.getName());
400   -// topList.add(level.getName());
401   -//
402   -// int riskPatientCount = 0;
403   -//
404   -// if (StringUtils.isNotEmpty(countRequest.getTimeStart()) )
405   -// {
406   -// if (CollectionUtils.isNotEmpty(times))
407   -// {
408   -// for (Map<String, Date> time : times)
409   -// {
410   -// if (currentUserHospPermissions.contains(String.valueOf(org.getId())))
411   -// {
412   -// patientsQuery.setBookbuildingDateStart(time.get("start"));
413   -// patientsQuery.setBookbuildingDateEnd(time.get("end"));
414   -//
415   -// List<String> hids = new ArrayList<>();
416   -// hids.add(String.valueOf(org.getId()));
417   -// //权限
418   -// patientsQuery.setHospitalList(hids);
419   -//
420   -// //高危等级
421   -// patientsQuery.setrLevel(level.getId());
422   -//
423   -// riskPatientCount = patientsService.queryPatientCount(patientsQuery);
424   -// }
425   -// topList.add(String.valueOf(riskPatientCount));
426   -// }
427   -// }
428   -// }
429   -//
430   -// if (currentUserHospPermissions.contains(String.valueOf(org.getId())))
431   -// {
432   -// List<String> hids = new ArrayList<>();
433   -// hids.add(String.valueOf(org.getId()));
434   -// //权限
435   -// patientsQuery.setHospitalList(hids);
436   -// //高危等级
437   -// patientsQuery.setrLevel(level.getId());
438   -// //单个高危因素孕产妇条数
439   -// riskPatientCount = patientsService.queryPatientCount(patientsQuery);
440   -// }
441   -//
442   -// topList.add(String.valueOf(riskPatientCount));
443   -// result.add(topList);
444   -// }
445   -// }
446   -// }
447   -// }
448   -//
449   -// //表格合计计算
450   -// if(CollectionUtils.isNotEmpty(result))
451   -// {
452   -//
453   -// List<List<String>> totalAllList = new ArrayList<>();
454   -// for (BasicConfig level : riskLevelConfig) {
455   -// List<String> totalList = new ArrayList<>();
456   -// totalList.add(String.valueOf(++seq));
457   -// totalList.add("合计");
458   -//
459   -// if (addrType < 3) {
460   -// totalList.add(String.valueOf(orgNumTotal));
461   -// }
462   -// totalList.add(level.getName());
463   -//
464   -// int index = addrType < 3 ? 4 : 3;
465   -//
466   -// for (int i = index ; i <= (times == null ? 0+index : times.size()+index) ; i++)
467   -// {
468   -// int total = 0;
469   -// for (List<String> items : result)
470   -// {
471   -// if (items.contains(level.getName()))
472   -// {
473   -// total+=Integer.valueOf(items.get(i));
474   -// }
475   -// }
476   -// totalList.add(String.valueOf(total));
477   -// }
478   -// totalAllList.add(totalList);
479   -// }
480   -// result.addAll(totalAllList);
481   -// }
482   -//
483 478 // for (List<String> items : result)
484 479 // {
485 480 // for (String item : items)
... ... @@ -558,10 +553,6 @@
558 553 map.put("data",items);
559 554 series.add(map);
560 555 }
561   -
562   - //计算占比
563   - List<Map<String,Object>> bfbItem = handzb(series);
564   - series.addAll(bfbItem);
565 556 }
566 557 }
567 558 else if (addrType == 3)
... ... @@ -607,10 +598,6 @@
607 598 }
608 599 series.add(map);
609 600 }
610   -
611   - //计算占比
612   - List<Map<String,Object>> bfbItem = handzb(series);
613   - series.addAll(bfbItem);
614 601 }
615 602 }
616 603 datas.put("series",series);
... ... @@ -1005,6 +992,92 @@
1005 992  
1006 993 return hids;
1007 994 }
  995 +
  996 +
  997 +
  998 + //计算占比
  999 +// List<Map<String,Object>> proportion = handzb(series);
  1000 +// series.addAll(proportion);
  1001 +
  1002 +
  1003 + //计算环比
  1004 +// List<Map<String,Object>> mom = new ArrayList<>();
  1005 +//
  1006 +// //环比 1月 2 季度 3半年 4年
  1007 +// Integer momType = countRequest.getMomType();
  1008 +//
  1009 +// String requestStart = countRequest.getTimeStart();
  1010 +// Date requestStartDate = DateUtil.parseYMD(requestStart);
  1011 +//
  1012 +// Date previousMomStart = null;
  1013 +// Date previousMomEnd = null;
  1014 +//
  1015 +// Date momStart = null;
  1016 +// Date momEnd = null;
  1017 +// if (momType == 1)
  1018 +// {
  1019 +// momStart = DateUtil.getMonthDay(requestStartDate, 0, 1);
  1020 +// momEnd = DateUtil.addDay(DateUtil.getMonthDay(requestStartDate, 0, 0), 1);
  1021 +//
  1022 +// previousMomStart = DateUtil.addMonth(momStart, -1);
  1023 +// previousMomEnd = DateUtil.addMonth(momEnd, -1);
  1024 +//
  1025 +// System.out.println(DateUtil.getyyyy_MM_dd(momStart));
  1026 +// System.out.println(DateUtil.getyyyy_MM_dd(momEnd));
  1027 +// System.out.println(DateUtil.getyyyy_MM_dd(previousMomStart));
  1028 +// System.out.println(DateUtil.getyyyy_MM_dd(previousMomEnd));
  1029 +// }
  1030 +//
  1031 +// OrganizationQuery idQuery = new OrganizationQuery();
  1032 +// idQuery.setYn(YnEnums.YES.getId());
  1033 +//
  1034 +// for (BasicConfig config : riskLevelConfig)
  1035 +// {
  1036 +//
  1037 +// Map<String,Object> momMap = new HashMap<>();
  1038 +// momMap.put("name",config.getName());
  1039 +// momMap.put("type", "line");
  1040 +//
  1041 +// List<String> momParcent = new ArrayList<>();
  1042 +// for (Map<String, Object> addr : list)
  1043 +// {
  1044 +//
  1045 +// String id = String.valueOf(addr.get("id"));
  1046 +// if (addrType == 1)
  1047 +// {
  1048 +// idQuery.setCityId(id);
  1049 +// }
  1050 +// else if(addrType == 2)
  1051 +// {
  1052 +// idQuery.setAreaId(id);
  1053 +// }
  1054 +//
  1055 +// //查询机构数
  1056 +// List<Organization> orgs = organizationService.queryOrganization(idQuery);
  1057 +// List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
  1058 +//
  1059 +// patientsQuery.setHospitalList(hids);
  1060 +// //高危等级
  1061 +// patientsQuery.setrLevel(config.getId());
  1062 +// patientsQuery.setLastCTimeStart(momStart);
  1063 +// patientsQuery.setLastCTimeEnd(momEnd);
  1064 +// //当前值
  1065 +// int num = patientsService.queryPatientCount(patientsQuery);
  1066 +//
  1067 +// patientsQuery.setLastCTimeStart(previousMomStart);
  1068 +// patientsQuery.setLastCTimeEnd(previousMomEnd);
  1069 +// //上期值
  1070 +// int num1 = patientsService.queryPatientCount(patientsQuery);
  1071 +// String momValue = MathUtil.getProportion(num-num1,num1);
  1072 +// momParcent.add(momValue);
  1073 +// }
  1074 +// momMap.put("data",momParcent);
  1075 +//
  1076 +// mom.add(momMap);
  1077 +// }
  1078 +//
  1079 +// series.addAll(mom);
  1080 +
1008 1081  
1009 1082 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsCountRequest.java View file @ 255f578
... ... @@ -45,8 +45,8 @@
45 45 //对比指标 1 占比 2 环比
46 46 private Integer compareType;
47 47  
48   - //环比 周 1月 2 季度 3半年 4年
49   - private Integer hbType;
  48 + //环比 1月 2 季度 3半年 4年
  49 + private Integer momType;
50 50  
51 51 //孕周 0 全部孕周 1:孕12周前 2:13-19 3:20-25 4:26-30 5:31-36 6:37-40 7:40-分娩前
52 52 private Integer week;
53 53  
... ... @@ -75,12 +75,12 @@
75 75 this.queryStreetId = queryStreetId;
76 76 }
77 77  
78   - public Integer getHbType() {
79   - return hbType;
  78 + public Integer getMomType() {
  79 + return momType;
80 80 }
81 81  
82   - public void setHbType(Integer hbType) {
83   - this.hbType = hbType;
  82 + public void setMomType(Integer momType) {
  83 + this.momType = momType;
84 84 }
85 85  
86 86 public Integer getWeek() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java View file @ 255f578
... ... @@ -22,6 +22,7 @@
22 22 }
23 23  
24 24 private String id;
  25 + private String pid;
25 26 //名字
26 27 private String name;
27 28 //年龄
... ... @@ -143,6 +144,14 @@
143 144 return riskScore;
144 145 }
145 146  
  147 + public String getPid() {
  148 + return pid;
  149 + }
  150 +
  151 + public void setPid(String pid) {
  152 + this.pid = pid;
  153 + }
  154 +
146 155 public void setRiskScore(String riskScore) {
147 156 this.riskScore = riskScore;
148 157 }
... ... @@ -166,6 +175,7 @@
166 175 if (null != patients.getDueDate()) {
167 176 setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
168 177 }
  178 + setPid(patients.getPid());
169 179 setName(patients.getUsername());
170 180 setPhone(patients.getPhone());
171 181 setRemarks(patients.getMremark());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 255f578
... ... @@ -56,6 +56,7 @@
56 56 urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封");
57 57 urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
58 58 urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
  59 + urls.put("area-weihai.healthbaby.com.cn:12356","威海");
59 60 }
60 61  
61 62 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 255f578
... ... @@ -156,7 +156,6 @@
156 156 pulse.add(infos.containsKey(date) ? (Integer) infos.get(date).get("pulse") : 0);
157 157 }
158 158 }
159   -
160 159 return RespBuilder.buildSuccess("xyInfos", xyInfos, "szyMin", szyMin, "ssyMax", ssyMax, "ssy", ssy, "szy", szy, "pulse", pulse);
161 160 }
162 161  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 255f578
... ... @@ -196,6 +196,7 @@
196 196 Map<String, Object> restMap = new HashMap<>();
197 197 List<List<String>> tabList = new ArrayList<>();
198 198 List<String> titleList = new ArrayList<>();
  199 + List<String> countList = new ArrayList<>();
199 200 List<String> xDatas = new ArrayList<>();
200 201 List<Map<String, Object>> series = new ArrayList<>();
201 202 List<String> legend = Arrays.asList("建档总数");
... ... @@ -349,6 +350,7 @@
349 350  
350 351 tabList.add(0, titleList);
351 352 setTabListInfo(tabList, StringUtils.isNotEmpty(aredId) ? 2 : 3);
  353 + setCountList(tabList, countList, StringUtils.isNotEmpty(aredId) ? 3 : 4);
352 354  
353 355 barMap.put("data", bar);
354 356 barMap.put("type", "bar");
355 357  
356 358  
... ... @@ -436,11 +438,35 @@
436 438 return RespBuilder.buildSuccess(restMap);
437 439 }
438 440  
  441 + private void setCountList(List<List<String>> tabList, List<String> countList, int index) {
  442 +
  443 + if(tabList.size() > 1) {
  444 + countList.add(tabList.size() + "");
  445 + countList.add("合计");
  446 + if(index == 4) {
  447 + int orgCount = 0;
  448 + for (int i = 1; i < tabList.size(); i++) {
  449 + orgCount += Integer.parseInt(tabList.get(i).get(2));
  450 + }
  451 + countList.add(orgCount + "");
  452 + }
  453 + countList.add("建档总数");
  454 + for (int i = index; i < tabList.get(0).size(); i++) {
  455 + int count = 0;
  456 + for (int j = 1; j < tabList.size(); j++) {
  457 + count += Integer.parseInt(tabList.get(j).get(i));
  458 + }
  459 + countList.add(count + "");
  460 + }
  461 + tabList.add(countList);
  462 + }
  463 + }
  464 +
439 465 private void setTabListInfo(List<List<String>> tabList, int index) {
440 466 if(CollectionUtils.isNotEmpty(tabList)) {
  467 + int seq = 0;
441 468 for (int i = 0; i < tabList.size(); i++) {
442 469 List<String> list = tabList.get(i);
443   - int seq = 0;
444 470 if(i == 0) {
445 471 list.add(0, "序号" );
446 472 list.add("合计");