diff --git a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java index 47fcb66..765cd4d 100644 --- a/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java +++ b/src/main/java/com/example/caseData/service/CaseClinicalVideoService.java @@ -761,9 +761,11 @@ public class CaseClinicalVideoService { boolean exists = true; for (CaseClinicalVideoAuthorModel b : caseClinicalVideoAuthors){ // 检测医生唯一标识 - if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ - exists = false; - break; // 已存在,跳出内层循环 + if (!Objects.equals(b.getCaseClinicalDoctor().getDoctorIden(), "") && b.getCaseClinicalDoctor().getDoctorIden() != null){ + if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ + exists = false; + break; // 已存在,跳出内层循环 + } } // 检测医生姓名+医院唯一标识 @@ -785,9 +787,11 @@ public class CaseClinicalVideoService { // 默认本条为删除 boolean exists = true; for (addClinicalVideoApp.Author a : r.getAuthor()){ - if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ - exists = false; - break; // 已存在,跳出内层循环 + if (!Objects.equals(b.getCaseClinicalDoctor().getDoctorIden(), "") && b.getCaseClinicalDoctor().getDoctorIden() != null){ + if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ + exists = false; + break; // 已存在,跳出内层循环 + } } // 检测医生姓名+医院唯一标识 @@ -809,9 +813,11 @@ public class CaseClinicalVideoService { // 默认本条不添加 boolean exists = false; for (addClinicalVideoApp.Author a : r.getAuthor()){ - if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ - exists = true; - break; // 已存在,跳出内层循环 + if (!Objects.equals(b.getCaseClinicalDoctor().getDoctorIden(), "") && b.getCaseClinicalDoctor().getDoctorIden() != null){ + if (Objects.equals(a.getDoctorIden(), b.getCaseClinicalDoctor().getDoctorIden())){ + exists = true; + break; // 已存在,跳出内层循环 + } } // 检测医生姓名+医院唯一标识