From 23b6ba3938b7d17d5ed0cb660b1c683163ba084f Mon Sep 17 00:00:00 2001 From: litao Date: Wed, 28 Sep 2022 09:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=A3=E8=B9=84=E7=96=AB=E5=85=B0=E6=89=80?= =?UTF-8?q?=E5=8D=95=E6=9D=BF=E6=89=93=E5=8D=B0=E5=8E=9F=E5=A7=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AElog2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 1a6e474..9aef277 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -1676,15 +1676,15 @@ public class EntrustServiceImpl extends BaseServiceImpl for (int i = 0; i < arrVOList.size() / 3; i++) { Map map = new HashMap<>(); map.put("num1", arrVOList.get(i).getNum()); - map.put("value1", arrVOList.get(i).getValue()); + map.put("value1", arrVOList.get(i).getLog2()); map.put("result1", arrVOList.get(i).getResult()); map.put("num2", arrVOList.get(arrVOList.size() / 3 + i).getNum()); - map.put("value2", arrVOList.get(arrVOList.size() / 3 + i).getValue()); + map.put("value2", arrVOList.get(arrVOList.size() / 3 + i).getLog2()); map.put("result2", arrVOList.get(arrVOList.size() / 3 + i).getResult()); map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getNum()); - map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getValue()); + map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getLog2()); map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getResult()); resultList1.add(map); } @@ -1693,28 +1693,28 @@ public class EntrustServiceImpl extends BaseServiceImpl if (arrVOList.size() % 3 == 1) { Map map = new HashMap<>(); map.put("num1", arrVOList.get(i).getNum()); - map.put("value1", arrVOList.get(i).getValue()); + map.put("value1", arrVOList.get(i).getLog2()); map.put("result1", arrVOList.get(i).getResult()); if (i < arrVOList.size() / 3) { map.put("num2", arrVOList.get(arrVOList.size() / 3 + i + 1).getNum()); - map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getValue()); + map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getLog2()); map.put("result2", arrVOList.get(arrVOList.size() / 3 + i + 1).getResult()); map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getNum()); - map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getValue()); + map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getLog2()); map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getResult()); } resultList1.add(map); } else if (arrVOList.size() % 3 == 2) { Map map = new HashMap<>(); map.put("num1", arrVOList.get(i).getNum()); - map.put("value1", arrVOList.get(i).getValue()); + map.put("value1", arrVOList.get(i).getLog2()); map.put("result1", arrVOList.get(i).getResult()); map.put("num2", arrVOList.get(arrVOList.size() / 3 + i + 1).getNum()); - map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getValue()); + map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getLog2()); map.put("result2", arrVOList.get(arrVOList.size() / 3 + i + 1).getResult()); if (i < arrVOList.size() / 3) { map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getNum()); - map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getValue()); + map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getLog2()); map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getResult()); } resultList1.add(map);