wangfeng пре 4 година
родитељ
комит
c6439eae33

+ 1 - 1
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());

+ 2 - 2
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