jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b1462350a1d89e462e244c8b73a34c1aaf0fafcc

Authored by liquanyu
1 parent 9af44b9363
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

公共卫生统计

Showing 1 changed file with 11 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ b146235
... ... @@ -3060,6 +3060,10 @@
3060 3060 mapTotal.put("data13",null==streetMap.get("data13")?lastDate13:Integer.parseInt(streetMap.get("data13").toString())+lastDate13);
3061 3061 int lastDate15= null==mapTotal.get("data15")?0:Integer.parseInt(mapTotal.get("data15").toString());
3062 3062 mapTotal.put("data15",null==streetMap.get("data15")?lastDate15:Integer.parseInt(streetMap.get("data15").toString())+lastDate15);
  3063 +
  3064 + int bulilCount = null==mapTotal.get("allBuildCount")?0:Integer.parseInt(mapTotal.get("allBuildCount").toString());
  3065 + mapTotal.put("allBuildCount",null==streetMap.get("allBuildCount")?bulilCount:Integer.parseInt(streetMap.get("allBuildCount").toString())+bulilCount);
  3066 +
3063 3067 int lastDate17= null==mapTotal.get("data17")?0:Integer.parseInt(mapTotal.get("data17").toString());
3064 3068 mapTotal.put("data17",null==streetMap.get("data17")?lastDate17:Integer.parseInt(streetMap.get("data17").toString())+lastDate17);
3065 3069 int lastDate19= null==mapTotal.get("data19")?0:Integer.parseInt(mapTotal.get("data19").toString());
... ... @@ -3140,8 +3144,8 @@
3140 3144 mapTotal.put("data14",data13_data8+"%");
3141 3145  
3142 3146 String data15_data2="0.00";
3143   - if(Integer.parseInt(mapTotal.get("data2").toString())!=0){
3144   - float v = (float) Integer.parseInt(mapTotal.get("data15").toString()) / Integer.parseInt(mapTotal.get("data2").toString());
  3147 + if(Integer.parseInt(mapTotal.get("allBuildCount").toString())!=0){
  3148 + float v = (float) Integer.parseInt(mapTotal.get("data15").toString()) / Integer.parseInt(mapTotal.get("allBuildCount").toString());
3145 3149 if(v>=1){
3146 3150 data15_data2="100.00";
3147 3151 }else {
3148 3152  
... ... @@ -3420,8 +3424,8 @@
3420 3424 int data15 = patientsService.queryPatientCount(patientsQuery);
3421 3425 int lastDate15= null==hospitalDate.get("data15")?0:Integer.parseInt(hospitalDate.get("data15").toString());
3422 3426 hospitalDate.put("data15",data15+lastDate15);
3423   - //早孕建册率%
3424 3427  
  3428 + //早孕建册率%
3425 3429 patientsQuery.setBuildDaysStart(null);
3426 3430 patientsQuery.setBuildDaysEnd(null);
3427 3431  
3428 3432  
... ... @@ -3430,9 +3434,9 @@
3430 3434 int allBuildCount = null==hospitalDate.get("allBuildCount")?0:Integer.parseInt(hospitalDate.get("allBuildCount").toString());
3431 3435 hospitalDate.put("allBuildCount",buildCount+allBuildCount);
3432 3436 String data15_data2="0.00";
3433   - if(Integer.parseInt(hospitalDate.get("data2").toString())!=0){
  3437 + if(Integer.parseInt(hospitalDate.get("allBuildCount").toString())!=0){
3434 3438 float v = (float) Integer.parseInt(hospitalDate.get("data15").toString()) /
3435   - allBuildCount;
  3439 + Integer.parseInt(hospitalDate.get("allBuildCount").toString());
3436 3440 if(v>=1){
3437 3441 data15_data2="100.00";
3438 3442 }else {
... ... @@ -3572,6 +3576,8 @@
3572 3576 cnames.put("data23", "本年度儿童中医指导数");
3573 3577 cnames.put("data24", "本年度儿童数");
3574 3578 cnames.put("data25", "中医指导管理率%");
  3579 + cnames.put("data27", "本月0-3岁中医儿童指导数");
  3580 + cnames.put("data29", "本月0-3岁儿童中医管理率%");
3575 3581 List<Map<String, Object>> results = new ArrayList<>();
3576 3582  
3577 3583 BaseObjectResponse baseObjectResponse= (BaseObjectResponse) getPublicHygieneServiceCount(provinceId, cityId, areaId, streetId, dateTime);