术语映射维护

cdssman-service/src/main/java/com/diagbot/entity/DeptConfig.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -55,12 +57,14 @@ public class DeptConfig implements Serializable {
     /**
      * 医院id
      */
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
 
     /**
      * 医院项目名称
      */
     @Excel(name="HIS名称", width = 40)
+    @NotBlank(message = "请输入医院端项目名称")
     private String hisName;
 
     /**
@@ -73,6 +77,7 @@ public class DeptConfig implements Serializable {
      * 标准名称
      */
     @Excel(name = "标准名称", width = 40)
+    @NotBlank(message = "请输入标准术语名称")
     private String uniqueName;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/DiseaseConfig.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -63,12 +64,14 @@ public class DiseaseConfig implements Serializable {
      * his名称
      */
     @Excel(name="HIS名称", width = 40)
+    @NotBlank(message = "请输入医院端项目名称")
     private String hisName;
 
     /**
      * 标准名
      */
     @Excel(name = "标准名称", width = 40)
+    @NotBlank(message = "请输入标准术语名称")
     private String uniqueName;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/DrugConfig.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -63,12 +64,14 @@ public class DrugConfig implements Serializable {
      * his名称
      */
     @Excel(name="HIS名称", width = 40)
+    @NotBlank(message = "请输入医院端项目名称")
     private String hisName;
 
     /**
      * 标准名
      */
     @Excel(name = "标准名称", width = 40)
+    @NotBlank(message = "请输入标准术语名称")
     private String uniqueName;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/OperationConfig.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -63,12 +64,14 @@ public class OperationConfig implements Serializable {
      * his名称
      */
     @Excel(name="HIS名称", width = 40)
+    @NotBlank(message = "请输入医院端项目名称")
     private String hisName;
 
     /**
      * 标准名
      */
     @Excel(name = "标准名称", width = 40)
+    @NotBlank(message = "请输入标准术语名称")
     private String uniqueName;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/PacsConfig.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -63,12 +64,14 @@ public class PacsConfig implements Serializable {
      * his名称
      */
     @Excel(name="HIS名称", width = 40)
+    @NotBlank(message = "请输入医院端项目名称")
     private String hisName;
 
     /**
      * 标准名
      */
     @Excel(name = "标准名称", width = 40)
+    @NotBlank(message = "请输入标准术语名称")
     private String uniqueName;
 
     /**

cdssman-service/src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -56,6 +57,7 @@ public class TransfusionConfig implements Serializable {
     /**
      * 医院id
      */
+    @NotNull(message = "请输入医院id")
     private Long hospitalId;
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -49,22 +49,13 @@ public class DeptConfigFacade {
      */
     public Boolean isExistRecord(DeptConfig deptConfig) {
         QueryWrapper<DeptConfig> queryWrapper = new QueryWrapper<>();
-        DeptConfig oldRecord = new DeptConfig();
-        if (deptConfig.getId() != null) {
-            oldRecord = deptConfigService.getById(deptConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        if (StringUtil.isNotBlank(deptConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", deptConfig.getHospitalId())
-                    .eq("his_name", deptConfig.getHisName())
-                    .eq("unique_name", deptConfig.getUniqueName());
-            oldRecord = deptConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", deptConfig.getHospitalId())
+                .eq("his_name", deptConfig.getHisName())
+                .eq("unique_name", deptConfig.getUniqueName());
+        DeptConfig oldRecord = deptConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -48,23 +48,13 @@ public class DiseaseConfigFacade {
      */
     public Boolean isExistRecord(DiseaseConfig diseaseConfig) {
         QueryWrapper<DiseaseConfig> queryWrapper = new QueryWrapper<>();
-        DiseaseConfig oldRecord = new DiseaseConfig();
-        if (diseaseConfig.getId() != null) {
-            oldRecord = diseaseConfigService.getById(diseaseConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        //hisName:uniqueName 1:n
-        if (StringUtil.isNotBlank(diseaseConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", diseaseConfig.getHospitalId())
-                    .eq("his_name", diseaseConfig.getHisName())
-                    .eq("unique_name", diseaseConfig.getUniqueName());
-            oldRecord = diseaseConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", diseaseConfig.getHospitalId())
+                .eq("his_name", diseaseConfig.getHisName())
+                .eq("unique_name", diseaseConfig.getUniqueName());
+        DiseaseConfig oldRecord = diseaseConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -49,22 +49,13 @@ public class DrugConfigFacade {
      */
     public Boolean isExistRecord(DrugConfig drugConfig) {
         QueryWrapper<DrugConfig> queryWrapper = new QueryWrapper<>();
-        DrugConfig oldRecord = new DrugConfig();
-        if (drugConfig.getId() != null) {
-            oldRecord = drugConfigService.getById(drugConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        if (StringUtil.isNotBlank(drugConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", drugConfig.getHospitalId())
-                    .eq("his_name", drugConfig.getHisName())
-                    .eq("unique_name", drugConfig.getUniqueName());
-            oldRecord = drugConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", drugConfig.getHospitalId())
+                .eq("his_name", drugConfig.getHisName())
+                .eq("unique_name", drugConfig.getUniqueName());
+        DrugConfig oldRecord = drugConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -49,30 +49,21 @@ public class LisConfigFacade{
      */
     public Boolean isExistRecord(LisConfig lisConfig) {
         QueryWrapper<LisConfig> queryWrapper = new QueryWrapper<>();
-        LisConfig oldRecord = new LisConfig();
-        if (lisConfig.getId() != null) {
-            oldRecord = lisConfigService.getById(lisConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        } else if (StringUtil.isNotBlank(lisConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", lisConfig.getHospitalId())
-                    .eq("his_name", lisConfig.getHisName())
-                    .eq("unique_name", lisConfig.getUniqueName());
-            if (StringUtil.isBlank(lisConfig.getHisDetailName())) {
-                queryWrapper
-                        .isNull("his_detail_name")
-                        .or()
-                        .eq("his_detail_name", "");
-            } else {
-                queryWrapper
-                        .eq("his_detail_name", lisConfig.getHisDetailName());
-            }
-            oldRecord = lisConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", lisConfig.getHospitalId())
+                .eq("his_name", lisConfig.getHisName())
+                .eq("unique_name", lisConfig.getUniqueName());
+        if (StringUtil.isBlank(lisConfig.getHisDetailName())) {
+            queryWrapper.and(i -> i.isNull("his_detail_name")
+                    .or()
+                    .eq("his_detail_name", ""));
+        } else {
+            queryWrapper
+                    .eq("his_detail_name", lisConfig.getHisDetailName());
+        }
+        LisConfig oldRecord = lisConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -49,22 +49,13 @@ public class OperationConfigFacade {
      */
     public Boolean isExistRecord(OperationConfig operationConfig) {
         QueryWrapper<OperationConfig> queryWrapper = new QueryWrapper<>();
-        OperationConfig oldRecord = new OperationConfig();
-        if (operationConfig.getId() != null) {
-            oldRecord = operationConfigService.getById(operationConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        if (StringUtil.isNotBlank(operationConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id",operationConfig.getHospitalId())
-                    .eq("his_name", operationConfig.getHisName())
-                    .eq("unique_name", operationConfig.getUniqueName());
-            oldRecord = operationConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", operationConfig.getHospitalId())
+                .eq("his_name", operationConfig.getHisName())
+                .eq("unique_name", operationConfig.getUniqueName());
+        OperationConfig oldRecord = operationConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -49,22 +49,13 @@ public class PacsConfigFacade {
      */
     public Boolean isExistRecord(PacsConfig pacsConfig) {
         QueryWrapper<PacsConfig> queryWrapper = new QueryWrapper<>();
-        PacsConfig oldRecord = new PacsConfig();
-        if (pacsConfig.getId() != null) {
-            oldRecord = pacsConfigService.getById(pacsConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        if (StringUtil.isNotBlank(pacsConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", pacsConfig.getHospitalId())
-                    .eq("his_name", pacsConfig.getHisName())
-                    .eq("unique_name", pacsConfig.getUniqueName());
-            oldRecord = pacsConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", pacsConfig.getHospitalId())
+                .eq("his_name", pacsConfig.getHisName())
+                .eq("unique_name", pacsConfig.getUniqueName());
+        PacsConfig oldRecord = pacsConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }

cdssman-service/src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -49,22 +49,13 @@ public class TransfusionConfigFacade {
      */
     public Boolean isExistRecord(TransfusionConfig transfusionConfig) {
         QueryWrapper<TransfusionConfig> queryWrapper = new QueryWrapper<>();
-        TransfusionConfig oldRecord = new TransfusionConfig();
-        if (transfusionConfig.getId() != null) {
-            oldRecord = transfusionConfigService.getById(transfusionConfig.getId());
-            if (oldRecord != null && oldRecord.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
-                return true;
-            }
-        }
-        if (StringUtil.isNotBlank(transfusionConfig.getHisName())) {
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", transfusionConfig.getHospitalId())
-                    .eq("his_name", transfusionConfig.getHisName())
-                    .eq("unique_name", transfusionConfig.getUniqueName());
-            oldRecord = transfusionConfigService.getOne(queryWrapper);
-            if (oldRecord != null) {
-                return true;
-            }
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", transfusionConfig.getHospitalId())
+                .eq("his_name", transfusionConfig.getHisName())
+                .eq("unique_name", transfusionConfig.getUniqueName());
+        TransfusionConfig oldRecord = transfusionConfigService.getOne(queryWrapper, false);
+        if (oldRecord != null) {
+            return true;
         }
         return false;
     }