注释修改

src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -62,8 +62,14 @@ public class DeptConfigFacade {
                 .eq("his_name", deptConfig.getHisName())
                 .eq("unique_name", deptConfig.getUniqueName());
         DeptConfig oldRecord = deptConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (deptConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (deptConfig.getId() != null
+                && oldRecord != null
+                && !deptConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -87,8 +93,14 @@ public class DeptConfigFacade {
                 .eq("his_name", deptConfig.getHisName())
                 .eq("unique_name", deptConfig.getUniqueName());
         DeptConfig oldRecord = deptConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            deptConfig.setId(oldRecord.getId());
+        if (deptConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (deptConfig.getId() != null
+                && oldRecord != null
+                && !deptConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (deptConfig.getId() == null) {

src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -62,8 +62,14 @@ public class DiseaseConfigFacade {
                 .eq("his_name", diseaseConfig.getHisName())
                 .eq("unique_name", diseaseConfig.getUniqueName());
         DiseaseConfig oldRecord = diseaseConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (diseaseConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法添加");
+        }
+        if (diseaseConfig.getId() != null
+                && oldRecord != null
+                && !diseaseConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -87,8 +93,14 @@ public class DiseaseConfigFacade {
                 .eq("his_name", diseaseConfig.getHisName())
                 .eq("unique_name", diseaseConfig.getUniqueName());
         DiseaseConfig oldRecord = diseaseConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            diseaseConfig.setId(oldRecord.getId());
+        if (diseaseConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法添加");
+        }
+        if (diseaseConfig.getId() != null
+                && oldRecord != null
+                && !diseaseConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (diseaseConfig.getId() == null) {

src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -69,8 +69,14 @@ public class DrugConfigFacade {
             queryWrapper.eq("form", drugConfig.getForm());
         }
         DrugConfig oldRecord = drugConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (drugConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (drugConfig.getId() != null
+                && oldRecord != null
+                && !drugConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -101,8 +107,14 @@ public class DrugConfigFacade {
             queryWrapper.eq("form", drugConfig.getForm());
         }
         DrugConfig oldRecord = drugConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            drugConfig.setId(oldRecord.getId());
+        if (drugConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (drugConfig.getId() != null
+                && oldRecord != null
+                && !drugConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (drugConfig.getId() == null) {

src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -70,8 +70,14 @@ public class LisConfigFacade{
                     .eq("his_detail_name", lisConfig.getHisDetailName());
         }
         LisConfig oldRecord = lisConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (lisConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (lisConfig.getId() != null
+                && oldRecord != null
+                && !lisConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -103,8 +109,14 @@ public class LisConfigFacade{
                     .eq("his_detail_name", lisConfig.getHisDetailName());
         }
         LisConfig oldRecord = lisConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            lisConfig.setId(oldRecord.getId());
+        if (lisConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (lisConfig.getId() != null
+                && oldRecord != null
+                && !lisConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (lisConfig.getId() == null) {

src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -62,8 +62,14 @@ public class OperationConfigFacade {
                 .eq("his_name", operationConfig.getHisName())
                 .eq("unique_name", operationConfig.getUniqueName());
         OperationConfig oldRecord = operationConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (operationConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (operationConfig.getId() != null
+                && oldRecord != null
+                && !operationConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -87,8 +93,14 @@ public class OperationConfigFacade {
                 .eq("his_name", operationConfig.getHisName())
                 .eq("unique_name", operationConfig.getUniqueName());
         OperationConfig oldRecord = operationConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            operationConfig.setId(oldRecord.getId());
+        if (operationConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (operationConfig.getId() != null
+                && oldRecord != null
+                && !operationConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (operationConfig.getId() == null) {

src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -62,8 +62,14 @@ public class PacsConfigFacade {
                 .eq("his_name", pacsConfig.getHisName())
                 .eq("unique_name", pacsConfig.getUniqueName());
         PacsConfig oldRecord = pacsConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (pacsConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (pacsConfig.getId() != null
+                && oldRecord != null
+                && !pacsConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -87,8 +93,14 @@ public class PacsConfigFacade {
                 .eq("his_name", pacsConfig.getHisName())
                 .eq("unique_name", pacsConfig.getUniqueName());
         PacsConfig oldRecord = pacsConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            pacsConfig.setId(oldRecord.getId());
+        if (pacsConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (pacsConfig.getId() != null
+                && oldRecord != null
+                && !pacsConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (pacsConfig.getId() == null) {

src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -62,8 +62,14 @@ public class TransfusionConfigFacade {
                 .eq("his_name", transfusionConfig.getHisName())
                 .eq("unique_name", transfusionConfig.getUniqueName());
         TransfusionConfig oldRecord = transfusionConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            return true;
+        if (transfusionConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (transfusionConfig.getId() != null
+                && oldRecord != null
+                && !transfusionConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         return false;
     }
@@ -87,8 +93,14 @@ public class TransfusionConfigFacade {
                 .eq("his_name", transfusionConfig.getHisName())
                 .eq("unique_name", transfusionConfig.getUniqueName());
         TransfusionConfig oldRecord = transfusionConfigService.getOne(queryWrapper, false);
-        if (oldRecord != null) {
-            transfusionConfig.setId(oldRecord.getId());
+        if (transfusionConfig.getId() == null
+                && oldRecord != null) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
+        }
+        if (transfusionConfig.getId() != null
+                && oldRecord != null
+                && !transfusionConfig.getId().equals(oldRecord.getId())) {
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该条关联已存在，无法保存");
         }
         //新增数据
         if (transfusionConfig.getId() == null) {