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

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -157,17 +157,18 @@
 
     <!-- 批量查询实验室预警 -->
     <select id="queryRiskExeRecordList" parameterType="com.zd.laboratory.domain.LabRiskPlanAbnormalGroup" resultType="com.zd.laboratory.domain.LabRiskPlanAbnormalGroup">
-        SELECT id, group_name, subject_id, subject_name, risk_attribute, status, create_time, create_by, update_time
-        FROM lab_risk_plan_abnormal_group
+        SELECT g.id, g.group_name, g.subject_id, CONCAT(s.name,s.room) AS subject_name, g.risk_attribute, g.STATUS, g.create_time, g.create_by, g.update_time
+        FROM lab_risk_plan_abnormal_group g
+        LEFT JOIN lab_subject s ON s.id = g.subject_id
         <where>
             <if test="searchValue != null and searchValue!='' ">and (
-                group_name like concat('%', #{searchValue}, '%')
-                or subject_name like concat('%', #{searchValue}, '%')
+                g.group_name like concat('%', #{searchValue}, '%')
+                or s.name like concat('%', #{searchValue}, '%')
                 )
             </if>
             <if test="riskAttribute != null ">and risk_attribute = #{riskAttribute}</if>
         </where>
-        ORDER  BY create_time DESC
+        ORDER  BY g.create_time DESC
     </select>
 
     <select id="selectById" resultMap="LabRiskPlanAbnormalGroupResult">