1、自动化测试-单位，2、术语映射批量保存

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

@@ -31,7 +31,7 @@ public class DeptConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -26,7 +26,7 @@ public class DiseaseConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -28,7 +28,7 @@ public class DrugConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -30,7 +30,7 @@ public class LisConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -26,7 +26,7 @@ public class OperationConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -26,7 +26,7 @@ public class PacsConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -26,7 +26,7 @@ public class TransfusionConfig implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -276,11 +276,11 @@ public class MedRuleConvertFacade {
                                     : (StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? record.getRuleBaseMaxUnit() : ""));
                             valResult.setReferenceValue(record.getRuleBaseMinOperator()
                                     + record.getRuleBaseMinValue()
-                                    + "(" + record.getRuleBaseMinUnit() + ")"
+                                    + (StringUtil.isNotBlank(record.getRuleBaseMinUnit()) ? "(" + record.getRuleBaseMinUnit() + ")" : "")
                                     + ","
                                     + record.getRuleBaseMaxOperator()
                                     + record.getRuleBaseMaxValue()
-                                    + "(" + record.getRuleBaseMaxUnit() + ")");
+                                    + (StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? "(" + record.getRuleBaseMaxUnit() + ")" : ""));
                             tempList.add(valResult);
                         } else {
                             //大于最小值inputValue>minValue
@@ -302,7 +302,7 @@ public class MedRuleConvertFacade {
                             gtResult.setRuleBaseUnit(StringUtil.isNotBlank(record.getRuleBaseMinUnit()) ? record.getRuleBaseMinUnit() : "");
                             gtResult.setReferenceValue(record.getRuleBaseMinOperator()
                                     + record.getRuleBaseMinValue()
-                                    + "(" + record.getRuleBaseMinUnit() + ")");
+                                    +  (StringUtil.isNotBlank(record.getRuleBaseMinUnit()) ? "(" + record.getRuleBaseMinUnit() + ")" : ""));
                             tempList.add(gtResult);
 
                             //小于最大值inputValue<maxValue
@@ -325,7 +325,7 @@ public class MedRuleConvertFacade {
                             ltResult.setRuleBaseUnit(StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? record.getRuleBaseMaxUnit() : "");
                             ltResult.setReferenceValue(record.getRuleBaseMaxOperator()
                                     + record.getRuleBaseMaxValue()
-                                    + "(" + record.getRuleBaseMaxUnit() + ")");
+                                    + (StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? "(" + record.getRuleBaseMaxUnit() + ")" : ""));
                             tempList.add(ltResult);
                         }
                     } else if (StringUtil.isNotBlank(record.getRuleBaseMinOperator())
@@ -348,7 +348,7 @@ public class MedRuleConvertFacade {
                         gtResult.setRuleBaseUnit(StringUtil.isNotBlank(record.getRuleBaseMinUnit()) ? record.getRuleBaseMinUnit() : "");
                         gtResult.setReferenceValue(record.getRuleBaseMinOperator()
                                 + record.getRuleBaseMinValue()
-                                + "(" + record.getRuleBaseMinUnit() + ")");
+                                + (StringUtil.isNotBlank(record.getRuleBaseMinUnit()) ? "(" + record.getRuleBaseMinUnit() + ")" : ""));
                         tempList.add(gtResult);
                     } else if (StringUtil.isBlank(record.getRuleBaseMinOperator())
                             && StringUtil.isNotBlank(record.getRuleBaseMaxOperator())) {
@@ -371,7 +371,7 @@ public class MedRuleConvertFacade {
                         ltResult.setRuleBaseUnit(StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? record.getRuleBaseMaxUnit() : "");
                         ltResult.setReferenceValue(record.getRuleBaseMaxOperator()
                                 + record.getRuleBaseMaxValue()
-                                + "(" + record.getRuleBaseMaxUnit() + ")");
+                                + (StringUtil.isNotBlank(record.getRuleBaseMaxUnit()) ? "(" + record.getRuleBaseMaxUnit() + ")" : ""));
                         tempList.add(ltResult);
                     } else if (StringUtil.isNotBlank(record.getRuleBaseEqOperator())) {
                         result.setReferenceValue(record.getRuleBaseEqOperator()