实现报告生成合并单元格；修复部分bug

value

2024-05-09 f8a3a9826738a397bdf4aff4ca7a5116344b5a0a

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -24,6 +24,8 @@
    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);

    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);

    String getSampleEn(String sample);
}