From 32b7184ad3ef45161a1bc5c2ddfac72776f89c2c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 4 Nov 2022 10:10:00 +0800 Subject: [PATCH] update --- .../operate/web/facade/PatientSyncMysqlFacade.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 1464ac2..1343a44 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 @@ -3066,6 +3066,12 @@ public class PatientSyncMysqlFacade { int lastDate21= null==mapTotal.get("data21")?0:Integer.parseInt(mapTotal.get("data21").toString()); mapTotal.put("data21",null==streetMap.get("data21")?lastDate21:Integer.parseInt(streetMap.get("data21").toString())+lastDate21); + int lastDate23= null==mapTotal.get("data23")?0:Integer.parseInt(mapTotal.get("data23").toString()); + mapTotal.put("data23",null==streetMap.get("data23")?lastDate21:Integer.parseInt(streetMap.get("data23").toString())+lastDate23); + + int lastDate24= null==mapTotal.get("data24")?0:Integer.parseInt(mapTotal.get("data24").toString()); + mapTotal.put("data24",null==streetMap.get("data24")?lastDate21:Integer.parseInt(streetMap.get("data24").toString())+lastDate24); + data.add(streetMap); } DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0 @@ -3170,6 +3176,16 @@ public class PatientSyncMysqlFacade { } mapTotal.put("data22",data21_data2+"%"); + String data23_data24="0.00"; + if(Integer.parseInt(mapTotal.get("data24").toString())!=0){ + float v = (float) Integer.parseInt(mapTotal.get("data23").toString()) / Integer.parseInt(mapTotal.get("data24").toString()); + if(v>=1){ + data23_data24="100.00"; + }else { + data23_data24 = df.format(v * 100); + } + } + mapTotal.put("data25",data23_data24+"%"); data.add(mapTotal); return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); -- 1.8.3.1