diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index ee1d8cf..f59808d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -20,7 +20,6 @@ import com.lyms.platform.operate.web.worker.DueOrgCountWorker; import com.lyms.platform.operate.web.worker.MaterDeliverWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; @@ -2676,6 +2675,8 @@ public class MatDeliverFacade { } } + sum(list,basicConfigs); + Map data = new HashMap<>(); data.put("coutData",list); data.put("areaNames",areaNames); @@ -2687,7 +2688,7 @@ public class MatDeliverFacade { return objectResponse; } - public void sum(List> list) + public void sum(List> list,List basicConfigs) { int fmPoGongCount = 0; //分娩方式 剖宫产 @@ -2724,12 +2725,75 @@ public class MatDeliverFacade { { for (Map map : list) { - - } - } - - Map totalMap = new HashMap<>(); - - + fmPoGongCount += Integer.parseInt(map.get("fmPoGongCount")); //分娩方式 剖宫产 + wsCount += Integer.parseInt(map.get("wsCount")); //外省 + chanCount += Integer.parseInt(map.get("chanCount")); //产妇数 + babySiTaiCount += Integer.parseInt(map.get("babySiTaiCount")); //死胎数 + girlCount += Integer.parseInt(map.get("girlCount")); //女 + boyCount += Integer.parseInt(map.get("boyCount")); //男 + bswsCount += Integer.parseInt(map.get("bswsCount")); //本省外市 + huoChanCount += Integer.parseInt(map.get("huoChanCount")); //活产数 + babySiChanCount += Integer.parseInt(map.get("babySiChanCount")); //死产数 + zcBabyCount += Integer.parseInt(map.get("zcBabyCount")); //早产儿数 + huiYinFullCount += Integer.parseInt(map.get("huiYinFullCount")); //会阴情况 完好 + siLielevelCount += Integer.parseInt(map.get("siLielevelCount")); //会阴情况 Ⅰ-Ⅱ°裂伤 + siLielevelYzCount += Integer.parseInt(map.get("siLielevelYzCount")); //会阴情况 重度裂伤 + queXianBabyCount += Integer.parseInt(map.get("queXianBabyCount")); //出生缺陷数 + huiYingTotalCount += Integer.parseInt(map.get("huiYingTotalCount")); //会阴情况 小计 + fmShunChanCount += Integer.parseInt(map.get("fmShunChanCount")); //分娩方式 顺产 + riskCount += Integer.parseInt(map.get("riskCount")); //高危孕产妇数 + fmCount += Integer.parseInt(map.get("fmCount")); //分娩方式 小计 + doubleCount += Integer.parseInt(map.get("doubleCount")); //双胎数 + huiYinSpitCount += Integer.parseInt(map.get("huiYinSpitCount")); //会阴情况 切开 + fzrDoubleCount += Integer.parseInt(map.get("fzrDoubleCount")); //非自然妊娠双胎 + } + } + + + Map totalMap = new LinkedHashMap<>(); + + //各个区总和计算 + for (int i = 1 ; i <= basicConfigs.size() ; i++) + { + int total = 0; + for (Map map : list) + { + total += Integer.parseInt(map.get("areaCount"+i)); + } + totalMap.put("areaCount"+i,String.valueOf(total)); + } + + + totalMap.put("orgName","合计"); + totalMap.put("fmPoGongCount",String.valueOf(fmPoGongCount)); + totalMap.put("wsCount",String.valueOf(wsCount)); + totalMap.put("chanCount",String.valueOf(chanCount)); + totalMap.put("babySiTaiCount",String.valueOf(babySiTaiCount)); + totalMap.put("girlCount",String.valueOf(girlCount)); + totalMap.put("boyCount",String.valueOf(boyCount)); + totalMap.put("bswsCount",String.valueOf(bswsCount)); + totalMap.put("huoChanCount",String.valueOf(huoChanCount)); + totalMap.put("babySiChanCount",String.valueOf(babySiChanCount)); + totalMap.put("zcBabyCount",String.valueOf(zcBabyCount)); + totalMap.put("huiYinFullCount",String.valueOf(huiYinFullCount)); + totalMap.put("siLielevelCount",String.valueOf(siLielevelCount)); + totalMap.put("siLielevelYzCount",String.valueOf(siLielevelYzCount)); + totalMap.put("queXianBabyCount",String.valueOf(queXianBabyCount)); + totalMap.put("huiYingTotalCount",String.valueOf(huiYingTotalCount)); + totalMap.put("fmShunChanCount",String.valueOf(fmShunChanCount)); + + totalMap.put("riskCount",String.valueOf(riskCount)); + totalMap.put("fmCount",String.valueOf(fmCount)); + totalMap.put("doubleCount",String.valueOf(doubleCount)); + totalMap.put("huiYinSpitCount",String.valueOf(huiYinSpitCount)); + totalMap.put("fzrDoubleCount",String.valueOf(fzrDoubleCount)); + + totalMap.put("lowWeightCount",""); + totalMap.put("babySiWangCount",""); + totalMap.put("sieveCount",""); + totalMap.put("bigBoyCount",""); + totalMap.put("sieveFreeCount",""); + totalMap.put("fmOtherCount",""); + list.add(totalMap); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/DueOrgCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/DueOrgCountWorker.java index d0c1a5b..088ff27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/DueOrgCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/DueOrgCountWorker.java @@ -15,7 +15,6 @@ import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.MatDeliverQuery; import com.lyms.platform.query.PatientsQuery; @@ -431,7 +430,7 @@ public class DueOrgCountWorker implements Callable>> { patientsQuery4.setType(3); patientsQuery4.setAreaRegisterId(basicConfig.getId()); int areaCount = patientsService.queryPatientCount(patientsQuery4); - map.put("areaCount"+index+basicConfig.getName(), String.valueOf(areaCount)); + map.put("areaCount"+index, String.valueOf(areaCount)); index++; } }