Commit 32b7184ad3ef45161a1bc5c2ddfac72776f89c2c

Authored by liquanyu
1 parent a1a69fde7b

update

Showing 1 changed file with 16 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 32b7184
... ... @@ -3066,6 +3066,12 @@
3066 3066 int lastDate21= null==mapTotal.get("data21")?0:Integer.parseInt(mapTotal.get("data21").toString());
3067 3067 mapTotal.put("data21",null==streetMap.get("data21")?lastDate21:Integer.parseInt(streetMap.get("data21").toString())+lastDate21);
3068 3068  
  3069 + int lastDate23= null==mapTotal.get("data23")?0:Integer.parseInt(mapTotal.get("data23").toString());
  3070 + mapTotal.put("data23",null==streetMap.get("data23")?lastDate21:Integer.parseInt(streetMap.get("data23").toString())+lastDate23);
  3071 +
  3072 + int lastDate24= null==mapTotal.get("data24")?0:Integer.parseInt(mapTotal.get("data24").toString());
  3073 + mapTotal.put("data24",null==streetMap.get("data24")?lastDate21:Integer.parseInt(streetMap.get("data24").toString())+lastDate24);
  3074 +
3069 3075 data.add(streetMap);
3070 3076 }
3071 3077 DecimalFormat df = new DecimalFormat("0.00");//格式化小数,不足的补0
... ... @@ -3170,6 +3176,16 @@
3170 3176 }
3171 3177 mapTotal.put("data22",data21_data2+"%");
3172 3178  
  3179 + String data23_data24="0.00";
  3180 + if(Integer.parseInt(mapTotal.get("data24").toString())!=0){
  3181 + float v = (float) Integer.parseInt(mapTotal.get("data23").toString()) / Integer.parseInt(mapTotal.get("data24").toString());
  3182 + if(v>=1){
  3183 + data23_data24="100.00";
  3184 + }else {
  3185 + data23_data24 = df.format(v * 100);
  3186 + }
  3187 + }
  3188 + mapTotal.put("data25",data23_data24+"%");
3173 3189  
3174 3190 data.add(mapTotal);
3175 3191 return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);