diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java index f91a803..fb7c453 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java @@ -115,4 +115,20 @@ public interface MasterMysqlAntexcMapper { List> getMatDeliverTwoRiskCounts(Map param); List> getMatDeliverThreeRiskCounts(Map param); List> getMatDeliverFourRiskCounts(Map param); + + List getOrganizations(Map param); + + List> getFirstCheckCount(Map param); + List> getIsHivktCheckCount(Map param); + List> getHasHivktCheckCount(Map param); + List> getIsSyjgCheckCount(Map param); + List> getHasSyjgCheckCount(Map param); + List> getIsYgbmkyCheckCount(Map param); + List> getHasYgbmkyCheckCount(Map param); + + List> getMatdeliverCount(Map param); + List> getMatdeliverHivktCheckCount(Map param); + List> getMatdeliverHivktCheckzqCount(Map param); + List> getHasMatdeliverHivktCheckzqCount(Map param); + } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java index ddf831c..7b9d6a7 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportAntexchu.java @@ -16,6 +16,36 @@ public class ReportAntexchu { private String sourceId; private Date created; private Integer type; // 1初诊 2 复诊 + // 乙肝表面抗原 + private String ygbmky; + // hit抗体检测 + private String hivkt; + //梅毒血清实验结果 + private String syjg; + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getSyjg() { + return syjg; + } + + public void setSyjg(String syjg) { + this.syjg = syjg; + } + + public String getHivkt() { + return hivkt; + } + + public void setHivkt(String hivkt) { + this.hivkt = hivkt; + } public Integer getType() { return type; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java index 27857ff..23207f2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java @@ -119,4 +119,19 @@ public interface MysqlAntexcService { List> getMatDeliverTwoRiskCounts(Map param); List> getMatDeliverThreeRiskCounts(Map param); List> getMatDeliverFourRiskCounts(Map param); + + List getOrganizations(Map param); + + List> getFirstCheckCount(Map param); + List> getIsHivktCheckCount(Map param); + List> getHasHivktCheckCount(Map param); + List> getIsSyjgCheckCount(Map param); + List> getHasSyjgCheckCount(Map param); + List> getIsYgbmkyCheckCount(Map param); + List> getHasYgbmkyCheckCount(Map param); + + List> getMatdeliverCount(Map param); + List> getMatdeliverHivktCheckCount(Map param); + List> getMatdeliverHivktCheckzqCount(Map param); + List> getHasMatdeliverHivktCheckzqCount(Map param); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java index 8c972dd..a7aea75 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java @@ -326,6 +326,58 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService { return masterMysqlAntexcMapper.getMatDeliverFourRiskCounts(param); } + + @Override + public List getOrganizations(Map param){ + return masterMysqlAntexcMapper.getOrganizations(param); + } + + @Override + public List> getFirstCheckCount(Map param){ + return masterMysqlAntexcMapper.getFirstCheckCount(param); + } + @Override + public List> getIsHivktCheckCount(Map param){ + return masterMysqlAntexcMapper.getIsHivktCheckCount(param); + } + @Override + public List> getHasHivktCheckCount(Map param){ + return masterMysqlAntexcMapper.getHasHivktCheckCount(param); + } + @Override + public List> getIsSyjgCheckCount(Map param){ + return masterMysqlAntexcMapper.getIsSyjgCheckCount(param); + } + @Override + public List> getHasSyjgCheckCount(Map param){ + return masterMysqlAntexcMapper.getHasSyjgCheckCount(param); + } + @Override + public List> getIsYgbmkyCheckCount(Map param){ + return masterMysqlAntexcMapper.getIsYgbmkyCheckCount(param); + } + @Override + public List> getHasYgbmkyCheckCount(Map param){ + return masterMysqlAntexcMapper.getHasYgbmkyCheckCount(param); + } + + @Override + public List> getMatdeliverCount(Map param){ + return masterMysqlAntexcMapper.getMatdeliverCount(param); + } + @Override + public List> getMatdeliverHivktCheckCount(Map param){ + return masterMysqlAntexcMapper.getMatdeliverHivktCheckCount(param); + } + @Override + public List> getMatdeliverHivktCheckzqCount(Map param){ + return masterMysqlAntexcMapper.getMatdeliverHivktCheckzqCount(param); + } + @Override + public List> getHasMatdeliverHivktCheckzqCount(Map param){ + return masterMysqlAntexcMapper.getHasMatdeliverHivktCheckzqCount(param); + } + @Override public void addRisk(MysqlRisk model) { masterMysqlAntexcMapper.addRisk(model); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index eabd17f..1e9c054 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -1184,7 +1184,10 @@ parentId, created, sourceId, - type + type, + ygbmky, + hivkt, + syjg ) VALUES ( #{cid}, #{checkTime}, @@ -1194,7 +1197,10 @@ #{parentId}, #{created}, #{sourceId}, - #{type} + #{type}, + #{ygbmky}, + #{hivkt}, + #{syjg} ) @@ -2219,4 +2225,352 @@ ) l on l.foreignId = a.cid GROUP BY tp.name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index da68523..59bab56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -459,4 +459,18 @@ public class AreaCountController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return patientSyncMysqlFacade.geMatDeliverAreaCheckCount(time, hospitalId, loginState.getId()); } + + @RequestMapping(method = RequestMethod.GET, value = "/getLisCheckCount") + @ResponseBody + @TokenRequired + public BaseResponse getLisCheckCount(HttpServletRequest request, + @RequestParam(required = false) String time, + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String provinceId, + @RequestParam(required = false) String cityId, + @RequestParam(required = false) String areaId) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientSyncMysqlFacade.getLisCheckCount(time, hospitalId,provinceId,cityId,areaId, loginState.getId()); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index f20241f..ab868b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -25,7 +25,9 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.locale.converters.DateLocaleConverter; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.lang.reflect.InvocationTargetException; import java.util.*; +import java.util.concurrent.Future; /** * Created by Administrator on 2020-11-30. @@ -1387,6 +1390,55 @@ public class PatientSyncMysqlFacade { } ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.copyProperties(reportAntexchu, antExChu); + if (StringUtils.isEmpty(antExChu.getYgbmky()) && StringUtils.isNotEmpty(antExChu.getYgbmkyValue())) + { + try { + if (Double.parseDouble(antExChu.getYgbmkyValue()) > 1) + { + reportAntexchu.setYgbmky("yang"); + } + else + { + reportAntexchu.setYgbmky("yin"); + } + }catch (Exception e) + { + + } + } + if (StringUtils.isEmpty(antExChu.getHivkt()) && StringUtils.isNotEmpty(antExChu.getHivktValue())) + { + try { + if (Double.parseDouble(antExChu.getHivktValue()) > 1) + { + reportAntexchu.setHivkt("yang"); + } + else + { + reportAntexchu.setHivkt("yin"); + } + }catch (Exception e) + { + + } + } + if (StringUtils.isNotEmpty(antExChu.getSyjg()) && StringUtils.isNotEmpty(antExChu.getSyjgValue())) + { + try { + if (Double.parseDouble(antExChu.getSyjgValue()) > 1) + { + reportAntexchu.setSyjg("yang"); + } + else + { + reportAntexchu.setSyjg("yin"); + } + }catch (Exception e) + { + + } + } + } catch (IllegalAccessException e) { e.printStackTrace(); } catch (InvocationTargetException e) { @@ -2301,4 +2353,423 @@ public class PatientSyncMysqlFacade { return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); } + + public BaseResponse getLisCheckCount(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer id) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotEmpty(time)) + { + String[] arrs = time.split(" - "); + startDate = DateUtil.parseYMD(arrs[0]); + endDate = DateUtil.parseYMD(arrs[1]); + } + + Map param = new HashMap(); + param.put("startDate",startDate); + param.put("endDate",endDate); + param.put("hospitalId",hospitalId); + param.put("provinceId",provinceId); + param.put("cityId",cityId); + param.put("areaId", areaId); + List organizations = mysqlAntexcService.getOrganizations(param); + List> firstCheckCounts = mysqlAntexcService.getFirstCheckCount(param); + List> isHivktCheckCounts = mysqlAntexcService.getIsHivktCheckCount(param); + List> hasHivktCheckCounts = mysqlAntexcService.getHasHivktCheckCount(param); + List> isSyjgCheckCounts = mysqlAntexcService.getIsSyjgCheckCount(param); + List> hasSyjgCheckCounts = mysqlAntexcService.getHasSyjgCheckCount(param); + List> isYgbmkyCheckCounts = mysqlAntexcService.getIsYgbmkyCheckCount(param); + List> hasYgbmkyCheckCounts = mysqlAntexcService.getHasYgbmkyCheckCount(param); + + List> matdeliverCounts = mysqlAntexcService.getMatdeliverCount(param); + List> matdeliverHivktCheckCounts = mysqlAntexcService.getMatdeliverHivktCheckCount(param); + List> matdeliverHivktCheckzqCounts = mysqlAntexcService.getMatdeliverHivktCheckzqCount(param); + List> hasMatdeliverHivktCheckzqCounts = mysqlAntexcService.getHasMatdeliverHivktCheckzqCount(param); + + List> datas = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization org : organizations) + { + + Map data = new HashMap(); + + String provId = String.valueOf(org.getProvinceId()); + String cId = String.valueOf(org.getCityId()); + String aId = String.valueOf(org.getAreaId()); + String hospitalName = org.getName(); + String hid = String.valueOf(org.getId()); + String provinceName = getAddressName(provId); + String cityName = getAddressName(cId); + String areaName = getAddressName(aId); + + data.put("hospitalId",org.getId()); + data.put("hospitalName",hospitalName); + data.put("provinceName",provinceName); + data.put("cityName",cityName); + data.put("areaName",areaName); + data.put("provinceId",provId); + data.put("cityId",cId); + data.put("areaId",aId); + + long firstCheckCount = 0; + if (CollectionUtils.isNotEmpty(firstCheckCounts)) { + for (Map checkData : firstCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + firstCheckCount = Long.valueOf(String.valueOf(checkData.get("firstCheckCount"))); + break; + } + } + } + data.put("firstCheckCount",firstCheckCount); + + + long isHivktCheckCount = 0; + if (CollectionUtils.isNotEmpty(isHivktCheckCounts)) { + for (Map checkData : isHivktCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + isHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("isHivktCheckCount"))); + break; + } + } + } + data.put("isHivktCheckCount",isHivktCheckCount); + + + long hasHivktCheckCount = 0; + if (CollectionUtils.isNotEmpty(hasHivktCheckCounts)) { + for (Map checkData : hasHivktCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + hasHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("hasHivktCheckCount"))); + break; + } + } + } + data.put("hasHivktCheckCount",hasHivktCheckCount); + + + long isSyjgCheckCount = 0; + if (CollectionUtils.isNotEmpty(isSyjgCheckCounts)) { + for (Map checkData : isSyjgCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + isSyjgCheckCount = Long.valueOf(String.valueOf(checkData.get("isSyjgCheckCount"))); + break; + } + } + } + data.put("isSyjgCheckCount",isSyjgCheckCount); + + + long hasSyjgCheckCount = 0; + if (CollectionUtils.isNotEmpty(hasSyjgCheckCounts)) { + for (Map checkData : hasSyjgCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + hasSyjgCheckCount = Long.valueOf(String.valueOf(checkData.get("hasSyjgCheckCount"))); + break; + } + } + } + data.put("hasSyjgCheckCount",hasSyjgCheckCount); + + + long isYgbmkyCheckCount = 0; + if (CollectionUtils.isNotEmpty(isYgbmkyCheckCounts)) { + for (Map checkData : isYgbmkyCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + isYgbmkyCheckCount = Long.valueOf(String.valueOf(checkData.get("isYgbmkyCheckCount"))); + break; + } + } + } + data.put("isYgbmkyCheckCount",isYgbmkyCheckCount); + + + + long hasYgbmkyCheckCount = 0; + if (CollectionUtils.isNotEmpty(hasYgbmkyCheckCounts)) { + for (Map checkData : hasYgbmkyCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + hasYgbmkyCheckCount = Long.valueOf(String.valueOf(checkData.get("hasYgbmkyCheckCount"))); + break; + } + } + } + data.put("hasYgbmkyCheckCount",hasYgbmkyCheckCount); + + + long matdeliverCount = 0; + if (CollectionUtils.isNotEmpty(matdeliverCounts)) { + for (Map checkData : matdeliverCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + matdeliverCount = Long.valueOf(String.valueOf(checkData.get("matdeliverCount"))); + break; + } + } + } + data.put("matdeliverCount",matdeliverCount); + + + long matdeliverHivktCheckCount = 0; + if (CollectionUtils.isNotEmpty(matdeliverHivktCheckCounts)) { + for (Map checkData : matdeliverHivktCheckCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + matdeliverHivktCheckCount = Long.valueOf(String.valueOf(checkData.get("matdeliverHivktCheckCount"))); + break; + } + } + } + data.put("matdeliverHivktCheckCount",matdeliverHivktCheckCount); + + + long matdeliverHivktCheckzqCount = 0; + if (CollectionUtils.isNotEmpty(matdeliverHivktCheckzqCounts)) { + for (Map checkData : matdeliverHivktCheckzqCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + matdeliverHivktCheckzqCount = Long.valueOf(String.valueOf(checkData.get("matdeliverHivktCheckzqCount"))); + break; + } + } + } + data.put("matdeliverHivktCheckzqCount",matdeliverHivktCheckzqCount); + + + long hasMatdeliverHivktCheckzqCount = 0; + if (CollectionUtils.isNotEmpty(hasMatdeliverHivktCheckzqCounts)) { + for (Map checkData : hasMatdeliverHivktCheckzqCounts) { + if (hid.equals(checkData.get("hospitalId"))) + { + hasMatdeliverHivktCheckzqCount = Long.valueOf(String.valueOf(checkData.get("hasMatdeliverHivktCheckzqCount"))); + break; + } + } + } + data.put("hasMatdeliverHivktCheckzqCount",hasMatdeliverHivktCheckzqCount); + + datas.add(data); + } + } + + List chartData = new ArrayList<>(); + List firstCheckCountNum = new ArrayList<>(); + List isHivktCheckCountNum = new ArrayList<>(); + List hasHivktCheckCountNum = new ArrayList<>(); + List isSyjgCheckCountNum = new ArrayList<>(); + List hasSyjgCheckCountNum = new ArrayList<>(); + List isYgbmkyCheckCountNum = new ArrayList<>(); + List hasYgbmkyCheckCountNum = new ArrayList<>(); + List matdeliverCountNum = new ArrayList<>(); + List matdeliverHivktCheckCountNum = new ArrayList<>(); + List matdeliverHivktCheckzqCountNum = new ArrayList<>(); + List hasMatdeliverHivktCheckzqCountNum = new ArrayList<>(); + + if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) { + for (Map map : datas) { + chartData.add(map.get("hospitalName").toString()); + firstCheckCountNum.add(getInteger(map.get("firstCheckCount"))); + isHivktCheckCountNum.add(getInteger(map.get("isHivktCheckCount"))); + hasHivktCheckCountNum.add(getInteger(map.get("hasHivktCheckCount"))); + isSyjgCheckCountNum.add(getInteger(map.get("isSyjgCheckCount"))); + hasSyjgCheckCountNum.add(getInteger(map.get("hasSyjgCheckCount"))); + isYgbmkyCheckCountNum.add(getInteger(map.get("isYgbmkyCheckCount"))); + hasYgbmkyCheckCountNum.add(getInteger(map.get("hasYgbmkyCheckCount"))); + matdeliverCountNum.add(getInteger(map.get("matdeliverCount"))); + matdeliverHivktCheckCountNum.add(getInteger(map.get("matdeliverHivktCheckCount"))); + matdeliverHivktCheckzqCountNum.add(getInteger(map.get("matdeliverHivktCheckzqCount"))); + hasMatdeliverHivktCheckzqCountNum.add(getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); + + } + } else if (StringUtils.isNotEmpty(cityId)) { + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, + hasMatdeliverHivktCheckzqCountNum, chartData, "areaId", "areaName"); + } else if (StringUtils.isNotEmpty(provinceId)) { + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, + hasMatdeliverHivktCheckzqCountNum, chartData, "cityId", "cityName"); + } else { + getData(datas, firstCheckCountNum, isHivktCheckCountNum, hasHivktCheckCountNum, isSyjgCheckCountNum, hasSyjgCheckCountNum, + isYgbmkyCheckCountNum,hasYgbmkyCheckCountNum,matdeliverCountNum,matdeliverHivktCheckCountNum,matdeliverHivktCheckzqCountNum, + hasMatdeliverHivktCheckzqCountNum, chartData, "provinceId", "provinceName"); + } + + Map data = new HashMap<>(); + data.put("list", datas); + data.put("chartData", chartData); + data.put("firstCheckCount", firstCheckCountNum); + data.put("isHivktCheckCount", isHivktCheckCountNum); + data.put("hasHivktCheckCount", hasHivktCheckCountNum); + data.put("isSyjgCheckCount", isSyjgCheckCountNum); + data.put("hasSyjgCheckCount", hasSyjgCheckCountNum); + data.put("isYgbmkyCheckCount", isYgbmkyCheckCountNum); + data.put("hasYgbmkyCheckCount", hasYgbmkyCheckCountNum); + data.put("matdeliverCount", matdeliverCountNum); + data.put("matdeliverHivktCheckCount",matdeliverHivktCheckCountNum); + data.put("matdeliverHivktCheckzqCount", matdeliverHivktCheckzqCountNum); + data.put("hasMatdeliverHivktCheckzqCount", hasMatdeliverHivktCheckzqCountNum); + + + return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); + } + private void getData(List> datas, + List firstCheckCountNum, + List isHivktCheckCountNum, + List hasHivktCheckCountNum, + List isSyjgCheckCountNum, + List hasSyjgCheckCountNum, + List isYgbmkyCheckCountNum, + List hasYgbmkyCheckCountNum, + List matdeliverCountNum, + List matdeliverHivktCheckCountNum, + List matdeliverHivktCheckzqCountNum, + List hasMatdeliverHivktCheckzqCountNum, + List chartData, + String idKey, String nameKey + ) { + Map result = new LinkedHashMap<>(); + for (Map map : datas) { + + String key = "firstCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key) != null) { + Integer value = result.get(key); + result.put(key, value + getInteger(map.get("firstCheckCount"))); + } else { + result.put(key, getInteger(map.get("firstCheckCount"))); + } + + String key15 = "isHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key15) != null) { + Integer value = result.get(key15); + result.put(key15, value + getInteger(map.get("isHivktCheckCount"))); + } else { + result.put(key15, getInteger(map.get("isHivktCheckCount"))); + } + + String key1 = "hasHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key1) != null) { + Integer value = result.get(key1); + result.put(key1, value + getInteger(map.get("hasHivktCheckCount"))); + } else { + result.put(key1, getInteger(map.get("hasHivktCheckCount"))); + } + + String key2 = "isSyjgCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key2) != null) { + Integer value = result.get(key2); + result.put(key2, value + getInteger(map.get("isSyjgCheckCount"))); + } else { + result.put(key2, getInteger(map.get("isSyjgCheckCount"))); + } + + + String key27 = "hasSyjgCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key27) != null) { + Integer value = result.get(key27); + result.put(key27, value + getInteger(map.get("hasSyjgCheckCount"))); + } else { + result.put(key27, getInteger(map.get("hasSyjgCheckCount"))); + } + + String key3 = "isYgbmkyCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key3) != null) { + Integer value = result.get(key3); + result.put(key3, value + getInteger(map.get("isYgbmkyCheckCount"))); + } else { + result.put(key3, getInteger(map.get("isYgbmkyCheckCount"))); + } + + String key31 = "hasYgbmkyCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key31) != null) { + Integer value = result.get(key31); + result.put(key31, value + getInteger(map.get("hasYgbmkyCheckCount"))); + } else { + result.put(key31, getInteger(map.get("hasYgbmkyCheckCount"))); + } + + String key32 = "matdeliverCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key32) != null) { + Integer value = result.get(key32); + result.put(key32, value + getInteger(map.get("matdeliverCount"))); + } else { + result.put(key32, getInteger(map.get("matdeliverCount"))); + } + + + String key33 = "matdeliverHivktCheckCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key33) != null) { + Integer value = result.get(key33); + result.put(key33, value + getInteger(map.get("matdeliverHivktCheckCount"))); + } else { + result.put(key33, getInteger(map.get("matdeliverHivktCheckCount"))); + } + + + String key34 = "matdeliverHivktCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key34) != null) { + Integer value = result.get(key34); + result.put(key34, value + getInteger(map.get("matdeliverHivktCheckzqCount"))); + } else { + result.put(key34, getInteger(map.get("matdeliverHivktCheckzqCount"))); + } + + String key35 = "hasMatdeliverHivktCheckzqCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); + if (result.get(key35) != null) { + Integer value = result.get(key35); + result.put(key35, value + getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); + } else { + result.put(key35, getInteger(map.get("hasMatdeliverHivktCheckzqCount"))); + } + + } + + for (String key : result.keySet()) { + String name = key.split(":")[2]; + if (!chartData.contains(name)) { + chartData.add(name); + } + if (key.contains("firstCheckCount")) { + firstCheckCountNum.add(result.get(key)); + } else if (key.contains("isHivktCheckCount")) { + isHivktCheckCountNum.add(result.get(key)); + } + else if (key.contains("hasHivktCheckCount")) { + hasHivktCheckCountNum.add(result.get(key)); + } + else if (key.contains("isSyjgCheckCount")) { + isSyjgCheckCountNum.add(result.get(key)); + } + else if (key.contains("hasSyjgCheckCount")) { + hasSyjgCheckCountNum.add(result.get(key)); + } + else if (key.contains("isYgbmkyCheckCount")) { + isYgbmkyCheckCountNum.add(result.get(key)); + } + else if (key.contains("hasYgbmkyCheckCount")) { + hasYgbmkyCheckCountNum.add(result.get(key)); + } + else if (key.contains("matdeliverCount")) { + matdeliverCountNum.add(result.get(key)); + } + else if (key.contains("matdeliverHivktCheckCount")) { + matdeliverHivktCheckCountNum.add(result.get(key)); + } + else if (key.contains("matdeliverHivktCheckzqCount")) { + matdeliverHivktCheckzqCountNum.add(result.get(key)); + } + else if (key.contains("hasMatdeliverHivktCheckzqCount")) { + hasMatdeliverHivktCheckzqCountNum.add(result.get(key)); + } + } + } + + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; }