Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

knowledgeman-service/src/main/java/com/diagbot/vo/RelationNodeVO.java

@@ -40,7 +40,7 @@ public class RelationNodeVO {
 	 * 主要第一级时用，判断是否需要排序
 	 * 是否排序，1-排序，0-不排序
 	 */
-	private Integer isOrderBy = 0;
+	private Integer isOrderBy = 1;
 	
 	/**
 	 * 下一级概念

tran-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -47,12 +47,12 @@
 		modifier AS doctorIdSecond,
 		content_value AS diagnoseSecond
 		FROM tran_inquiry_detail
-		WHERE type=9) b
+		WHERE is_deleted='N' AND type=9) b
 		ON a.id=b.inquiryId
 		LEFT JOIN tran_hospital_dept c ON a.hospital_dept_id=c.id
 		LEFT JOIN tran_doctor_info e ON a.doctor_id=e.id
 		LEFT JOIN tran_doctor_info f ON b.doctorIdSecond=f.id
-		WHERE 1=1
+		WHERE 1=1 AND a.is_deleted='N'
 		AND a.hospital_id=#{hospitalId}
 		AND a.hospital_dept_id=#{hospitalDeptId}
 		<if test="sysType!=null">