化验室的周报月报接口获取化验数据关联设备只获取化验室设备对应的质控样数据

ruoyi-system/src/main/java/com/ruoyi/business/mapper/ZAssayResultMapper.java

@@ -62,4 +62,6 @@ public interface ZAssayResultMapper
     public int deleteZAssayResultByResultIds(Long[] resultIds);
 
     List<ContinuousAssayBasic> continuousAssayCountByDates(AssayReq assayReq);
+
+    List<ZAssayResult> assayCountListByDates(AssayReq assayReq);
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -110,7 +110,9 @@ public class BusinessServiceImpl implements IBusinessService {
     @Override
     public List<AssayQualityDetailRes> assayCountListByDates(AssayReq assayReq) {
         //2024年10月21日10:56:31 只获取质控样的数据
-        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().assayType("3").deviceNo(assayReq.getDeviceNo()).timeBegin(assayReq.getTimeBegin()).timeEnd(assayReq.getTimeEnd()).assayType("3").build());
+        //2024年10月22日16:22:53 因为数据的原因，这里只获取化验室的数据 即biz_device表type=1
+//        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().assayType("3").deviceNo(assayReq.getDeviceNo()).timeBegin(assayReq.getTimeBegin()).timeEnd(assayReq.getTimeEnd()).assayType("3").build());
+        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.assayCountListByDates(assayReq);
         if(CollectionUtils.isEmpty(zAssayResults)){
             return Collections.emptyList();
         }

ruoyi-system/src/main/resources/mapper/business/ZAssayResultMapper.xml

@@ -253,4 +253,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND r.result_date BETWEEN #{timeBegin} AND #{timeEnd}
         <if test="deviceNo != null  and deviceNo != ''"> AND de.device_no = #{deviceNo}</if>
     </select>
+
+
+    <select id="assayCountListByDates" parameterType="com.ruoyi.business.req.AssayReq" resultMap="ZAssayResultResult">
+        SELECT
+            sr.*
+        FROM
+        z_assay_result sr
+        INNER JOIN biz_device bd ON sr.device_no = bd.device_no
+        AND bd.type = 1
+        AND sr.assay_type = '3'
+        <if test="deviceNo != null  and deviceNo != ''"> AND bd.device_no = #{deviceNo}</if>
+        <if test="timeBegin != null  and timeBegin != ''"> and sr.result_date &gt;= #{timeBegin}</if>
+        <if test="timeEnd != null  and timeEnd != ''"> and sr.result_date &lt;= #{timeEnd}</if>
+    </select>
 </mapper>