From b1462350a1d89e462e244c8b73a34c1aaf0fafcc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 10 Nov 2022 14:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientSyncMysqlFacade.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 454afd1..9c4a2e3 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 @@ -3060,6 +3060,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { mapTotal.put("data13",null==streetMap.get("data13")?lastDate13:Integer.parseInt(streetMap.get("data13").toString())+lastDate13); int lastDate15= null==mapTotal.get("data15")?0:Integer.parseInt(mapTotal.get("data15").toString()); mapTotal.put("data15",null==streetMap.get("data15")?lastDate15:Integer.parseInt(streetMap.get("data15").toString())+lastDate15); + + int bulilCount = null==mapTotal.get("allBuildCount")?0:Integer.parseInt(mapTotal.get("allBuildCount").toString()); + mapTotal.put("allBuildCount",null==streetMap.get("allBuildCount")?bulilCount:Integer.parseInt(streetMap.get("allBuildCount").toString())+bulilCount); + int lastDate17= null==mapTotal.get("data17")?0:Integer.parseInt(mapTotal.get("data17").toString()); mapTotal.put("data17",null==streetMap.get("data17")?lastDate17:Integer.parseInt(streetMap.get("data17").toString())+lastDate17); int lastDate19= null==mapTotal.get("data19")?0:Integer.parseInt(mapTotal.get("data19").toString()); @@ -3140,8 +3144,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { mapTotal.put("data14",data13_data8+"%"); String data15_data2="0.00"; - if(Integer.parseInt(mapTotal.get("data2").toString())!=0){ - float v = (float) Integer.parseInt(mapTotal.get("data15").toString()) / Integer.parseInt(mapTotal.get("data2").toString()); + if(Integer.parseInt(mapTotal.get("allBuildCount").toString())!=0){ + float v = (float) Integer.parseInt(mapTotal.get("data15").toString()) / Integer.parseInt(mapTotal.get("allBuildCount").toString()); if(v>=1){ data15_data2="100.00"; }else { @@ -3420,8 +3424,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { int data15 = patientsService.queryPatientCount(patientsQuery); int lastDate15= null==hospitalDate.get("data15")?0:Integer.parseInt(hospitalDate.get("data15").toString()); hospitalDate.put("data15",data15+lastDate15); - //早孕建册率% + //早孕建册率% patientsQuery.setBuildDaysStart(null); patientsQuery.setBuildDaysEnd(null); @@ -3430,9 +3434,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { int allBuildCount = null==hospitalDate.get("allBuildCount")?0:Integer.parseInt(hospitalDate.get("allBuildCount").toString()); hospitalDate.put("allBuildCount",buildCount+allBuildCount); String data15_data2="0.00"; - if(Integer.parseInt(hospitalDate.get("data2").toString())!=0){ + if(Integer.parseInt(hospitalDate.get("allBuildCount").toString())!=0){ float v = (float) Integer.parseInt(hospitalDate.get("data15").toString()) / - allBuildCount; + Integer.parseInt(hospitalDate.get("allBuildCount").toString()); if(v>=1){ data15_data2="100.00"; }else { @@ -3572,6 +3576,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { cnames.put("data23", "本年度儿童中医指导数"); cnames.put("data24", "本年度儿童数"); cnames.put("data25", "中医指导管理率%"); + cnames.put("data27", "本月0-3岁中医儿童指导数"); + cnames.put("data29", "本月0-3岁儿童中医管理率%"); List> results = new ArrayList<>(); BaseObjectResponse baseObjectResponse= (BaseObjectResponse) getPublicHygieneServiceCount(provinceId, cityId, areaId, streetId, dateTime); -- 1.8.3.1