修改修约和生成报告只取在报告中显示的项目的指标

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemIndexMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
+import com.baomidou.mybatisplus.annotations.SqlParser;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
 import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
@@ -20,4 +21,7 @@ public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleI
     List<EntrustSampleItemIndexVO> listVOByExpIds(@Param("expIds") List<Long> expIdsList);
 
     List<EntrustSampleItemIndexVO> listBySampleIds(@Param("sampleIds") List<Long> sampleIdList);
+
+    @SqlParser(filter = true)
+    List<EntrustSampleItemIndex> getInReportItemIndex(@Param("sampleId") Long sampleId);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/original/SingleSheetMoreItemOperation.java

@@ -297,11 +297,11 @@ public class SingleSheetMoreItemOperation implements Operation {
         }
         String substring = value.substring(point + roundNum + 1);
         if (Integer.parseInt(substring) > 0) {
-            return true;
-        } else {
             BigDecimal bigDecimal = new BigDecimal(afterPointRoundNum).add(new BigDecimal(valueMap.get(roundNum)));
             cell.setCellValue(bigDecimal.toString());
             return false;
+        } else {
+            return true;
         }
     }
     // 使用公式进行修约

src/main/java/com/patzn/cloud/service/lims/hmhj/original/SingleSheetMoreOperation.java

@@ -319,11 +319,11 @@ public class SingleSheetMoreOperation implements Operation {
         }
         String substring = value.substring(point + roundNum + 1);
         if (Integer.parseInt(substring) > 0) {
-            return true;
-        } else {
             BigDecimal bigDecimal = new BigDecimal(afterPointRoundNum).add(new BigDecimal(valueMap.get(roundNum)));
             cell.setCellValue(bigDecimal.toString());
             return false;
+        } else {
+            return true;
         }
     }
     // 使用公式进行修约

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemIndexService.java

@@ -32,4 +32,7 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
     EntrustSampleItemIndex getByItemIdName(Long itemId);
 
     boolean saveOrUpdateData(EntrustSampleItemIndex entrustSampleItemIndex);
+
+    /* 获取所有在报告中显示的指标 */
+    List<EntrustSampleItemIndex> getInReportItemIndex(Long sampleId);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemIndexServiceImpl.java

@@ -6,7 +6,6 @@ import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
-import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 import com.patzn.cloud.service.lims.common.BeanUtils;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemIndexMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
@@ -18,9 +17,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -119,4 +116,10 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
         }
         return updateById(itemIndex);
     }
+
+    /* 获取所有在报告中显示的指标 */
+    @Override
+    public List<EntrustSampleItemIndex> getInReportItemIndex(Long sampleId) {
+        return baseMapper.getInReportItemIndex(sampleId);
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java

@@ -961,7 +961,8 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             if (templateSampleNum >= sampleVOList.size()) {
                 Integer beginRow = sysFileTemplate.getSampleBeginRow();
                 for (EntrustSampleVO vo : sampleVOList) {
-                    List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
+//                    List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
+                    List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.getInReportItemIndex(vo.getId());
                     vo.setIndexList(indexList);
                     XSSFRow xssfRow = sheetOne.getRow(beginRow);
                     for (EntrustReportTemplateConfig config : configList) {

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

@@ -35,4 +35,12 @@
             #{sampleId}
         </foreach>
     </select>
+
+    <select id="getInReportItemIndex" resultType="com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex">
+        select ii.*
+            from entrust_sample_item_index ii
+            join entrust_sample_item i on ii.entrust_sample_item_id = i.id and i.in_report = 1 and i.deleted = 0
+            join entrust_sample s on s.id = i.entrust_sample_id
+            where ii.deleted = 0 and s.id = #{sampleId}
+    </select>
 </mapper>