统计问题修改

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -343,11 +343,11 @@
                     i.company_id,
                     u.period,
                     i.entrust_sample_id,
-                    round(sum(case when ii.name = '磷生铁-C' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁-C' then 1 else null end),1),2) "c_val",
-                    round(sum(case when ii.name = '磷生铁-Si' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁-Si' then 1 else null end),1),2) "si_val",
-                    round(sum(case when ii.name = '磷生铁-Mn' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁-Mn' then 1 else null end),1),2) "mn_val",
-                    round(sum(case when ii.name = '磷生铁-P' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁-P' then 1 else null end),1),2) "p_val",
-                    round(sum(case when ii.name = '磷生铁-S' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁-S' then 1 else null end),1),2) "s_val"
+                    round(sum(case when ii.name = '磷生铁中C' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁中C' then 1 else null end),1),2) "c_val",
+                    round(sum(case when ii.name = '磷生铁中Si' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁中Si' then 1 else null end),1),2) "si_val",
+                    round(sum(case when ii.name = '磷生铁中Mn' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁中Mn' then 1 else null end),1),2) "mn_val",
+                    round(sum(case when ii.name = '磷生铁中P' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁中P' then 1 else null end),1),2) "p_val",
+                    round(sum(case when ii.name = '磷生铁中S' then ROUND(CAST(ii.test_value AS NUMERIC),5) else 0.00 end) / coalesce(sum(case when ii.name = '磷生铁中S' then 1 else null end),1),2) "s_val"
                 FROM
                     entrust_sample_item i,
                     entrust_sample_item_index ii,
@@ -356,10 +356,13 @@
                 WHERE
                     i.ID = ii.entrust_sample_item_id
                     AND I.TESTER_ID = u.USER_ID
-                    and ii.name like '%磷生铁-%'
                     AND i.deleted = 0
                     AND ii.deleted = 0
                     AND ii.test_value is not null and is_numeric(ii.test_value)
+                    AND EXISTS (
+                        select 1 from entrust_sample s where s.id = i.entrust_sample_id and s.deleted = 0
+                        and s.name like '%磷生铁%'
+                    )
                 <if test="null != vo.timeS and null != vo.timeE">
                     and to_char(i.test_time, 'YYYY-MM-dd HH24:MI:SS') BETWEEN #{vo.timeS} AND #{vo.timeE}
                 </if>