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;