Merge branch 'dev/neo2mysql20210120' into test

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -85,6 +87,7 @@ public class DrugConfig implements Serializable {
      * 剂型
      */
     @Excel(name = "药品剂型", width = 60, orderNum = "3", isImportField = "true")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String form;
 
     public Long getId() {

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -72,6 +74,7 @@ public class LisConfig implements Serializable {
      * 检验细项
      */
     @Excel(name = "检验细项", width = 40, orderNum = "2", isImportField = "true")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String hisDetailName;
 
     /**

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

@@ -175,7 +175,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 Long conceptId = klConceptPare.getId();
                 KlLibraryInfo klLibraryInfoSub = new KlLibraryInfo();
                 klLibraryInfoSub.setConceptId(conceptId);
-                klLibraryInfoSub.setName(klConceptSaveVO.getSynonymName());
+                klLibraryInfoSub.setName(klConceptSaveVO.getLibName());
                 klLibraryInfoSub.setSpell(klConceptSaveVO.getSpell());
                 klLibraryInfoSub.setTypeId(klConceptSaveVO.getLibType());
                 klLibraryInfoSub.setIsConcept(klConceptSaveVO.getIsConcept());

cdssman-service/src/main/resources/mapper/KlConceptMapper.xml

@@ -43,7 +43,7 @@
         <if test="libType!=null and libType!=''">
             AND UPPER(b.lib_type) LIKE CONCAT('%', UPPER(trim(#{libType})), '%')
         </if>
-        <if test="libType!=null and libType!=''">
+        <if test="libName!=null and libName!=''">
             AND UPPER(b.lib_name) LIKE CONCAT('%', UPPER(trim(#{libName})), '%')
         </if>
         <if test="status != null">
@@ -53,7 +53,7 @@
             AND UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{synonymName})), '%')
         </if>
         GROUP BY a.concept_id
-        ORDER BY b.gmt_modified DESC
+        ORDER BY b.gmt_modified DESC , b.status DESC
     </select>
     <select id="getConceptAll" resultType="com.diagbot.dto.KlConceptAllDTO">
         SELECT