jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a423a6b7e63a6d24cf4f966b4410307721f491aa

Authored by dongqin
1 parent 63573eb80b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 16 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ a423a6b
... ... @@ -246,54 +246,53 @@
246 246 * @param double5Z
247 247 * @return
248 248 */
249   - private Map<String, Object> getStringObjectMap(Integer checkMonth, String double1Dq, String double2Dq, String double3Dq, String double4Dq, String double5Dq, Double double1Z, Double double2Z, Double double3Z, Double double4Z, Double double5Z) {
  249 + private Map<String, Object> getStringObjectMap(Integer checkMonth, int double1Dq, int double2Dq, int double3Dq, int double4Dq, int double5Dq, Double double1Z, Double double2Z, Double double3Z, Double double4Z, Double double5Z) {
250 250 Map<String, Object> reportMap = new HashMap<>();
251 251 LinkedList<Object> objects1 = new LinkedList<>();
252 252 String s1z = "";
253   - DecimalFormat df = new DecimalFormat("0.00");
254 253 if (double1Z != 0.00 && checkMonth != 0) {
255   - double1Dq = String.format(df.format(double1Z / checkMonth * 100));
  254 + double1Dq = (int) (double1Z / checkMonth * 100);
256 255 s1z = double1Z.toString();
257 256 }
258 257 objects1.add(s1z);
259   - objects1.add((int)Double.parseDouble(double1Dq));
  258 + objects1.add(double1Dq);
260 259  
261 260 LinkedList<Object> objects2 = new LinkedList<>();
262 261 String s2z = "";
263 262 if (double2Z != 0.00 && checkMonth != 0) {
264 263 s2z = double2Z.toString();
265   - double2Dq = String.format(df.format(double2Z / checkMonth * 100));
  264 + double2Dq = (int) (double2Z / checkMonth * 100);
266 265 }
267 266 objects2.add(s2z);
268   - objects2.add((int)Double.parseDouble(double2Dq));
  267 + objects2.add(double2Dq);
269 268  
270 269 LinkedList<Object> objects3 = new LinkedList<>();
271 270 String s3z = "";
272 271 if (double3Z != 0.00 && checkMonth != 0) {
273 272 s3z = double3Z.toString();
274   - double3Dq = String.format(df.format(double3Z / checkMonth * 100));
  273 + double3Dq = (int) (double3Z / checkMonth * 100);
275 274 }
276 275 objects3.add(s3z);
277   - objects3.add((int)Double.parseDouble(double3Dq));
  276 + objects3.add(double3Dq);
278 277  
279 278 LinkedList<Object> objects4 = new LinkedList<>();
280 279 String s4z = "";
281 280 if (double4Z != 0.00 && checkMonth != 0) {
282 281 s4z = double4Z.toString();
283   - double4Dq = String.format(df.format(double4Z / checkMonth * 100));
  282 + double4Dq = (int) (double4Z / checkMonth * 100);
284 283 }
285 284 objects4.add(s4z);
286   - objects4.add((int)Double.parseDouble(double4Dq));
  285 + objects4.add(double4Dq);
287 286  
288 287  
289 288 LinkedList<Object> objects5 = new LinkedList<>();
290 289 String s5z = "";
291 290 if (double5Z != 0.00 && checkMonth != 0) {
292 291 s5z = double5Z.toString();
293   - double5Dq = String.format(df.format(double5Z / checkMonth * 100));
  292 + double5Dq = (int) (double5Z / checkMonth * 100);
294 293 }
295 294 objects5.add(s5z);
296   - objects5.add((int)Double.parseDouble(double5Dq));
  295 + objects5.add(double5Dq);
297 296 reportMap.put("1", objects1);
298 297 reportMap.put("2", objects2);
299 298 reportMap.put("3", objects3);
... ... @@ -374,11 +373,11 @@
374 373 objectMap.put("levelName", model.getLevelName());
375 374  
376 375 // 智龄
377   - String double1Dq = "",
378   - double2Dq = "",
379   - double3Dq = "",
380   - double4Dq = "",
381   - double5Dq = "";
  376 + int double1Dq = 0,
  377 + double2Dq = 0,
  378 + double3Dq = 0,
  379 + double4Dq = 0,
  380 + double5Dq = 0;
382 381 Double double1Z = 0.00D,
383 382 double2Z = 0.00D,
384 383 double3Z = 0.00D,