From 1b0fd0a5582abdc29c2e7ec24f752aa0d548cd10 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Thu, 12 May 2016 09:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=A5=E7=A7=8D=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/yimiao/web/controller/v1/KidsController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index 291e9c3..b6fee68 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -350,8 +350,8 @@ public class KidsController extends BaseController { //接种ID if (CollectionUtils.isNotEmpty(recordsList)){ for (KidInoculationRecords temp : recordsList){ - if (temp.getJiCi()==current && temp.getVaccineNameTitle() == data.getVnName() - && temp.getCnt() == sum && temp.getVaccineType().equals("1")){ + if (temp.getJiCi()==current && temp.getVaccineNameTitle().equals(data.getVnName()) + && temp.getVaccineType().equals("1")){ freeMap.put("inoculateId", temp.getRecordId()); break; }else { @@ -379,7 +379,7 @@ public class KidsController extends BaseController { //接种ID if (CollectionUtils.isNotEmpty(recordsList)){ for (KidInoculationRecords temp : recordsList){ - if (temp.getJiCi()==current && temp.getVaccineNameTitle()==data.getVnName() + if (temp.getJiCi()==current && temp.getVaccineNameTitle().equals(data.getVnName()) && temp.getCnt() == sum&& temp.getVaccineType().equals("2")){ chargeMap.put("inoculateId", temp.getRecordId()); break; -- 1.8.3.1