fix 修改疫苗新增接口/修改接口,增加逻辑判断

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -250,7 +250,7 @@ public class SysUserController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
-        userService.checkUserAllowed(user);
+        //userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -154,8 +154,12 @@ public class VaccineInfoController extends BaseController {
     }
 
     private String validate(VaccineInfoOperation vaccineInfo) {
-        List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
+        String isVaccination = vaccineInfo.getIsVaccination();
         String msg = "";
+        if ("否".equals(isVaccination)){
+            return msg;
+        }
+        List<VaccineInfoUser> vaccineInfoUserList = vaccineInfo.getVaccineInfoUserList();
         for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
             String vaccineName = vaccineInfoUser.getVaccineName();
             Date vaccinationTime =  vaccineInfoUser.getVaccinationTime();

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

@@ -130,7 +130,15 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
                 //户籍地
                 String domicile = infoOperation.getDomicile();
                 StringBuilder sbDomicile = new StringBuilder();
-                sbDomicile.append(province).append(city).append(region);
+                if (StringUtils.isNotBlank(province)){
+                    sbDomicile.append(province);
+                }
+                if (StringUtils.isNotBlank(city)){
+                    sbDomicile.append(city);
+                }
+                if (StringUtils.isNotBlank(region)){
+                    sbDomicile.append(region);
+                }
                 if (StringUtils.isNotBlank(domicile)) {
                     sbDomicile.append(domicile);
                 }
@@ -207,34 +215,37 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
             Date vaccinationTime = null;
             String vaccineName = "";
             String jiCi = "";
-            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        if (vaccinationTime == null) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+            String isVaccination = vaccineInfoOperation.getIsVaccination();
+            if (!"否".equals(isVaccination)) {
+                if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                    for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
+                            }
+                            if (StringUtils.isBlank(vaccineName)) {
                                 vaccineName = vaccineInfoUser.getVaccineName();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
+                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUser.setIdCard(vaccineInfoOperation.getIdCard());
-                        vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                        vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                     }
                 }
             }
@@ -276,39 +287,42 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
             }
             //提取出用户接种疫苗信息列表
             List<VaccineInfoUser> vaccineInfoUserList = vaccineInfoOperation.getVaccineInfoUserList();
