fix 修改新增接口

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -200,33 +200,35 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         //提取出用户接种疫苗信息列表
         List<VaccineInfoUser> vaccineInfoUserList = vaccineInfoOperation.getVaccineInfoUserList();
         //最后一次接种时间
-        Date vaccinationTime = new Date();
-        String VaccineName = "";
+        Date vaccinationTime = null;
+        String vaccineName = "";
         String jiCi = "";
         if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
             for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                if (vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                    vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                }
-                //剂次可能是 "加强针"
-                String jici = vaccineInfoUser.getJici();
-                if (isNumeric(jici) && isNumeric(jiCi)) {
-                    if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                    if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                        vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                    }
+                    //剂次可能是 "加强针"
+                    String jici = vaccineInfoUser.getJici();
+                    if (isNumeric(jici) && isNumeric(jiCi)) {
+                        if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                            jiCi = vaccineInfoUser.getJici();
+                        }
+                    } else if (!isNumeric(jici)) {
                         jiCi = vaccineInfoUser.getJici();
                     }
-                } else if (!isNumeric(jici)) {
-                    jiCi = vaccineInfoUser.getJici();
+                    vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
+                    vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                    vaccineName = vaccineInfoUser.getVaccineName();
+                    vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                 }
-                vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
-                vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                VaccineName = vaccineInfoUser.getVaccineName();
-                vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
             }
         }
         //是否完成
-        String isSuccess = getIsSuccess(VaccineName, jiCi);
+        String isSuccess = getIsSuccess(vaccineName, jiCi);
         vaccineInfoOperation.setVaccinationTime(vaccinationTime);
-        vaccineInfoOperation.setVaccineName(VaccineName);
+        vaccineInfoOperation.setVaccineName(vaccineName);
         vaccineInfoOperation.setJici(jiCi);
         vaccineInfoOperation.setProgress(isSuccess);
         //只针对第一针
@@ -242,7 +244,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         vaccineInfoOperationNew.setVaccineInfoId(vaccineInfoOperation.getId());
         vaccineInfoOperationNew.setCreateBy(SecurityUtils.getUsername());
         vaccineInfoOperationNew.setVaccinationTime(vaccinationTime);
-        vaccineInfoOperationNew.setVaccineName(VaccineName);
+        vaccineInfoOperationNew.setVaccineName(vaccineName);
         vaccineInfoOperationMapper.insertVaccineInfoOperation(vaccineInfoOperationNew);
         return info;
     }
@@ -250,11 +252,12 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
 
     /**
      * 判断是否完成
+     *
      * @param vaccineName
      * @param jici
      * @return
      */
-    private String getIsSuccess(String vaccineName,String jici) {
+    private String getIsSuccess(String vaccineName, String jici) {
         if ("北京科兴中维".equals(vaccineName)) {
             if ("2".equals(jici)) {
                 return "是";
@@ -324,25 +327,25 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         //其他:死亡,失踪失联
         String other = vaccineInfoOperation.getOther();
         //判断应种未种
-        if (vaccineInfoUserList == null || vaccineInfoUserList.size() == 0){
+        if (vaccineInfoUserList == null || vaccineInfoUserList.size() == 0) {
             //只判断第一针,就是一针没打
             //判断是否填写了禁忌症
-            if (StringUtils.isNotBlank(contraindication) || StringUtils.isNotBlank(suspend) || StringUtils.isNotBlank(other)){
+            if (StringUtils.isNotBlank(contraindication) || StringUtils.isNotBlank(suspend) || StringUtils.isNotBlank(other)) {
                 vaccineInfoOperation.setShouldBe("否");
                 //有禁忌症,暂缓接种,其他:死亡,失踪失联就是否
                 vaccineInfoOperation.setShouldSlow("否");
             }
-        }else {
+        } else {
             //判断应续未续,只要是未完成说明可能是一针没打,可能是没打完,有禁忌症,暂缓接种,其他:死亡,失踪失联就是否
             //如果他打过针
-            if (StringUtils.isNotBlank(contraindication) || StringUtils.isNotBlank(suspend) || StringUtils.isNotBlank(other)){
+            if (StringUtils.isNotBlank(contraindication) || StringUtils.isNotBlank(suspend) || StringUtils.isNotBlank(other)) {
                 //有禁忌症,暂缓接种,其他:死亡,失踪失联就是否
                 vaccineInfoOperation.setShouldSlow("否");
-            }else {
+            } else {
                 //没有异常情况,判断是否完成
                 String progress = vaccineInfoOperation.getProgress();
                 vaccineInfoOperation.setShouldSlow("否");
-                if("否".equals(progress)){
+                if ("否".equals(progress)) {
                     vaccineInfoOperation.setShouldSlow("是");
                 }
             }
@@ -403,21 +406,23 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                     vaccineName = vaccineInfoUser.getVaccineName();
                     vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
                 } else {
-                    //判断接种时间是否是新
-                    if (vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                        vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                        //判断接种时间是否是新
+                        if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                        }
+                        //剂次可能是 "加强针"
+                        String jici = vaccineInfoUser.getJici();
+                        if (isNumeric(jici) && isNumeric(jiCi) && Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                            jiCi = vaccineInfoUser.getJici();
+                        } else if (!isNumeric(jici)) {
+                            jiCi = vaccineInfoUser.getJici();
+                        }
+                        vaccineName = vaccineInfoUser.getVaccineName();
+                        vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                        vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                        vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                     }
-                    //剂次可能是 "加强针"
-                    String jici = vaccineInfoUser.getJici();
-                    if (isNumeric(jici) && isNumeric(jiCi) && Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
-                        jiCi = vaccineInfoUser.getJici();
-                    } else if (!isNumeric(jici)) {
-                        jiCi = vaccineInfoUser.getJici();
-                    }
-                    vaccineName = vaccineInfoUser.getVaccineName();
-                    vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
-                    vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                    vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                 }
             }
         }