diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java index 4dff14d..c505370 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java @@ -281,7 +281,7 @@ public class annualReportFacade { totalMap.put("hivCount", String.valueOf(hivCount)); totalMap.put("hivPervent", this.division(hivCount, antexCount)); totalMap.put("hivYang", String.valueOf(hivYang)); - totalMap.put("hivYangPervent", String.valueOf((double) hivYang != 0.0 ? (double) hivYang / 100000 : 0.0)); + totalMap.put("hivYangPervent", String.valueOf(hivYang)); totalMap.put("veroleCount", String.valueOf(veroleCount)); totalMap.put("verolePervent", this.division(veroleCount, chanCount)); totalMap.put("veroleYang", String.valueOf(veroleYang)); @@ -307,8 +307,7 @@ public class annualReportFacade { totalMap.put("fmPoGongCount", String.valueOf(fmPoGongCount)); totalMap.put("fmPogongPervent", this.division(fmPoGongCount, Integer.parseInt(mapCout.get("babyCount")))); totalMap.put("killCount", String.valueOf(killCount)); - Double killPervent = (double) killCount != 0.0 ? (double) killCount / 100000 : 0; - totalMap.put("killPervent", String.valueOf(killPervent)); + totalMap.put("killPervent", String.valueOf(killCount)); totalMap.put("chuXueCount", String.valueOf(chuXueCount)); totalMap.put("chuXuePervent", this.division(chuXueCount, chanCount)); totalMap.put("killInfoCount", String.valueOf(killInfoCount));