-            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                    //新增的疫苗信息
-                    String vaccineName = vaccineInfoUser.getVaccineName();
-                    String jici = vaccineInfoUser.getJici();
-                    Object vaccineInfoUserMap = map.get(vaccineName + jici);
-                    if (ObjectUtils.isEmpty(vaccineInfoUserMap)) {
-                        //说明没有,则新增
-                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                            if (vaccinationTime == null) {
-                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                            }
-                            if (StringUtils.isBlank(jiCiOld)) {
-                                jiCiOld = vaccineInfoUser.getJici();
-                            }
-                            if (StringUtils.isBlank(vaccineNameOld)) {
-                                vaccineNameOld = vaccineInfoUser.getVaccineName();
-                            }
-                            //剂次可能是 "加强针"
-                            if (isNumeric(jici) && isNumeric(jiCiOld)) {
-                                if (Integer.parseInt(jici) > Integer.parseInt(jiCiOld)) {
+            String isVaccination = vaccineInfoOperation.getIsVaccination();
+            if (!"否".equals(isVaccination)) {
+                if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                    for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                        //新增的疫苗信息
+                        String vaccineName = vaccineInfoUser.getVaccineName();
+                        String jici = vaccineInfoUser.getJici();
+                        Object vaccineInfoUserMap = map.get(vaccineName + jici);
+                        if (ObjectUtils.isEmpty(vaccineInfoUserMap)) {
+                            //说明没有,则新增
+                            if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                                if (vaccinationTime == null) {
+                                    vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                                } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                    vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                                }
+                                if (StringUtils.isBlank(jiCiOld)) {
                                     jiCiOld = vaccineInfoUser.getJici();
+                                }
+                                if (StringUtils.isBlank(vaccineNameOld)) {
                                     vaccineNameOld = vaccineInfoUser.getVaccineName();
                                 }
-                            } else if (!isNumeric(jici)) {
-                                jiCiOld = vaccineInfoUser.getJici();
-                                vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                //剂次可能是 "加强针"
+                                if (isNumeric(jici) && isNumeric(jiCiOld)) {
+                                    if (Integer.parseInt(jici) > Integer.parseInt(jiCiOld)) {
+                                        jiCiOld = vaccineInfoUser.getJici();
+                                        vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                    }
+                                } else if (!isNumeric(jici)) {
+                                    jiCiOld = vaccineInfoUser.getJici();
+                                    vaccineNameOld = vaccineInfoUser.getVaccineName();
+                                }
+                                vaccineInfoUser.setIdCard(vaccineInfoOperationOld.getIdCard());
+                                vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                                vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                             }
-                            vaccineInfoUser.setIdCard(vaccineInfoOperationOld.getIdCard());
-                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
                     }
                 }
@@ -400,6 +414,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         //默认是
         vaccineInfoOperation.setShouldBe("是");
 
+        //禁忌症
         String contraindication = vaccineInfoOperation.getContraindication();
         //暂缓接种
         String suspend = vaccineInfoOperation.getSuspend();
@@ -480,68 +495,71 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         String vaccineName = "";
         //剂次
         String jiCi = vaccineInfo.getJici();
-        if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
-            for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
-                if (vaccineInfoUser.getId() != null) {
-                    vaccineInfoUser.setUpdateBy(SecurityUtils.getUsername());
-
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        if (vaccinationTime == null) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+        String isVaccination = vaccineInfo.getIsVaccination();
+        if (!"否".equals(isVaccination)) {
+            if (vaccineInfoUserList != null && vaccineInfoUserList.size() > 0) {
+                for (VaccineInfoUser vaccineInfoUser : vaccineInfoUserList) {
+                    if (vaccineInfoUser.getId() != null) {
+                        vaccineInfoUser.setUpdateBy(SecurityUtils.getUsername());
+
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
+                            }
+                            if (StringUtils.isBlank(vaccineName)) {
                                 vaccineName = vaccineInfoUser.getVaccineName();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (neetUpdate) {
-                            vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            if (neetUpdate) {
+                                vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            }
+                            vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUserMapper.updateVaccineInfoUser(vaccineInfoUser);
-                    }
 
-                } else {
-                    if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
-                        //判断接种时间是否是新
-                        if (vaccinationTime == null) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
-                            vaccinationTime = vaccineInfoUser.getVaccinationTime();
-                        }
-                        //剂次可能是 "加强针"
-                        String jici = vaccineInfoUser.getJici();
-                        if (StringUtils.isBlank(jiCi)) {
-                            jiCi = vaccineInfoUser.getJici();
-                        }
-                        if (StringUtils.isBlank(vaccineName)) {
-                            vaccineName = vaccineInfoUser.getVaccineName();
-                        }
-                        if (isNumeric(jici) && isNumeric(jiCi)) {
-                            if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                    } else {
+                        if (StringUtils.isNotBlank(vaccineInfoUser.getVaccineName()) || vaccineInfoUser.getVaccinationTime() != null || StringUtils.isNotBlank(vaccineInfoUser.getVaccinationPlace()) || StringUtils.isNotBlank(vaccineInfoUser.getJici()) || StringUtils.isNotBlank(vaccineInfoUser.getProgress())) {
+                            //判断接种时间是否是新
+                            if (vaccinationTime == null) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            } else if (vaccineInfoUser.getVaccinationTime() != null && vaccineInfoUser.getVaccinationTime().compareTo(vaccinationTime) > 0) {
+                                vaccinationTime = vaccineInfoUser.getVaccinationTime();
+                            }
+                            //剂次可能是 "加强针"
+                            String jici = vaccineInfoUser.getJici();
+                            if (StringUtils.isBlank(jiCi)) {
                                 jiCi = vaccineInfoUser.getJici();
+                            }
+                            if (StringUtils.isBlank(vaccineName)) {
                                 vaccineName = vaccineInfoUser.getVaccineName();
                             }
-                        } else if (!isNumeric(jici)) {
-                            jiCi = vaccineInfoUser.getJici();
-                            vaccineName = vaccineInfoUser.getVaccineName();
+                            if (isNumeric(jici) && isNumeric(jiCi)) {
+                                if (Integer.parseInt(jici) > Integer.parseInt(jiCi)) {
+                                    jiCi = vaccineInfoUser.getJici();
+                                    vaccineName = vaccineInfoUser.getVaccineName();
+                                }
+                            } else if (!isNumeric(jici)) {
+                                jiCi = vaccineInfoUser.getJici();
+                                vaccineName = vaccineInfoUser.getVaccineName();
+                            }
+                            vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
+                            vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
+                            vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                         }
-                        vaccineInfoUser.setIdCard(vaccineInfo.getIdCard());
-                        vaccineInfoUser.setCreateBy(SecurityUtils.getUsername());
-                        vaccineInfoUserMapper.insertVaccineInfoUser(vaccineInfoUser);
                     }
                 }
             }
@@ -562,7 +580,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         vaccineInfoOperationNew.setCreateBy(SecurityUtils.getUsername());
         vaccineInfoOperationNew.setVaccineInfoId(vaccineInfo.getId());
         vaccineInfoOperationMapper.insertVaccineInfoOperation(vaccineInfoOperationNew);
-        return info > 0? AjaxResult.success():AjaxResult.error();
+        return info > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**