诊断依据分页查询bug修改

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

@@ -15,6 +15,7 @@ import com.diagbot.service.impl.KlRelationOrderServiceImpl;
 import com.diagbot.service.impl.KlRelationServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.*;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -97,7 +98,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
             relationGroupList.forEach(i -> {
                 i.forEach(j -> {
                     j.setGmtCreate(now);
-//                    j.setModifier(UserUtils.getCurrentPrincipleID());
+                    j.setModifier(UserUtils.getCurrentPrincipleID());
                     j.setGmtModified(now);
                     relationLists.add(j);
                 });
@@ -115,7 +116,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     relationOrder.setGmtCreate(now);
                     relationOrder.setGmtModified(now);
 //                    relationOrder.setCreator(currentUser);
-//                    relationOrder.setModifier(UserUtils.getCurrentPrincipleID());
+                    relationOrder.setModifier(UserUtils.getCurrentPrincipleID());
                     relationOrderList.add(relationOrder);
                 }
             });
@@ -165,7 +166,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
             relationGroupList.forEach(i -> {
                 i.forEach(j -> {
                     j.setGmtCreate(now);
-//                    j.setModifier(UserUtils.getCurrentPrincipleID());
+                    j.setModifier(UserUtils.getCurrentPrincipleID());
                     j.setGmtModified(now);
                     relationLists.add(j);
                 });
@@ -182,7 +183,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
                     relationOrder.settRelationId(j.getId());
                     relationOrder.setGmtCreate(now);
                     relationOrder.setGmtModified(now);
-//                    relationOrder.setModifier(UserUtils.getCurrentPrincipleID());
+                    relationOrder.setModifier(UserUtils.getCurrentPrincipleID());
                     relationOrderList.add(relationOrder);
                 }
             });

cdssman-service/src/main/java/com/diagbot/web/KlDiseaseController.java

@@ -74,8 +74,6 @@ public class KlDiseaseController {
     @ApiOperation(value = "诊断依据保存[by:kongwz]",
             notes = "sid: 第一层的概念id <br>" +
                     "rid: 第一层的关系id <br>" +
-                    "eid: 第二层的概念id <br>" +
-                    "srid: 第二层的关系id <br>" +
                     "eids: 第三层的概念id")
     @PostMapping("/save")
     @SysLogger("save")

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

@@ -26,6 +26,9 @@
         WHERE
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
+        <if test="disName != null and disName != ''">
+            AND UPPER(b.lib_name) LIKE concat('%',UPPER(trim(#{disName})) ,'%' )
+        </if>
         AND a.`status` = 1
         AND b.`status` = 1
         AND a.start_id = b.id
@@ -42,7 +45,7 @@
         )
         GROUP BY b.lib_name
         ORDER BY
-        b.gmt_modified DESC
+        a.gmt_modified DESC
     </select>
 
     <select id="getDiseaseAll" resultType="com.diagbot.dto.DiseasePageDTO">