diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java index 0bb5f8f..37735f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java @@ -246,54 +246,53 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri * @param double5Z * @return */ - private Map getStringObjectMap(Integer checkMonth, String double1Dq, String double2Dq, String double3Dq, String double4Dq, String double5Dq, Double double1Z, Double double2Z, Double double3Z, Double double4Z, Double double5Z) { + private Map getStringObjectMap(Integer checkMonth, int double1Dq, int double2Dq, int double3Dq, int double4Dq, int double5Dq, Double double1Z, Double double2Z, Double double3Z, Double double4Z, Double double5Z) { Map reportMap = new HashMap<>(); LinkedList objects1 = new LinkedList<>(); String s1z = ""; - DecimalFormat df = new DecimalFormat("0.00"); if (double1Z != 0.00 && checkMonth != 0) { - double1Dq = String.format(df.format(double1Z / checkMonth * 100)); + double1Dq = (int) (double1Z / checkMonth * 100); s1z = double1Z.toString(); } objects1.add(s1z); - objects1.add((int)Double.parseDouble(double1Dq)); + objects1.add(double1Dq); LinkedList objects2 = new LinkedList<>(); String s2z = ""; if (double2Z != 0.00 && checkMonth != 0) { s2z = double2Z.toString(); - double2Dq = String.format(df.format(double2Z / checkMonth * 100)); + double2Dq = (int) (double2Z / checkMonth * 100); } objects2.add(s2z); - objects2.add((int)Double.parseDouble(double2Dq)); + objects2.add(double2Dq); LinkedList objects3 = new LinkedList<>(); String s3z = ""; if (double3Z != 0.00 && checkMonth != 0) { s3z = double3Z.toString(); - double3Dq = String.format(df.format(double3Z / checkMonth * 100)); + double3Dq = (int) (double3Z / checkMonth * 100); } objects3.add(s3z); - objects3.add((int)Double.parseDouble(double3Dq)); + objects3.add(double3Dq); LinkedList objects4 = new LinkedList<>(); String s4z = ""; if (double4Z != 0.00 && checkMonth != 0) { s4z = double4Z.toString(); - double4Dq = String.format(df.format(double4Z / checkMonth * 100)); + double4Dq = (int) (double4Z / checkMonth * 100); } objects4.add(s4z); - objects4.add((int)Double.parseDouble(double4Dq)); + objects4.add(double4Dq); LinkedList objects5 = new LinkedList<>(); String s5z = ""; if (double5Z != 0.00 && checkMonth != 0) { s5z = double5Z.toString(); - double5Dq = String.format(df.format(double5Z / checkMonth * 100)); + double5Dq = (int) (double5Z / checkMonth * 100); } objects5.add(s5z); - objects5.add((int)Double.parseDouble(double5Dq)); + objects5.add(double5Dq); reportMap.put("1", objects1); reportMap.put("2", objects2); reportMap.put("3", objects3); @@ -374,11 +373,11 @@ public class BabyEvaluationCriterionServiceImpl implements BabyEvaluationCriteri objectMap.put("levelName", model.getLevelName()); // 智龄 - String double1Dq = "", - double2Dq = "", - double3Dq = "", - double4Dq = "", - double5Dq = ""; + int double1Dq = 0, + double2Dq = 0, + double3Dq = 0, + double4Dq = 0, + double5Dq = 0; Double double1Z = 0.00D, double2Z = 0.00D, double3Z = 0.00D,