From 22837aa98ddddb25764d6d97e0e13c3df45df5be Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:31:07 +0800
Subject: [PATCH] 数采bug调整

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 2945 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 2,682 insertions(+), 263 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 7493e30..64661c5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -21,7 +21,6 @@
 import com.deepoove.poi.data.*;
 import com.deepoove.poi.data.style.*;
 import com.deepoove.poi.util.TableTools;
-import com.deepoove.poi.xwpf.WidthScalePattern;
 import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.common.PrintChina;
 import com.yuanchu.mom.dto.ExcelDto;
@@ -34,8 +33,8 @@
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.utils.MatrixToImageWriter;
 import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
-import com.yuanchu.mom.vo.InsOrderPlanVO;
+import com.yuanchu.mom.utils.RedisUtil;
+import com.yuanchu.mom.vo.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,12 +43,14 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -79,6 +80,10 @@
     private InsOrderStateMapper insOrderStateMapper;
     @Resource
     private InsProductMapper insProductMapper;
+    @Resource
+    private ShiftTimeMapper shiftTimeMapper;
+    @Resource
+    private PerformanceShiftMapper performanceShiftMapper;
 
     @Value("${wordUrl}")
     private String wordUrl;
@@ -102,6 +107,9 @@
     AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
 
     @Resource
+    AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService;
+
+    @Resource
     private InformationNotificationService informationNotificationService;
 
     @Resource
@@ -117,21 +125,28 @@
     private InsBushingService insBushingService;
 
     @Resource
+    private InsBushingMapper insBushingMapper;
+
+    @Resource
     private InsFiberMapper insFiberMapper;
 
     @Resource
-    private InsOrderFileMapper insOrderFileMapper;
+    private InsFibersMapper insFibersMapper;
 
+    @Resource
+    private InsOrderFileMapper insOrderFileMapper;
     @Override
     public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
         Map<String, Object> map = new HashMap<>();
         map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
-        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
-        Integer userId = map1.get("userId");
-        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
+        Integer userId = null;
+        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId()) ) {
+            Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+             userId = map1.get("userId");
             insOrderPlanDTO.setUserId(userId.longValue());
         }
-        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
+        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId,sonLaboratory);
         map.put("body", insOrderPage);
         return map;
     }
@@ -145,11 +160,13 @@
         if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
             insOrderPlanDTO.setUserId(userId.longValue());
         }
-        IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
+        IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId,sonLaboratory);
         map.put("body", insOrderPage);
         return map;
     }
 
+    //璁ら浠诲姟
     @Override
     public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
         if (Objects.isNull(entity)) {
@@ -157,7 +174,7 @@
         }
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
         Integer userId = map1.get("userId");
-        InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1);
+        InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1,entity.getSonLaboratory());
         return insSampleUserMapper.insert(insSampleUser) > 0;
     }
 
@@ -174,18 +191,15 @@
         Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
         List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
         for (SampleProductDto samples : list) {
-//            Set<Integer> set = new HashSet<>();
-//            Map<Integer, String> map2 = new HashMap<>();
             if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
             samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
-//            getTemplateThing(set, map2, samples.getInsProduct());
         }
         map.put("sampleProduct", list);
         return map;
     }
 
     @Override
-    public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+    public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
         List<InsProduct> insProducts = new ArrayList<>();
         switch (type) {
             case 0:
@@ -198,6 +212,9 @@
                 insProducts = insSampleMapper.getInsProduct3(id);
                 break;
         }
+        // 鏁伴噰鏂板
+        getDeviceMessage(insProducts, request);
+
         Set<Integer> set = new HashSet<>();
         Map<Integer, String> map2 = new HashMap<>();
         if (BeanUtil.isEmpty(insProducts)) return null;
@@ -205,12 +222,42 @@
         return insProducts;
     }
 
+    private List<InsProduct> getDeviceMessage(List<InsProduct> insProducts, HttpServletRequest request) {
+        String ipAddress = request.getRemoteAddr();
+        // 闃叉鍥炵幆鍦板潃鍙樹负IPv6
+        String ip =  ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
+        insProducts.forEach(i -> {
+            Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem(), i.getInspectionItemSubclass());
+            if (ObjectUtils.isNotEmpty(devices) && (ObjectUtils.isNotEmpty(devices.get("file_type")) || ObjectUtils.isNotEmpty(devices.get("collect_url")))) {
+                InsProductResult insProductResult = i.getInsProductResult();
+                if (ObjectUtils.isEmpty(insProductResult)) {
+                    insProductResult = new InsProductResult();
+                }
+                List<Object> list = new ArrayList<>();
+                Map<Object, Object> hashMap = new HashMap<>();
+                hashMap.put("v", devices.get("device_name"));
+                list.add(hashMap);
+                insProductResult.setEquipName(JSON.toJSON(list).toString());
+                List<Object> listValue = new ArrayList<>();
+                Map<Object, Object> hashMapValue = new HashMap<>();
+                hashMapValue.put("v", devices.get("management_number"));
+                listValue.add(hashMapValue);
+                insProductResult.setEquipName(JSON.toJSON(list).toString());
+                insProductResult.setEquipValue(JSON.toJSON(listValue).toString());
+            }
+        });
+        return insProducts;
+    }
     @Override
     public List<String> checkSubmitPlan(Integer orderId, String laboratory) {
         List<String> collect = new ArrayList<>();
         List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
         List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
-        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).eq(InsProduct::getInsResult, 0));
+        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                .in(InsProduct::getInsSampleId, ids)
+                .eq(InsProduct::getSonLaboratory, laboratory)
+                .eq(InsProduct::getState, 1)
+                .eq(InsProduct::getInsResult, 0));
         if (insProducts.size() > 0) {
             collect = insProducts.stream().map(insProduct -> {
                 return insProduct.getInspectionItem() + "-" + insProduct.getInspectionItemSubclass();
@@ -264,6 +311,175 @@
         }
     }
 
+    //鍒囨崲璁板綍妯$増鏌ヨ妫�楠屽唴瀹�
+    @Override
+    public Map<String, Object> getReportModel(Integer sampleId) {
+        Map<String, Object> map = new HashMap<>();
+        //鍏堟煡鍑哄绠�
+        List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+        List<InsFibers> fibers = new ArrayList<>();
+        List<InsFiber> fiber = new ArrayList<>();
+        for (InsBushing insBushing : insBushings) {
+            //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+            List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+            if (CollectionUtils.isNotEmpty(insFibers)) {
+                for (InsFibers insFiber : insFibers) {
+                    List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFibersId, insFiber.getId()));
+                    List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+                    if (insProducts.size()==collect.size()) {
+                        insFiber.setState(1);//宸叉楠�
+                    }else {
+                        insFiber.setState(0);//鏈楠�
+                    }
+                }
+                fibers.addAll(insFibers);
+                //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+                List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
+                for (InsFiber insFiber : fiberList) {
+                    List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
+                    List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+                    if (insProducts.size()==collect.size()) {
+                        insFiber.setState(1);//宸叉楠�
+                    }else {
+                        insFiber.setState(0);//鏈楠�
+                    }
+                }
+                fiber.addAll(fiberList);
+            } else {
+                //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+                List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+                for (InsFiber insFiber : insFiberList) {
+                    List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
+                    List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult).filter(sm -> ObjectUtils.isNotEmpty(sm)).collect(Collectors.toList());
+                    if (insProducts.size()==collect.size()) {
+                        insFiber.setState(1);//宸叉楠�
+                    }else {
+                        insFiber.setState(0);//鏈楠�
+                    }
+                }
+                fiber.addAll(insFiberList);
+            }
+        }
+        map.put("鍏夌氦甯�", fibers);
+        map.put("鍏夌氦", fiber);
+        return map;
+    }
+
+    //娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
+    @Override
+    public Map<String, Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
+        Map<String, Object> map = new HashMap<>();
+        //鏍峰搧淇℃伅
+        SampleVo sampleVo = insSampleMapper.getDetailById(sampleId);
+        map.put("sampleVo", sampleVo);
+        List<ProductVo> productVos = new ArrayList<>();
+        //鍏堟煡鍑鸿繖涓牱鍝佷笅鏈夊摢浜涚鑹叉爣,鍏夌氦甯�,鍏夌氦鑹叉爣
+        //鍏堟煡鍑哄绠�
+        List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
+        if (insBushings.size()>0) {
+            //閫氫俊--娓╁害寰幆
+            for (InsBushing insBushing : insBushings) {
+                //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
+                List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
+                if (CollectionUtils.isNotEmpty(insFibers)) {
+                    for (InsFibers insFiber : insFibers) {
+                        //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
+                        List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
+                        for (InsFiber fiber : fiberList) {
+                            //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+                            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                    .eq(InsProduct::getInsSampleId, sampleId)
+                                    .eq(InsProduct::getInspectionItem, inspectionItem)
+                                    .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+                                    .eq(InsProduct::getInsFiberId, fiber.getId()));
+                            for (InsProduct insProduct : insProducts) {
+                                InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
+                                        .eq(InsProductResult::getInsProductId, insProduct.getId()));
+                                ProductVo productVo = new ProductVo();
+                                productVo.setCode(insFiber.getCode());
+                                productVo.setColor(fiber.getColor());
+                                productVo.setBushColor(fiber.getBushColor());
+                                if (ObjectUtils.isNotEmpty(insProductResult)) {
+                                    insProduct.setInsProductResult(insProductResult);
+                                }
+                                //姹傚悓绛夋潯浠朵笅1娆″惊鐜�20搴﹀父娓╃殑璁$畻鍊�
+                                InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId,insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                        .eq(InsProduct::getInsSampleId,sampleId)
+                                        .eq(InsProduct::getInspectionItem, "1")
+                                        .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                        .eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
+                                        .eq(InsProduct::getInsFiberId, fiber.getId())).getId() ));
+                                if (ObjectUtils.isNotEmpty(insProductResult1) &&!insProductResult1.getComValue().equals("[]")) {
+                                    insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
+                                }
+                                productVo.setInsProduct(insProduct);
+                                productVos.add(productVo);
+                            }
+                        }
+                    }
+                }
+                else {
+                    //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
+                    List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
+                    for (InsFiber fiber : insFiberList) {
+                        //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
+                        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                .eq(InsProduct::getInsSampleId, sampleId)
+                                .eq(InsProduct::getInspectionItem, inspectionItem)
+                                .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
+                                .eq(InsProduct::getInsFiberId, fiber.getId()));
+                        for (InsProduct insProduct : insProducts) {
+                            InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+                            ProductVo productVo = new ProductVo();
+                            productVo.setCode("/");
+                            productVo.setColor(fiber.getColor());
+                            productVo.setBushColor(fiber.getBushColor());
+                            insProduct.setInsProductResult(insProductResult);
+                            //姹傚悓绛夋潯浠朵笅1娆″惊鐜�20搴﹀父娓╃殑璁$畻鍊�
+                            InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId,insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                    .eq(InsProduct::getInsSampleId,sampleId)
+                                    .eq(InsProduct::getInspectionItem, "1")
+                                    .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                    .eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
+                                    .eq(InsProduct::getInsFiberId, fiber.getId())).getId() ));
+                            if (ObjectUtils.isNotEmpty(insProductResult1) && !insProductResult1.getComValue().equals("[]")) {
+                                insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
+                            }
+                            productVo.setInsProduct(insProduct);
+                            productVos.add(productVo);
+                        }
+                    }
+                }
+            }
+            productVos = productVos.stream().sorted(Comparator.comparing(productVo -> productVo.getInsProduct().getInspectionItemClass())).collect(Collectors.toList());
+        }
+        else {
+            //鐢靛姏--鐑惊鐜拰娓╁崌璇曢獙
+            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getInsSampleId, sampleId)
+                    .eq(InsProduct::getInspectionItem, inspectionItem));
+            for (InsProduct insProduct : insProducts) {
+                InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+                ProductVo productVo = new ProductVo();
+                if (ObjectUtils.isNotEmpty(insProductResult)) {
+                    insProduct.setInsProductResult(insProductResult);
+                }
+                productVo.setInsProduct(insProduct);
+                productVos.add(productVo);
+            }
+        }
+        map.put("productVos", productVos);
+        return map;
+    }
+
+    @Override
+    public List<String> upPlanUser2(Integer orderId) {
+        List<Integer> sampleId = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
+        List<String> sonLaboratory = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).in(InsProduct::getInsSampleId, sampleId)).stream().map(InsProduct::getSonLaboratory).distinct().collect(Collectors.toList());
+        return sonLaboratory;
+    }
+
+
     @Override
     public void saveInsContext(Map<String, Object> insContext) {
         Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
@@ -272,9 +488,12 @@
                 JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
                 InsProduct insProduct = new InsProduct();
                 insProduct.setId(Integer.parseInt(k));
-                InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
-                if (BeanUtil.isEmpty(result)) {
+                List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+                InsProductResult result;
+                if (CollectionUtils.isEmpty(results)) {
                     result = new InsProductResult();
+                } else {
+                    result = results.get(0);
                 }
                 result.setInsProductId(Integer.parseInt(k));
                 if (jo.get("insValue") != null) {
@@ -284,6 +503,9 @@
                         JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
                         Map<String, Object> map = new HashMap<>();
                         map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
+                        map.put("r", JSON.toJSONString(insValue.get("r")));
+                        map.put("c", JSON.toJSONString(insValue.get("c")));
+                        map.put("w", insValue.get("w"));
                         try {
                             if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
                                 map.put("u", userId + "");
@@ -361,28 +583,80 @@
                 //鏌ヨ妫�楠屽崟淇℃伅
                 InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(insProduct.getInsSampleId()).getInsOrderId());
                 //鏍¢獙濡傛灉杩欎釜浜鸿繖涓娴嬮」鐩凡缁忔坊鍔犺繃浜嗗垯涓嶉渶瑕佸啀鏂板
-                Long count = auxiliaryOutputWorkingHoursMapper.selectCount(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
-                        .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
-                        .eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
-                        .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
-                if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
-                    //娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
-                    AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
-                    auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
-                    auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
-                    auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//闈炲姞鐝伐鏃�
-                    auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
-                    auxiliaryOutputWorkingHours.setOutputWorkTime(insProduct.getManHour());//浜ч噺宸ユ椂
-                    auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//宸ユ椂鍒嗙粍
-                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                    DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                    auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
-                    LocalDateTime localDateTime = LocalDateTime.now();
-                    DateTime parse = DateUtil.parse(localDateTime.format(formatter));
-                    auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
-                    auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
-                    auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
-                    auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
+                //棣栧厛鍒ゆ柇褰撳墠浜虹殑褰撳墠鏃堕棿鏄惁鏄帓鐝椂闂村唴,濡傛灉涓嶆槸灏辨槸鍔犵彮
+                LocalDateTime today = LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT);
+                PerformanceShift performanceShift = performanceShiftMapper.selectOne(Wrappers.<PerformanceShift>lambdaQuery()
+                        .eq(PerformanceShift::getUserId, userId)
+                        .eq(PerformanceShift::getWorkTime, today));
+                if (ObjectUtils.isNotEmpty(performanceShift)){
+                    ShiftTime shiftTime = shiftTimeMapper.selectOne(Wrappers.<ShiftTime>lambdaQuery().eq(ShiftTime::getShift, performanceShift.getShift()));
+                    if (ObjectUtils.isNotEmpty(shiftTime)){
+                        DateTimeFormatter forma = DateTimeFormatter.ofPattern("HH:mm");
+                        LocalTime now = LocalTime.now();
+                        LocalTime startTime = LocalTime.parse(shiftTime.getStartTime(), forma);
+                        LocalTime endTime = LocalTime.parse(shiftTime.getEndTime(), forma);
+                        // 妫�鏌ュ綋鍓嶆椂闂存槸鍚﹀湪鑼冨洿鍐咃紙鍖呮嫭杈圭晫锛�
+                        boolean isWithinRange = !now.isBefore(startTime) && !now.isAfter(endTime);
+                        //鍔犵彮
+                        AuxiliaryOutputWorkingHours count1 = auxiliaryOutputWorkingHoursMapper.selectOne(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+                                .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
+                                .eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
+                                .eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
+                                .eq(AuxiliaryOutputWorkingHours::getOvertimeOrderNo, insOrder.getEntrustCode()));
+                        //闈炲姞鐝�
+                        AuxiliaryOutputWorkingHours count2 = auxiliaryOutputWorkingHoursMapper.selectOne(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+                                .eq(AuxiliaryOutputWorkingHours::getCheck, userId)
+                                .eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem())
+                                .eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass())
+                                .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
+                        AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
+                        if (ObjectUtils.isNotEmpty(count1) ){
+                             auxiliaryOutputWorkingHours = count1;
+                        }
+                        else if (ObjectUtils.isNotEmpty(count2) ){
+                             auxiliaryOutputWorkingHours = count2;
+                        }
+                        if (ObjectUtils.isNotEmpty(insProduct.getManHour())) {
+                            if (isWithinRange && ObjectUtils.isEmpty(count2)) {
+                                //鍦ㄦ椂闂村唴灏辨槸姝e父涓婄彮
+                                auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//妫�娴嬬埗椤�
+                                auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//妫�娴嬪瓙椤�
+                                auxiliaryOutputWorkingHours.setSample(insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode());//鏍峰搧缂栧彿
+                                auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
+                                auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//闈炲姞鐝伐鏃�
+                                auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
+                                auxiliaryOutputWorkingHours.setOutputWorkTime((ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getOvertimeWorkTime())?auxiliaryOutputWorkingHours.getOvertimeWorkTime():0)+(ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getWorkTime())?auxiliaryOutputWorkingHours.getWorkTime():0));//浜ч噺宸ユ椂
+                                auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//宸ユ椂鍒嗙粍
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                                DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
+                                LocalDateTime localDateTime = LocalDateTime.now();
+                                DateTime parse = DateUtil.parse(localDateTime.format(formatter));
+                                auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
+                                auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
+                                auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
+                            } else if(ObjectUtils.isEmpty(count1)) {
+                                //鍔犵彮
+                                auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//妫�娴嬬埗椤�
+                                auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//妫�娴嬪瓙椤�
+                                auxiliaryOutputWorkingHours.setSample(insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode());//鏍峰搧缂栧彿
+                                auxiliaryOutputWorkingHours.setOvertimeOrderNo(insOrder.getEntrustCode());//鍔犵彮濮旀墭鍗曞彿
+                                auxiliaryOutputWorkingHours.setOvertimeWorkTime(insProduct.getManHour());//鍔犵彮宸ユ椂
+                                auxiliaryOutputWorkingHours.setOvertimeAmount(1);//鍔犵彮鏁伴噺
+                                auxiliaryOutputWorkingHours.setOutputWorkTime((ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getOvertimeWorkTime())?auxiliaryOutputWorkingHours.getOvertimeWorkTime():0)+(ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getWorkTime())?auxiliaryOutputWorkingHours.getWorkTime():0));//浜ч噺宸ユ椂
+                                auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//宸ユ椂鍒嗙粍
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                                DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                                auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
+                                LocalDateTime localDateTime = LocalDateTime.now();
+                                DateTime parse = DateUtil.parse(localDateTime.format(formatter));
+                                auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
+                                auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
+                                auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
+                            }
+                            auxiliaryOutputWorkingHoursService.saveOrUpdate(auxiliaryOutputWorkingHours);
+                        }
+                    }
                 }
 
                 InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
@@ -395,6 +669,11 @@
                     insSample.setInsState(2);
                 }
                 insSampleMapper.updateById(insSample);
+                /*鏍¢獙涓�涓媟esult琛�*/
+                List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()).orderByDesc(InsProductResult::getId));
+                if (insProductResults.size() > 1) {
+                    insProductResultMapper.deleteById(insProductResults.get(0));
+                }
             });
             return insContext.keySet().stream().findFirst().orElse(null);
         }).thenAccept(res -> {
@@ -422,12 +701,14 @@
         });
     }
 
+    //浜ゆ帴
     @Override
-    public int upPlanUser(Integer userId, Integer orderId) {
+    public int upPlanUser(Integer userId, Integer orderId,String sonLaboratory) {
         InsSampleUser insSampleUser = new InsSampleUser();
         insSampleUser.setUserId(userId);
         insSampleUser.setInsSampleId(orderId);
         insSampleUser.setState(0);
+        insSampleUser.setSonLaboratory(sonLaboratory);
         return insSampleUserMapper.insert(insSampleUser);
     }
 
@@ -441,6 +722,7 @@
         if (count == 0 && num == 5) {
             List<InsUnPass> insUnPasses = new ArrayList<>();
             /*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
+            //杩欓噷鐨刬nsSamples鏄鍗曚笅鐨勬墍鏈夋牱鍝佸寘鎷�("/")
             List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
             for (InsSample insSample : insSamples) {
                 List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, insSample.getId()).eq(InsProduct::getState, 1));
@@ -472,6 +754,7 @@
             insUnPassService.saveBatch(insUnPasses);
             InsOrder insOrder = insOrderMapper.selectById(orderId);
             Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
+            //samples鏄笉鍖呮嫭甯︽湁"/"鐨勬牱鍝�
             List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
             InsReport insReport = new InsReport();
             insReport.setCode(insOrder.getEntrustCode());
@@ -484,6 +767,7 @@
             String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
             AtomicReference<String> resultCh = new AtomicReference<>("");
             AtomicReference<String> resultEn = new AtomicReference<>("");
+            /*鍩虹鎶ュ憡(鏍规嵁缁樺埗鐨勫師濮嬭褰曟ā鐗堝舰鎴�)*/
             samples.forEach(a -> {
                 Set<Integer> set = new HashSet<>();
                 Map<Integer, String> map2 = new HashMap<>();
@@ -510,8 +794,9 @@
                     }
                     templateSet.add(JSON.toJSONString(b.getTemplate()));
                 }
+                AtomicInteger index = new AtomicInteger();
+                Set<String> itemSet = new HashSet<>();
                 templateSet.forEach(tem -> {
-                    AtomicInteger index = new AtomicInteger();
                     Set<Integer> set2 = new HashSet<>();
                     List<RowRenderData> rows = new ArrayList<>();
                     List<TextRenderData> text = new ArrayList<>();
@@ -548,7 +833,6 @@
                     Map<String, InsProduct> pMap = new HashMap<>();
                     Set<String> delRSet = new HashSet<>();
                     delRSet.add("0");
-                    delRSet.add("1");
                     for (JSONObject jo1 : temp) {
                         JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
                         if (Integer.parseInt(jo1.get("c") + "") > 9) {
@@ -559,19 +843,19 @@
                             int count3 = 0;
                             String str = "";
                             String s = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
-                            if ("妫�楠屽��".equals(s) || "璁惧鍚嶇О".equals(s) || "璁惧缂栫爜".equals(s) || "璇曢獙鏂规硶".equals(s) || "妫�娴嬫柟娉�".equals(s)) {
+                            if (s.contains("妫�楠屽��") || s.contains("璁惧鍚嶇О") || s.contains("璁惧缂栫爜") || s.contains("璇曢獙鏂规硶") || s.contains("妫�娴嬫柟娉�")) {
                                 delSet.add(jo1.get("c") + "");
                                 continue;
                             }
                             for (JSONObject jo2 : temp) {
                                 JSONObject v2 = JSON.parseObject(JSON.toJSONString(jo2.get("v")));
                                 if (jo1.get("r").equals(jo2.get("r"))) {
-                                    if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠岄」")) {
+                                    if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").toString().contains("妫�楠岄」")) {
                                         if (count3 == 0) {
                                             str += v2.get("v");
                                             count3 += 1;
                                         }
-                                    } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠屽瓙椤�")) {
+                                    } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").toString().contains("妫�楠屽瓙椤�")) {
                                         if (count3 == 1) {
                                             str += v2.get("v");
                                             count3 += 1;
@@ -616,11 +900,11 @@
                         InsProduct p = pMap.get(jo1.get("r") + "");
                         if (p != null && v.get("ps") != null) {
                             String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
-                            if (value.equals("瑕佹眰鍊�")) {
-                                textRenderData.setText(p.getAsk());
-                            } else if (value.equals("鍗曚綅")) {
+                            if (value.contains("瑕佹眰鍊�")) {
+                                textRenderData.setText(ObjectUtils.isNotEmpty(p.getTell()) ? p.getTell() : "");
+                            } else if (value.contains("鍗曚綅")) {
                                 textRenderData.setText(p.getUnit());
-                            } else if (value.equals("缁撹")) {
+                            } else if (value.contains("缁撹")) {
                                 switch (p.getInsResult()) {
                                     case 1:
                                         textRenderData.setText("鈭�");
@@ -634,31 +918,45 @@
                                         textRenderData.setText("-");
                                         break;
                                 }
-                            } else if (value.equals("搴忓彿")) {
-                                index.getAndIncrement();
+                            } else if (value.contains("搴忓彿")) {
+                                if (itemSet.add(p.getInspectionItem())) {
+                                    index.getAndIncrement();
+                                }
                                 textRenderData.setText(index + "");
-                            } else if (value.equals("璁$畻鍊�")) {
+                            } else if (value.contains("璁$畻鍊�")) {
                                 JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
                                 textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "/" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
-                            } else if (value.equals("鏈�缁堝��")) {
+                            } else if (value.contains("鏈�缁堝��")) {
                                 textRenderData.setText(p.getLastValue());
-                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                            } else if (value.contains("鏍峰搧缂栧彿")) {
                                 textRenderData.setText(a.getSampleCode());
-                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                            } else if (value.contains("鏍峰搧鍨嬪彿")) {
                                 textRenderData.setText(a.getModel());
-                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                            } else if (value.contains("鏍峰搧鍚嶇О")) {
                                 textRenderData.setText(a.getSample());
-                            } else if (value.equals("璇曢獙鏂规硶")) {
+                            } else if (value.contains("璇曢獙鏂规硶")) {
                                 textRenderData.setText(p.getMethodS());
+                            } else if (value.contains("妫�楠岄」")) {
+                                if (ObjectUtils.isEmpty(p.getInspectionItemEn())) {
+                                    textRenderData.setText(p.getInspectionItem());
+                                } else {
+                                    textRenderData.setText(p.getInspectionItem() + "@" + p.getInspectionItemEn());
+                                }
+                            } else if (value.contains("妫�楠屽瓙椤�")) {
+                                if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
+                                    textRenderData.setText(p.getInspectionItemSubclass());
+                                } else {
+                                    textRenderData.setText(p.getInspectionItemSubclass() + "@" + p.getInspectionItemSubclassEn());
+                                }
                             } else {
                                 textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
                             }
                         } else if (p == null && v.get("ps") != null) {
                             String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
                             p = pMap.get(pMap.keySet().iterator().next());
-                            if (value.equals("鏈�缁堝��")) {
+                            if (value.contains("鏈�缁堝��")) {
                                 textRenderData.setText(p.getLastValue());
-                            } else if (value.equals("缁撹")) {
+                            } else if (value.contains("缁撹")) {
                                 switch (p.getInsResult()) {
                                     case 1:
                                         textRenderData.setText("鉁�");
@@ -672,11 +970,11 @@
                                         textRenderData.setText("-");
                                         break;
                                 }
-                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                            } else if (value.contains("鏍峰搧缂栧彿")) {
                                 textRenderData.setText(a.getSampleCode());
-                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                            } else if (value.contains("鏍峰搧鍨嬪彿")) {
                                 textRenderData.setText(a.getModel());
-                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                            } else if (value.contains("鏍峰搧鍚嶇О")) {
                                 textRenderData.setText(a.getSample());
                             } else {
                                 textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
@@ -688,7 +986,6 @@
                             textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
                         }
                         Style style = new Style();
-//                        style.setFontFamily(v.get("ff") == null ? "瀹嬩綋" : v.get("ff") + "");
                         style.setFontFamily("瀹嬩綋");
                         if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
                             style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
@@ -703,37 +1000,710 @@
                     if (rowRenderData.getCells().size() != 0) {
                         rows.add(rowRenderData);
                     }
+                    List<TableRenderData> tables1 = new ArrayList<>();
                     TableRenderData tableRenderData = new TableRenderData();
-                    tableRenderData.setRows(rows);
-                    int countSize = tableRenderData.getRows().get(0).getCells().size();
-                    for (RowRenderData row : tableRenderData.getRows()) {
-                        /*for (CellRenderData cell : row.getCells()) {
-                            System.out.print(cell.getParagraphs().get(0).getContents());
-                        }
-                        System.out.println("");*/
-                        if (row.getCells().size() != countSize) {
-                            throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
-                        }
+                    tableRenderData.setRows(new ArrayList<>());
+                    double totalHeight = 0.0; // 鐢ㄤ簬璺熻釜褰撳墠琛ㄦ牸鐨勬�昏楂�
+                    double heightThreshold = 8000.0; // 闃堝�硷紝
+                    List<RowRenderData> firstTwoRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
+                    // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
+                    if (rows.size() >= 2) {
+                        firstTwoRows.add(rows.get(0));
+                        firstTwoRows.add(rows.get(1));
                     }
-                    TableStyle tableStyle = new TableStyle();
-                    tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
-                    tableStyle.setWidth("10000");
-                    tableStyle.setAlign(TableRowAlign.CENTER);
-                    BorderStyle borderStyle = new BorderStyle();
-                    borderStyle.setColor("000000");
-                    borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
-                    borderStyle.setSize(14);
-                    tableStyle.setLeftBorder(borderStyle);
-                    tableStyle.setTopBorder(borderStyle);
-                    tableStyle.setRightBorder(borderStyle);
-                    tableStyle.setBottomBorder(borderStyle);
-                    tableRenderData.setTableStyle(tableStyle);
-                    Map<String, Object> table = new HashMap<>();
-                    table.put("table", tableRenderData);
-                    table.put("report", insReport);
-                    tables.add(table);
+                    for (RowRenderData row : rows) {
+                        double rowHeight = row.getRowStyle().getHeight(); // 鑾峰彇褰撳墠琛岀殑琛岄珮
+                        totalHeight += rowHeight; // 鏇存柊鎬昏楂�
+                        if (totalHeight >= heightThreshold) {
+                            // 鍒涘缓鏂拌〃鏍煎苟澶嶅埗鍓嶄袱琛�
+                            TableRenderData newTableRenderData = new TableRenderData();
+                            newTableRenderData.setRows(new ArrayList<>(firstTwoRows));
+                            //璁剧疆鏍峰紡
+                            TableStyle tableStyle = new TableStyle();
+                            tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+                            tableStyle.setWidth("10000");
+                            tableStyle.setAlign(TableRowAlign.CENTER);
+                            BorderStyle borderStyle = new BorderStyle();
+                            borderStyle.setColor("000000");
+                            borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                            borderStyle.setSize(14);
+                            tableStyle.setLeftBorder(borderStyle);
+                            tableStyle.setTopBorder(borderStyle);
+                            tableStyle.setRightBorder(borderStyle);
+                            tableStyle.setBottomBorder(borderStyle);
+                            tableRenderData.setTableStyle(tableStyle);
+                            newTableRenderData.setTableStyle(tableStyle);
+                            tables1.add(tableRenderData);
+                            tableRenderData = newTableRenderData;
+                            totalHeight = rowHeight;
+                        }
+                        tableRenderData.getRows().add(row);
+                    }
+                    if (!tableRenderData.getRows().isEmpty()) {
+                        //璁剧疆鏍峰紡
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
+                        tableStyle.setWidth("10000");
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        tables1.add(tableRenderData);
+                    }
+                    tables1.forEach(table -> {
+                        Map<String, Object> tableMap = new HashMap<>();
+                        tableMap.put("table", table);
+                        tableMap.put("report", insReport);
+                        tables.add(tableMap);
+                    });
                 });
             });
+            /*鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡鏍峰紡*/
+            //鏌ヨ璁㈠崟涓嬫墍鏈夋牱鍝佺殑妫�楠岄」鐩�,濡傛灉鏈夊厜绾ゆ帴澶存崯鑰楀垯閲嶆柊鏋勫缓琛ㄦ牸
+            List<Map<String, Object>> tables4 = new ArrayList<>();
+            List<InsProduct> insProducts0 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+            if (insProducts0.stream().map(InsProduct::getInspectionItem).collect(Collectors.toList()).contains("鍏夌氦鎺ュご鎹熻��")) {
+                //娓呯┖鍘熸湁鐨勫熀纭�琛ㄦ牸
+                tables.clear();
+                //鍘婚噸鐨勬楠岄」鐩�
+                List<String> filteredProducts = insProducts0.stream().map(insProduct -> {
+                    return (insProduct.getInspectionItem() + "," + insProduct.getInspectionItemEn() + "," + insProduct.getInspectionItemSubclass() + "," + insProduct.getInspectionItemSubclassEn() + "," + insProduct.getTell());
+                }).distinct().collect(Collectors.toList());
+                //妫�楠岄」鐩殑鎬绘暟閲�(鍘婚噸)
+                long size = filteredProducts.size();
+                long number = 10;
+                long number2 = 7;
+                long index = 1;
+                //妫�楠岀粨鏋滄姤鍛�(褰撴楠岄」鐩秴杩�10涓柊寤鸿〃)
+                for (long i = 0; i < size; i++) {
+                    if (i % number == 0) {
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁� 脳 鈭� 鉁� 鉁�
+                        long count1 = size-(index-1)*number < number ? size-(index-1)*number + 3 : number + 3;
+                        for (int j = 0; j <count1 ; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 6; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (j == 0) {
+                                    //绗竴琛�
+                                    if (k < 4) {
+                                        //鍓�4鍒�
+                                        textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�11");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鍚�2鍒�
+                                        textRenderData.setText(insSamples.get(0).getModel() + "鈭�12");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else if (j == 1) {
+                                    //绗簩琛�
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText("搴忓彿@No.鈭�13");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 1) {
+                                        //绗簩鍒�
+                                        textRenderData.setText("妫�楠岄」鐩瓳Test Item鈭�14");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 2 || k == 3) {
+                                        //绗笁鍥涘垪
+                                        textRenderData.setText("鏍囧噯瑕佹眰@Requirement鈭�15");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 4) {
+                                        //绗簲鍒�
+                                        textRenderData.setText("妫�楠岀粨鏋淍Test result鈭�16");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //绗叚鍒�
+                                        textRenderData.setText("缁撹@Conclusion鈭�17");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else if (j == count1-1) {
+                                    //鏈�鍚庝竴琛�
+                                    if (k == 0 || k == 1) {
+                                        //鍓嶄袱鍒�
+                                        textRenderData.setText("澶囨敞鈭�18");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        textRenderData.setText("鈥溾垰鈥濊〃绀洪」鐩悎鏍硷紝鈥溍椻�濊〃绀洪」鐩笉鍚堟牸@鈥溾垰鈥漣ndicates test Item is qualified锛屸�溍椻�漣ndicates test Item is unqualified鈭�19");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else {
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText((j - 1) + "");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 1) {
+                                        //绗簩鍒�
+                                        String insProduct;
+                                        try {
+                                            insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+                                            textRenderData.setText(split[0]);
+                                        } else {
+                                            textRenderData.setText(split[0] + "@" + split[1]);
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 2) {
+                                        //绗笁鍒�
+                                        //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+                                        String insProduct;
+                                        try {
+                                            insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            //濡傛灉娌℃湁瀛愮被
+                                            textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+                                        } else {
+                                            //濡傛灉鏈夊瓙绫�
+                                            //杩樿鍒ゆ柇鏄惁鏈夎嫳鏂�
+                                            if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+                                                textRenderData.setText(split[2]);//妫�楠屽瓙椤�
+                                            } else {
+                                                textRenderData.setText(split[2] + "@" + split[3]);//妫�楠屽瓙椤�+鑻辨枃
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 3) {
+                                        //绗洓鍒�
+                                        //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+                                        String insProduct;
+                                        try {
+                                            insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            //濡傛灉娌℃湁瀛愮被
+                                            textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+                                        } else {
+                                            //濡傛灉鏈夊瓙绫�
+                                            textRenderData.setText(split[4]);//瑕佹眰鎻忚堪
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 4) {
+                                        //绗簲鍒�
+                                        String insProduct;
+                                        try {
+                                            insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = insProduct.split(",");
+                                        //鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨鏋�(鏈�缁堝��)
+                                        List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2])
+                                                .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+                                        //鑾峰彇鏈�灏忓�煎拰鏈�澶у��
+                                        Optional<String> max = products.stream().map(InsProduct::getLastValue)
+                                                .filter(value -> !value.isEmpty())
+                                                .max(String::compareTo);
+                                        Optional<String> min = products.stream().map(InsProduct::getLastValue)
+                                                .filter(value -> !value.isEmpty())
+                                                .min(String::compareTo);
+                                        textRenderData.setText(min.get() + "-" + max.get());//妫�楠岀粨鏋�
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鏈�鍚庝竴鍒�
+                                        String insProduct;
+                                        try {
+                                            insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = insProduct.split(",");
+                                        //鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨璁�(ins_result)
+                                        List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2])
+                                                .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+                                        List<Integer> result = products.stream().map(InsProduct::getInsResult).distinct().collect(Collectors.toList());
+                                        if (result.size() == 1 && result.contains(1)) {
+                                            //鍚堟牸
+                                            textRenderData.setText("鈭�");
+                                        } else {
+                                            //涓嶅悎鏍�
+                                            textRenderData.setText("脳");
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        tableRenderData.setRows(rows);
+                        int countSize = tableRenderData.getRows().get(0).getCells().size();
+                        for (RowRenderData row : tableRenderData.getRows()) {
+                         /* for (CellRenderData cell : row.getCells()) {
+                              System.out.print(cell.getParagraphs().get(0).getContents());
+                          }
+                          System.out.println("");*/
+                            if (row.getCells().size() != countSize) {
+                                throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑1");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index", index);
+                        tables.add(table);
+                        index++;
+                    }
+                }
+                long index4 = 1;
+                //妫�楠屾姤鍛婃姤鍛�(褰撴楠岄」鐩秴杩�7涓柊寤鸿〃)
+                for (long j = 0; j < size; j++) {
+                    if (j % number2 == 0) {
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�(鏍规嵁鏍峰搧鏁伴噺鏉�)
+                        for (int i = 0; i < samples.size() + 2; i++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 8; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (i == 0) {
+                                    //绗竴琛�
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //绗簩鍒�
+                                        String product;
+                                        try {
+                                            product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = product.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+                                                textRenderData.setText(split[0] + "鈭�3" + k);
+                                            } else {
+                                                textRenderData.setText(split[0] + "@" + split[1] + "鈭�3" + k);
+                                            }
+                                        } else {
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+                                                textRenderData.setText(split[0]);
+                                            } else {
+                                                textRenderData.setText(split[0] + "@" + split[1]);
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                } else if (i == 1) {
+                                    //绗簩琛�
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //绗簩鍒�
+                                        String product;
+                                        try {
+                                            product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = product.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+                                                textRenderData.setText(split[0] + "鈭�3" + k);
+                                            } else {
+                                                textRenderData.setText(split[0] + "@" + split[1] + "鈭�3" + k);
+                                            }
+                                        } else {
+                                            if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+                                                textRenderData.setText(split[2]);
+                                            } else {
+                                                textRenderData.setText(split[2] + "@" + split[3]);
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                } else {
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText(samples.get(i - 2).getSampleCode());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鏍规嵁鏍峰搧缂栧彿鍜岄」鐩幓鏌ヨ鏈�缁堝��
+                                        String product;
+                                        try {
+                                            product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        String[] split = product.split(",");
+                                        InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInsSampleId, samples.get(i - 2).getId())
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                        if (ObjectUtils.isEmpty(insProduct)) {
+                                            //鍙兘鏍规嵁姝e父鐨勬牱鍝佺紪鍙峰拰鍏夌氦鎺ュご鎹熻�楃殑椤圭洰鏌ヤ笉鍒板搴旂殑椤圭洰,鍒欓渶瑕佹牴鎹�"/"鏉ユ煡
+                                            List<InsSample> sampleList = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().like(InsSample::getSampleCode, samples.get(i - 2).getSampleCode()));
+                                            List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getState, 1)
+                                                    .in(InsProduct::getInsSampleId, sampleList.stream().map(InsSample::getId).collect(Collectors.toList()))
+                                                    .eq(InsProduct::getInspectionItem, split[0])
+                                                    .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                            insProduct = products.get(0);
+                                        }
+                                        textRenderData.setText(insProduct.getLastValue());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        tableRenderData.setRows(rows);
+                        int countSize = tableRenderData.getRows().get(0).getCells().size();
+                        for (RowRenderData row : tableRenderData.getRows()) {
+                                /*for (CellRenderData cell : row.getCells()) {
+                                    System.out.print(cell.getParagraphs().get(0).getContents());
+                                }
+                                System.out.println("");*/
+                            if (row.getCells().size() != countSize) {
+                                throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑2");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table4", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index4", index4);
+                        tables4.add(table);
+                        index4++;
+                    }
+                }
+                //鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡杩樻槸tables4
+                //鏌ヨ鏍峰搧(鍙煡璇㈠甫"/")鐨勬暟閲�
+                List<InsSample> sampleList = insSamples.stream().filter(insSample -> insSample.getSampleCode().contains("/")).collect(Collectors.toList());
+                //杩囨护鍑哄厜绾ゆ帴澶存崯鑰楃殑妫�楠岄」鐩�
+                List<String> strings = filteredProducts.stream().filter(s -> s.contains("鍏夌氦鎺ュご鎹熻��")).distinct().collect(Collectors.toList());
+                long index41 = 1;
+                for (int i = 0; i < sampleList.size(); i++) {
+                    if (i % 16 == 0) {
+                        //鏍峰搧鏁伴噺瓒呰繃16闇�瑕佹柊澧炶〃鏍�
+                        List<RowRenderData> rows = new ArrayList<>();
+                        int count2 = sampleList.size()-(index41-1)*16 < 16 ? (int) (sampleList.size() - (index41 - 1) * 16 + 1) : 17;
+                        //琛ㄦ牸鐨勮鏁�
+                        for (int j = 0; j < count2; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 6; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (j == 0) {
+                                    //绗竴琛�
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText("鍏夌氦绫诲瀷@Fiber type");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 1 || k == 2) {
+                                        //绗簩 涓夊垪
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        String[] split = strings.get(k - 3).split(",");
+                                        if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+                                            textRenderData.setText(split[2]);
+                                        } else {
+                                            textRenderData.setText(split[2] + "@" + split[3]);
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else {
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText(sampleList.get(0).getModel() + "鈭�44");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 1) {
+                                        //绗簩鍒�
+                                        textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[0]);
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 2) {
+                                        //绗笁鍒�
+                                        textRenderData.setText(sampleList.get(j - 1).getSampleCode().split("/")[1]);
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鏍规嵁瀵瑰簲鐨勬牱鍝佺紪鍙峰拰妫�楠岄」鐩煡璇㈠搴旀暟鎹�(鏈�缁堝��)
+                                        String[] split = strings.get(k - 3).split(",");
+                                        InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInsSampleId, sampleList.get(j - 1).getId())
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                        textRenderData.setText(insProduct.getLastValue());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        tableRenderData.setRows(rows);
+                        int countSize = tableRenderData.getRows().get(0).getCells().size();
+                        for (RowRenderData row : tableRenderData.getRows()) {
+                                /*for (CellRenderData cell : row.getCells()) {
+                                    System.out.print(cell.getParagraphs().get(0).getContents());
+                                }
+                                System.out.println("");*/
+                            if (row.getCells().size() != countSize) {
+                                throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑3");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table4", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index4", index4 + 1);
+                        tables4.add(table);
+                        index4++;
+                        index41++;
+                    }
+                }
+                tables4.forEach(table4 -> {
+                    table4.put("tableSize4", tables4.size());
+                });
+
+            }
             String url;
             try {
                 InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
@@ -788,7 +1758,11 @@
             } catch (Exception e) {
                 throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
             }
-            Custom custom = customMapper.selectById(user.get("company"));
+            if (signatureUrl.equals("")) {
+                throw new ErrorException("鎵句笉鍒版楠屼汉鐨勭鍚�");
+            }
+            //Custom custom = customMapper.selectById(user.get("company"));
+            Custom custom = customMapper.selectById(insOrder.getCompanyId());
             if (!resultCh.get().equals("")) {
                 resultCh.set("渚濇嵁濮旀墭瑕佹眰锛�" + resultCh.get().replaceFirst("銆�", "") + "绛夋墍妫�椤圭洰涓嶇鍚堣姹傦紝鍏朵綑鎵�妫�椤圭洰鍧囩鍚堣姹傘��");
                 resultEn.set("According to commissioned requirements," + resultEn.get().replaceFirst("銆�", "") + " these inspected items do not meet the requirements, all other inspected items meet the requirements.");
@@ -796,186 +1770,1511 @@
                 resultCh.set("渚濇嵁濮旀墭瑕佹眰锛屾墍妫�椤圭洰鍧囩鍚堣姹傘��");
                 resultEn.set("According to commissioned requirements, all the tested items meet the requirements.");
             }
-            /*鍏夌氦鐨勬楠屾姤鍛�*/
+
+
+            /*鍏夌氦閰嶇疆鐨勬楠屾姤鍛�*/
             //鍏堝垽鏂槸鍚︽湁鍏夌氦閰嶇疆
-            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
-            List<Integer> collect = insProducts.stream().map(InsProduct::getInsFiberId).filter(str -> str != null).collect(Collectors.toList());
+            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList()))
+                    .isNotNull(InsProduct::getInsFiberId)
+                    .isNull(InsProduct::getInspectionItemClass));//鐢ㄦ楠屽垎椤瑰瓧娈靛尯鍒厜绾ら厤缃笌娓╁害寰幆
             List<Map<String, Object>> tables2 = new ArrayList<>();
-            if (collect.size() > 0) {
+            if (insProducts.size() > 0) {
                 samples.forEach(sample -> {
                     List<InsProduct> insProducts1 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                             .eq(InsProduct::getState, 1)
                             .eq(InsProduct::getInsSampleId, sample.getId())
-                            .isNotNull(InsProduct::getInsFiberId));
-                    long size = insProducts1.size();
+                            .isNotNull(InsProduct::getInsFiberId)
+                            .isNull(InsProduct::getInspectionItemClass));
+                    List<InsProduct> filteredProducts = insProducts1.stream()
+                            .collect(Collectors.groupingBy(product -> product.getInspectionItem() + product.getInspectionItemSubclass()))
+                            .values().stream()
+                            .map(group -> group.get(0))
+                            .sorted(Comparator.comparing(InsProduct::getInspectionItem))
+                            .collect(Collectors.toList());
+                    long size = insProducts1.stream().map(insProduct -> {
+                        return (insProduct.getInspectionItem() + insProduct.getInspectionItemSubclass());
+                    }).distinct().collect(Collectors.toList()).size();
                     long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
-                    List<RowRenderData> rows = new ArrayList<>();
-                    //鍒ゆ柇妫�楠岄」鐩槸鍚︽湁鐖跺瓙鍏崇郴
-                    Boolean state = true;
-                    for (InsProduct insProduct : insProducts1) {
-                        if (!insProduct.getInspectionItemSubclass().equals("") && insProduct.getInspectionItemSubclass() != null) {
-                            state = false;
+                    long number = 7;
+                    long k = 0;
+                    long index2 = 1;
+                    for (long c = 0; c < size; c++) {
+                        if (c % number == 0) {
+                            List<RowRenderData> rows = new ArrayList<>();
+                            //鍒ゆ柇妫�楠岄」鐩槸鍚︽湁鐖跺瓙鍏崇郴
+                            Boolean state = true;
+                            for (InsProduct insProduct : filteredProducts) {
+                                if (!insProduct.getInspectionItemSubclass().equals("") && insProduct.getInspectionItemSubclass() != null) {
+                                    state = false;
+                                }
+                            }
+                            int a = 1;
+                            if (!state) {
+                                a = 2;
+                            }
+                            //琛ㄦ牸鐨勮鏁�
+                            for (long i = 0; i < size2 + a; i++) {
+                                RowRenderData rowRenderData = new RowRenderData();
+
+                                RowStyle rowStyle = new RowStyle();
+                                rowStyle.setHeight(40);
+                                rowRenderData.setRowStyle(rowStyle);
+                                List<CellRenderData> cells = new ArrayList<>();
+                                //琛ㄦ牸鐨勫垪鏁�
+                                for (long j = 0; j < 9; j++) {
+                                    CellRenderData cellRenderData = new CellRenderData();
+                                    CellStyle cellStyle = new CellStyle();
+                                    cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                    cellRenderData.setCellStyle(cellStyle);
+                                    List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                    ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                    ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                    paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                    paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                    List<RenderData> renderData = new ArrayList<>();
+                                    TextRenderData textRenderData = new TextRenderData();
+                                    Style style = new Style();
+                                    style.setFontFamily("瀹嬩綋");
+                                    style.setColor("000000");
+                                    textRenderData.setStyle(style);
+                                    if (i == 0) {
+                                        //绗竴琛�
+                                        if (j == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("绠¤壊鏍嘆Pipe鈭�100");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@Scanning Number鈭�101");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //椤圭洰淇℃伅
+                                            try {
+                                                filteredProducts.get((int) (j - 2 + k));
+                                            } catch (Exception e) {
+                                                continue;
+                                            }
+                                            textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "@" + insProducts1.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (a == 2 && i == 1) {
+                                        //鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
+                                        if (j == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("绠¤壊鏍嘆Pipe鈭�100");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@Scanning Number鈭�101");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //椤圭洰淇℃伅
+                                            try {
+                                                filteredProducts.get((int) (j - 2 + k));
+                                            } catch (Exception e) {
+                                                continue;
+                                            }
+                                            //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
+                                            if (filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass().equals("") || filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() == null) {
+                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "@" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+                                            } else {
+                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() + "@" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclassEn());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else {
+                                        int aa;
+                                        if (a == 2) {
+                                            aa = (int) i - 2;
+                                        } else aa = (int) i - 1;
+                                        List<Integer> list = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().collect(Collectors.toList());
+                                        try {
+                                            insFiberMapper.selectById(list.get(aa));
+                                        } catch (Exception e) {
+                                            continue;
+                                        }
+                                        InsFiber insFiber = insFiberMapper.selectById(list.get(aa));
+                                        //濉��
+                                        if (j == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText(insFiber.getBushColor());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩鍒�
+                                            textRenderData.setText(insFiber.getColor());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //椤圭洰淇℃伅
+                                            try {
+                                                filteredProducts.get((int) (j - 2 + k));
+                                            } catch (Exception e) {
+                                                continue;
+                                            }
+                                            textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getLastValue());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    }
+                                }
+                                rowRenderData.setCells(cells);
+                                if (rowRenderData.getCells().size() != 0) {
+                                    rows.add(rowRenderData);
+                                }
+                            }
+                            TableRenderData tableRenderData = new TableRenderData();
+                            tableRenderData.setRows(rows);
+                            int countSize = tableRenderData.getRows().get(0).getCells().size();
+                            for (RowRenderData row : tableRenderData.getRows()) {
+                                /*for (CellRenderData cell : row.getCells()) {
+                                    System.out.print(cell.getParagraphs().get(0).getContents());
+                                }
+                                System.out.println("");*/
+                                if (row.getCells().size() != countSize) {
+                                    throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑4");
+                                }
+                            }
+                            TableStyle tableStyle = new TableStyle();
+                            tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                            tableStyle.setAlign(TableRowAlign.CENTER);
+                            BorderStyle borderStyle = new BorderStyle();
+                            borderStyle.setColor("000000");
+                            borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                            borderStyle.setSize(14);
+                            tableStyle.setLeftBorder(borderStyle);
+                            tableStyle.setTopBorder(borderStyle);
+                            tableStyle.setRightBorder(borderStyle);
+                            tableStyle.setBottomBorder(borderStyle);
+                            tableRenderData.setTableStyle(tableStyle);
+                            Map<String, Object> table = new HashMap<>();
+                            table.put("table2", tableRenderData);
+                            table.put("report", insReport);
+                            table.put("sample_number", sample.getSampleCode());
+                            table.put("type", sample.getModel());
+                            table.put("index2", index2);
+                            tables2.add(table);
+                            k += 7;
+                            index2++;
                         }
                     }
-                    int a = 1;
-                    if (!state) {
-                        a = 2;
-                    }
-                    //琛ㄦ牸鐨勮鏁�
-                    for (long i = 0; i < size2 + a; i++) {
-                        RowRenderData rowRenderData = new RowRenderData();
+                });
+            }
+            tables2.forEach(table2 -> {
+                table2.put("tableSize2", tables2.size());
+            });
 
-                        RowStyle rowStyle = new RowStyle();
-                        rowStyle.setHeight(40);
-                        rowRenderData.setRowStyle(rowStyle);
-                        List<CellRenderData> cells = new ArrayList<>();
-                        //琛ㄦ牸鐨勫垪鏁�
-                        for (long j = 0; j < size + 2; j++) {
-                            CellRenderData cellRenderData = new CellRenderData();
-                            CellStyle cellStyle = new CellStyle();
-                            cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
-                            cellRenderData.setCellStyle(cellStyle);
-                            List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
-                            ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
-                            ParagraphStyle paragraphStyle = new ParagraphStyle();
-                            paragraphStyle.setAlign(ParagraphAlignment.CENTER);
-                            paragraphRenderData.setParagraphStyle(paragraphStyle);
-                            List<RenderData> renderData = new ArrayList<>();
-                            TextRenderData textRenderData = new TextRenderData();
-                            Style style = new Style();
-                            style.setFontFamily("瀹嬩綋");
-                            style.setColor("000000");
-                            textRenderData.setStyle(style);
-                            if (i == 0) {
-                                //绗竴琛�
-                                if (j == 0) {
-                                    //绗竴鍒�
-                                    textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                } else if (j == 1) {
-                                    //绗簩鍒�
-                                    textRenderData.setText("鍏夌氦鑹叉爣\nScanning Number鈭�101");
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                } else {
-                                    //椤圭洰淇℃伅
-                                    textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                }
-                            } else if (a == 2 && i == 1) {
-                                //鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
-                                if (j == 0) {
-                                    //绗竴鍒�
-                                    textRenderData.setText("绠¤壊鏍嘰nPipe鈭�100");
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                } else if (j == 1) {
-                                    //绗簩鍒�
-                                    textRenderData.setText("鍏夌氦鑹叉爣\tScanning Number鈭�101");
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                } else {
-                                    //椤圭洰淇℃伅
-                                    //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
-                                    if (insProducts1.get((int) (j - 2)).getInspectionItemSubclass().equals("") || insProducts1.get((int) (j - 2)).getInspectionItemSubclass() == null) {
-                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
+            /*娓╁害寰幆鐨勬楠屾姤鍛�*/
+            //鍏堝垽鏂槸鍚︽湁娓╁害寰幆
+            List<InsProduct> insProducts3 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList()))
+                    .isNotNull(InsProduct::getInspectionItemClass)//鐢ㄦ楠屽垎椤瑰瓧娈靛尯鍒厜绾ら厤缃笌娓╁害寰幆
+                    .isNotNull(InsProduct::getInsFiberId));
+            List<Map<String, Object>> tables3 = new ArrayList<>();
+            if (insProducts3.size() > 0) {
+                samples.forEach(sample -> {
+                    //鏌ヨ娓╁害寰幆涓嬬殑妫�楠岄」鐩�
+                    List<InsProduct> insPros = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                            .eq(InsProduct::getState, 1)
+                            .eq(InsProduct::getInsSampleId, sample.getId())
+                            .isNotNull(InsProduct::getInsFiberId)
+                            .isNotNull(InsProduct::getInspectionItemClass));
+
+                    //鑾峰彇鎵�鏈夋楠岄」鐩�,鎸夌収寰幆娆℃暟,鑹叉爣,娓╁害,nm杩涜鎺掑簭
+                    Map<String, Integer> temperatureToIdMap = new HashMap<>();
+                    for (InsProduct product : insPros) {
+                        String temperature = product.getInspectionItemSubclass();
+                        int id = product.getId();
+                        temperatureToIdMap.putIfAbsent(temperature, id);
+                        if (temperatureToIdMap.get(temperature) > id) {
+                            temperatureToIdMap.put(temperature, id);
+                        }
+                    }
+
+                    // 鑷畾涔夋帓搴�
+                    Collections.sort(insPros, new Comparator<InsProduct>() {
+                        @Override
+                        public int compare(InsProduct p1, InsProduct p2) {
+                            // 棣栧厛鎸塯etInspectionItem鎺掑簭
+                            int result = p1.getInspectionItem().compareTo(p2.getInspectionItem());
+                            if (result != 0) {
+                                return result;
+                            }
+                            // 濡傛灉getInspectionItem鐩哥瓑锛屽啀鎸塯etInsFiberId鎺掑簭
+                            result = p1.getInsFiberId().compareTo(p2.getInsFiberId());
+                            if (result != 0) {
+                                return result;
+                            }
+                            // 濡傛灉getInsFiberId涔熺浉绛夛紝鏈�鍚庢寜getInspectionItemSubclass鎺掑簭
+                            return compareTemperature(p1.getInspectionItemSubclass(), p2.getInspectionItemSubclass());
+                        }
+
+                        private int compareTemperature(String temp1, String temp2) {
+                            // 鏍规嵁娓╁害瀵瑰簲鐨刬d杩涜鎺掑簭
+                            int id1 = temperatureToIdMap.get(temp1);
+                            int id2 = temperatureToIdMap.get(temp2);
+
+                            return Integer.compare(id1, id2);
+                        }
+                    });
+                    List<InsProduct> filteredProducts = insPros;
+                    //鑾峰彇鎵�鏈夊厜绾よ壊鏍�
+                    List<InsFiber> insFibers = insFiberMapper.selectBatchIds(insPros.stream().map(InsProduct::getInsFiberId).collect(Collectors.toList()));
+                    //鑾峰彇鎵�鏈夌殑娓╁害(闄や簡绗竴涓�20鈩�(甯告俯))
+                    List<String> temperature = insPros.stream().map(InsProduct::getInspectionItemSubclass).filter(s -> !s.equals("20鈩�(甯告俯)")).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夌殑娓╁害(闄や簡绗竴涓�20鈩�(甯告俯)鍜屾渶鍚庝竴涓�20鈩�)
+                    List<String> temperature2 = insPros.stream().map(InsProduct::getInspectionItemSubclass).filter(s -> !s.equals("20鈩�(甯告俯)")).filter(s -> !s.equals("20鈩�")).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夌殑鍏夌氦椤圭洰(1310nm)
+                    List<String> nm = insPros.stream().map(InsProduct::getInspectionItemClass).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夋楠岄」鐩殑鏁伴噺(鍒楁暟)(杩欓噷闇�瑕佹敞鎰忎袱涓俯搴�,涓�涓槸20鈩冨父娓�(鍙湁绗竴娆″惊鐜墠鏈�),鍙︿竴涓槸20鈩�(鍙湁鏈�鍚庝竴涓惊鐜墠鏈�))
+                    long size = insPros.stream().map(insProduct -> {
+                        return (insProduct.getInspectionItemSubclass() + insProduct.getInspectionItemClass());
+                    }).distinct().collect(Collectors.toList()).size();
+                    //鑾峰彇寰幆娆℃暟(琛ㄦ牸鐨勬暟閲�)
+                    int size1 = insPros.stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.toList()).size();
+                    //鑾峰彇鍏夌氦鑹叉爣鐨勬暟閲�(琛屾暟)
+                    long size2 = insPros.stream().map(InsProduct::getInsFiberId).distinct().count();
+                    long index3 = 1;
+                    for (int i = 0; i < size1; i++) {
+                        //鎸夌収寰幆娆℃暟鐢熸垚瀵瑰簲鏁伴噺鐨勮〃鏍�
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�(鍏夌氦鑹叉爣鐨勬暟閲�+8)
+                        for (long j = 0; j < size2 + 8; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁伴渶瑕佹牴鎹惊鐜殑娆℃暟瀵瑰簲鐨勬敼鍙�
+                            if (size1 == 1) {
+                                //濡傛灉鍙惊鐜竴娆�,閭d箞鍒楁暟鍖呮嫭20鈩冨拰20鈩冨父娓�(2 * size - nm.size()+1)
+                                for (long k = 0; k < 2 * size - nm.size() + 1; k++) {
+                                    CellRenderData cellRenderData = new CellRenderData();
+                                    CellStyle cellStyle = new CellStyle();
+                                    cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                    cellRenderData.setCellStyle(cellStyle);
+                                    List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                    ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                    ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                    paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                    paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                    List<RenderData> renderData = new ArrayList<>();
+                                    TextRenderData textRenderData = new TextRenderData();
+                                    Style style = new Style();
+                                    style.setFontFamily("瀹嬩綋");
+                                    style.setColor("000000");
+                                    textRenderData.setStyle(style);
+                                    if (j == 0) {
+                                        //绗竴琛�
+                                        if (k <= (2 * size - nm.size() + 1) / 4) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                        } else if (k > (2 * size - nm.size() + 1) / 4 && k <= (2 * size - nm.size() + 1) / 2) {
+                                            //绗簩鍒�
+                                            textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                        } else if (k > (2 * size - nm.size() + 1) / 2 && k < 2 * size - nm.size()) {
+                                            //绗笁鍒�
+                                            textRenderData.setText("瑙勬牸鍨嬪彿@Type 鈭�999");
+                                        } else {
+                                            //绗洓鍒�
+                                            textRenderData.setText(sample.getModel());
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (j == 1) {
+                                        //绗簩琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                        } else {
+                                            textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (j == 2) {
+                                        //绗笁琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒�
+                                            textRenderData.setText("20鈩�(甯告俯)鈭�1006");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鏍规嵁娓╁害寰幆
+                                            for (int i1 = 0; i1 < temperature.size(); i1++) {
+                                                if (k > (2 * i1 + 1) * nm.size() && k <= (2 * i1 + 3) * nm.size()) {
+                                                    //绗笁鍒�
+                                                    textRenderData.setText(temperature.get(i1) + "鈭�52" + i1);
+                                                    renderData.add(textRenderData);
+                                                    paragraphRenderData.setContents(renderData);
+                                                    paragraphRenderDataList.add(paragraphRenderData);
+                                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                    cells.add(cellRenderData);
+                                                }
+                                            }
+                                        }
+                                    } else if (j == 3) {
+                                        //绗洓琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒�
+                                            for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                if (k == i1 + 1) {
+                                                    textRenderData.setText(nm.get(i1));
+                                                    renderData.add(textRenderData);
+                                                    paragraphRenderData.setContents(renderData);
+                                                    paragraphRenderDataList.add(paragraphRenderData);
+                                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                    cells.add(cellRenderData);
+                                                }
+                                            }
+                                        } else {
+                                            for (int j1 = 0; j1 < temperature.size(); j1++) {
+                                                for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                    if (k > (i1 + 1 + 2 * j1) * nm.size() && k <= (i1 + 1 + 2 * j1) * nm.size() + 2) {
+                                                        textRenderData.setText(nm.get(i1));
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    } else if (j == 4) {
+                                        //绗簲琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒�
+                                            textRenderData.setText("琛板噺");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > nm.size() && (k - (nm.size())) % 2 == 0) {
+                                            textRenderData.setText("|鈭� 伪|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            textRenderData.setText("琛板噺");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 5) {
+                                        //鍊掓暟绗笁琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("|max|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            //璁$畻20鈩冨父娓╃殑绗�(k-1)涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                            List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) (k - 1)))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                            List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                            Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                            }).filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                            Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                    .stream().map(InsProduct::getLastValue)
+                                                    .filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                            List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k + 1) / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - (nm.size() + 2)) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                            List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                            Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                            }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 6) {
+                                        //鍊掓暟绗簩琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("|鈭� 伪 max|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            textRenderData.setText("-");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                    .stream().map(InsProduct::getLastValue)
+                                                    .filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            textRenderData.setText("-");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 7) {
+                                        //鍊掓暟绗竴琛�
+                                        textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
                                     } else {
-                                        textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
+                                        //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                        if (k == 0) {
+                                            //绗竴鍒楀~鍐欒壊鏍�
+                                            textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒楀~鍐�20鈩冨父娓╃殑骞冲潎鍊�(result琛ㄩ噷闈㈢殑com_value)
+                                            textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k - 1)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            //濉啓琛板噺宸氨鏄痩ast_value
+                                            textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k / 2)).getLastValue());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //濉啓鍏朵綑姝e父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                            textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + (k + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
                                     }
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
+                                }
+                                rowRenderData.setCells(cells);
+                                if (rowRenderData.getCells().size() != 0) {
+                                    rows.add(rowRenderData);
                                 }
                             } else {
-                                int aa = 0;
-                                if (a == 2) {
-                                    aa = (int) i - 2;
-                                } else aa = (int) i - 1;
-                                InsFiber insFiber = insFiberMapper.selectById(insProducts1.get(aa).getInsFiberId());
-                                //濉��
-                                if (j == 0) {
-                                    //绗竴鍒�
-                                    textRenderData.setText(insFiber.getBushColor());
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
-                                } else if (j == 1) {
-                                    //绗簩鍒�
-                                    textRenderData.setText(insFiber.getColor());
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
+                                //濡傛灉鏈夊娆″惊鐜�
+                                if (i == 0) {
+                                    //绗竴娆″惊鐜殑鍒楁暟,閭d箞鍒楁暟鍖呮嫭20鈩冨父娓�(2 * (size-nm.size()) -nm.size()+1)
+                                    for (long k = 0; k < 2 * (size - nm.size()) - nm.size() + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - nm.size()) - nm.size() + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - nm.size()) - nm.size() + 1) / 4 && k <= (2 * (size - nm.size()) - nm.size() + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - nm.size()) - nm.size() + 1) / 2 && k < 2 * (size - nm.size()) - nm.size()) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒�
+                                                textRenderData.setText("20鈩�(甯告俯)鈭�1006");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature2.size(); i1++) {
+                                                    if (k > (2 * i1 + 1) * nm.size() && k <= (2 * i1 + 3) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature2.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒�
+                                                for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                    if (k == i1 + 1) {
+                                                        textRenderData.setText(nm.get(i1));
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature2.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 1 + 2 * j1) * nm.size() && k <= (i1 + 1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒�
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > nm.size() && (k - (nm.size())) % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                //璁$畻20鈩冨父娓╃殑绗�(k-1)涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (k - 1)))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k + 1) / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - (nm.size() + 2)) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀~鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒楀~鍐�20鈩冨父娓╃殑骞冲潎鍊�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k - 1)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + k / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝e父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + (k + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
+                                } else if (i == size1 - 1) {
+                                    //鏈�鍚庝竴娆″惊鐜殑鍒楁暟,閭d箞鍒楁暟鍖呮嫭20鈩�(2 * (size-nm.size())+1)
+                                    for (long k = 0; k < 2 * (size - nm.size()) + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - nm.size()) + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - nm.size()) + 1) / 4 && k <= (2 * (size - nm.size()) + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - nm.size()) + 1) / 2 && k < 2 * (size - nm.size())) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature.size(); i1++) {
+                                                    if (k > (2 * i1) * nm.size() && k <= (2 * i1 + 2) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 2 * j1) * nm.size() && k <= (i1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (k / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - nm.size()) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀~鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + ((temperature.size() * nm.size() * size2 * i) - (size2 * nm.size() * (i - 1))) + (k - 2) / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝e父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + ((temperature.size() * nm.size() * size2 * i) - (size2 * nm.size() * (i - 1))) + ((k - 2) + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
                                 } else {
-                                    //椤圭洰淇℃伅
-                                    textRenderData.setText(insProducts1.get((int) (j - 2)).getLastValue());
-                                    renderData.add(textRenderData);
-                                    paragraphRenderData.setContents(renderData);
-                                    paragraphRenderDataList.add(paragraphRenderData);
-                                    cellRenderData.setParagraphs(paragraphRenderDataList);
-                                    cells.add(cellRenderData);
+                                    //鍏朵綑寰幆鐨勫垪鏁�,,閭d箞鍒楁暟涓嶅寘鎷�20鈩�+20鈩�(甯告俯)(2 * (size- 2*nm.size()) +1)
+                                    for (long k = 0; k < 2 * (size - 2 * nm.size()) + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - 2 * nm.size()) + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - 2 * nm.size()) + 1) / 4 && k <= (2 * (size - 2 * nm.size()) + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - 2 * nm.size()) + 1) / 2 && k < 2 * (size - 2 * nm.size())) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature2.size(); i1++) {
+                                                    if (k > (2 * i1) * nm.size() && k <= (2 * i1 + 2) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature2.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature2.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 2 * j1) * nm.size() && k <= (i1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k - 1) / (2 * nm.size())))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁$畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (k / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - nm.size()) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀~鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size() - 1) * nm.size() + (temperature.size() * nm.size() * size2) + (k - 2) / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝e父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() - 1) * nm.size() + (temperature.size() * nm.size() * size2) + ((k - 2) + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
+                                }
+                                rowRenderData.setCells(cells);
+                                if (rowRenderData.getCells().size() != 0) {
+                                    rows.add(rowRenderData);
                                 }
                             }
                         }
-                        rowRenderData.setCells(cells);
-                        if (rowRenderData.getCells().size() != 0) {
-                            rows.add(rowRenderData);
+                        TableRenderData tableRenderData = new TableRenderData();
+                        tableRenderData.setRows(rows);
+                        int countSize = tableRenderData.getRows().get(0).getCells().size();
+                        for (RowRenderData row : tableRenderData.getRows()) {
+                            /*for (CellRenderData cell : row.getCells()) {
+                                System.out.print(cell.getParagraphs().get(0).getContents());
+                            }
+                            System.out.println("");*/
+                            if (row.getCells().size() != countSize) {
+                                throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑5");
+                            }
                         }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table3", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index3", index3);
+                        tables3.add(table);
+                        index3++;
                     }
-                    TableRenderData tableRenderData = new TableRenderData();
-                    tableRenderData.setRows(rows);
-                    int countSize = tableRenderData.getRows().get(0).getCells().size();
-                    for (RowRenderData row : tableRenderData.getRows()) {
-                        /*for (CellRenderData cell : row.getCells()) {
-                            System.out.print(cell.getParagraphs().get(0).getContents());
-                        }
-                        System.out.println("");*/
-                        if (row.getCells().size() != countSize) {
-                            throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
-                        }
-                    }
-                    TableStyle tableStyle = new TableStyle();
-                    tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
-                    tableStyle.setAlign(TableRowAlign.CENTER);
-                    BorderStyle borderStyle = new BorderStyle();
-                    borderStyle.setColor("000000");
-                    borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
-                    borderStyle.setSize(14);
-                    tableStyle.setLeftBorder(borderStyle);
-                    tableStyle.setTopBorder(borderStyle);
-                    tableStyle.setRightBorder(borderStyle);
-                    tableStyle.setBottomBorder(borderStyle);
-                    tableRenderData.setTableStyle(tableStyle);
-                    Map<String, Object> table = new HashMap<>();
-                    table.put("table2", tableRenderData);
-                    table.put("report", insReport);
-                    table.put("sample_number", sample.getSampleCode());
-                    table.put("type", sample.getModel());
-                    tables2.add(table);
                 });
             }
+            tables3.forEach(table3 -> {
+                table3.put("tableSize3", tables3.size());
+            });
 
             /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
             List<Map<String, Object>> images = new ArrayList<>();
@@ -983,23 +3282,39 @@
             if (CollectionUtils.isNotEmpty(insOrderFiles)) {
                 insOrderFiles.forEach(insOrderFile -> {
                     Map<String, Object> image = new HashMap<>();
-                    PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17,20).create();
+                    PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17, 20).create();
                     image.put("url", pictureRenderData);
                     image.put("report", insReport);
                     images.add(image);
                 });
             }
-
+            //濮旀墭浜哄拰鐢佃瘽瀛楁鍒ゆ柇
+            if (ObjectUtils.isEmpty(insOrder.getPrepareUser())) {
+                insOrder.setPrepareUser("/");
+            }
+            if (ObjectUtils.isEmpty(insOrder.getPhone())) {
+                insOrder.setPhone("/");
+            }
+            //妫�楠岄」鐩殑鐜
+            InsProduct insProduct = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).eq(InsProduct::getInsSampleId, samples.get(0).getId())).get(0);
+            String environment = "";
+            environment = (ObjectUtils.isNotEmpty(insProduct.getTemperature()) ? insProduct.getTemperature() + "鈩� " : "") + (ObjectUtils.isNotEmpty(insProduct.getHumidity()) ? insProduct.getHumidity() + "%" : "");
+            String finalEnvironment = environment;
             XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
                     new HashMap<String, Object>() {{
                         put("order", insOrder);
                         put("report", insReport);
-                        put("user", user);
+                        put("environment", finalEnvironment);
                         put("custom", custom);
                         put("sampleSize", samples.size());
                         put("tables", tables);
                         put("tableSize", tables.size() + 1);
                         put("tables2", tables2);
+                        put("tableSize2", tables2.size());
+                        put("tables3", tables3);
+                        put("tableSize3", tables3.size());
+                        put("tables4", tables4);
+                        put("tableSize4", tables4.size());
                         put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
                         put("deviceList", finalDeviceList);
                         put("twoCode", Pictures.ofLocal(codePath).create());
@@ -1035,6 +3350,7 @@
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+            // 澶勭悊鍚堝苟鍗曞厓鏍肩殑闂
             String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
             try {
                 FileInputStream stream = new FileInputStream(path);
@@ -1078,11 +3394,17 @@
                         Map<String, Integer> v = maps.get(list.get(a));
                         for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
                             if (v.get("ec") > v.get("sc")) {
-                                TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                                try {
+                                    TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                                } catch (Exception e) {
+                                }
                             }
                         }
                         if (v.get("er") > v.get("sr")) {
-                            TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+                            try {
+                                TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+                            } catch (Exception e) {
+                            }
                         }
                     }
                 }
@@ -1094,11 +3416,44 @@
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+            //澶勭悊涓嫳鏂囨崲琛岀殑闂
+            try {
+                FileInputStream stream1 = new FileInputStream(path);
+                XWPFDocument document1 = new XWPFDocument(stream1);
+                List<XWPFTable> xwpfTables1 = document1.getTables();
+                for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
+                    for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
+                        for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
+                            if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
+                                String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
+                                String[] split = text.split("@");
+                                xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+                                XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
+                                XWPFRun run = xwpfParagraph.createRun();
+                                run.setText(split[0]);
+                                if (ObjectUtils.isNotNull(split[1])) {
+                                    run.addBreak();
+                                    run.setText(split[1]);
+                                }
+                                xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
+                            }
+                        }
+                    }
+                }
+                FileOutputStream fileOutputStream1 = new FileOutputStream(path);
+                document1.write(fileOutputStream1);
+                fileOutputStream1.close();
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         return 1;
     }
 
-    private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
+    private void getTemplateThing
+            (Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
         for (InsProduct product : insProducts) {
             if (product.getTemplateId() == null) {
                 product.setTemplate(new ArrayList<>());
@@ -1109,7 +3464,6 @@
                 map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
                 thing = map2.get(product.getTemplateId());
             }
-//            thing = map2.get(product.getTemplateId());
             if (StrUtil.isNotEmpty(thing)) {
                 JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
                 JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
@@ -1125,19 +3479,64 @@
     }
 
     @Override
-    public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
+    public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode) {
         List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
         List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
-        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult).isNull(InsProduct::getInsFiberId).isNull(InsProduct::getInsFibersId));
+        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                .in(InsProduct::getInsSampleId, ids)
+                .eq(InsProduct::getSonLaboratory, laboratory)
+                .eq(InsProduct::getState, 1)
+                .isNull(InsProduct::getInsResult)
+                .isNull(InsProduct::getInsFiberId)
+                .isNull(InsProduct::getInsFibersId));
         insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
         if (insProducts.size() > 0) {
             String str = "";
             int count = 0;
             for (InsProduct product : insProducts) {
-                count++;
-                str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
+                //濡傛灉鏄厜缂嗙殑娓╁害寰幆
+                if (product.getInspectionItem().equals("娓╁害寰幆") && insOrderMapper.selectById(orderId).getSampleType().equals("鍏夌紗")) {
+                    //鏌ヨ閭d簺寰幆娓╁害鐨勬楠岄」鐩殑缁撹鏄惁鍏ㄩ儴妫�楠�
+                    List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, product.getInsSampleId())
+                            .isNotNull(InsProduct::getInsFiberId).like(InsProduct::getInspectionItemSubclass, "鈩�"));
+                    List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
+                    List<Integer> tt = new ArrayList<>();
+                    tt.add(1);
+                    if (collect.contains(0)) {
+                        product.setLastValue("涓嶅悎鏍�");
+                        product.setInsResult(0);
+                    } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
+                        product.setLastValue("鍚堟牸");
+                        product.setInsResult(1);
+                    }
+                    insProductMapper.updateById(product);
+                }
+                //濡傛灉鏄儹寰幆鎴栬�呮槸娓╁崌璇曢獙
+                else if (product.getInspectionItem().equals("鐑惊鐜�") || product.getInspectionItem().equals("娓╁崌璇曢獙")){
+                    //鏌ヨ杩欎簺椤圭洰涓嬬殑鍏朵粬妫�楠岄」鐩槸鍚﹀叏閮ㄦ楠�
+                    List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                            .eq(InsProduct::getInsSampleId, product.getInsSampleId())
+                            .like(InsProduct::getInspectionItemSubclass, "娓╁害"));
+                    List<Integer> collect = insProductList.stream().filter(insProduct -> insProduct.getInsResult() != null).map(InsProduct::getInsResult).collect(Collectors.toList());
+                    List<Integer> tt = new ArrayList<>();
+                    tt.add(1);
+                    if (collect.contains(0)) {
+                        product.setLastValue("涓嶅悎鏍�");
+                        product.setInsResult(0);
+                    } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
+                        product.setLastValue("鍚堟牸");
+                        product.setInsResult(1);
+                    }
+                    insProductMapper.updateById(product);
+                }
+                else {
+                    count++;
+                    str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
+                }
             }
-            throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
+            if (ObjectUtils.isNotEmpty(str)) {
+                throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
+            }
         }
         insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3).set(InsOrderState::getVerifyUser, verifyUser));
         Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
@@ -1151,7 +3550,27 @@
         info.setViewStatus(false);
         info.setJumpPath("b1-inspect-order-plan");
         informationNotificationService.addInformationNotification(info);
-        upPlanUser(verifyUser, orderId);
+        //澶嶆牳浜�--妫�楠屽崟鐩稿叧璐熻矗浜�
+        InsSampleUser insSampleUser = new InsSampleUser();
+        insSampleUser.setUserId(verifyUser);
+        insSampleUser.setInsSampleId(orderId);
+        insSampleUser.setState(0);
+        insSampleUser.setSonLaboratory(laboratory);
+        insSampleUserMapper.insert(insSampleUser);
+        /*鏍¢獙涓�涓媟esult琛�*/
+        CompletableFuture.supplyAsync(() -> {
+            List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
+            for (Integer ip : ips) {
+                List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, ip).orderByDesc(InsProductResult::getId));
+                if (insProductResults.size() > 1) {
+                    insProductResultMapper.deleteById(insProductResults.get(0));
+                }
+            }
+            return null;
+        });
+        // 鍒犻櫎鏁伴噰閲囬泦娆℃暟
+        String key = "frequency" + ":" + entrustCode + ":" + sampleCode;
+        RedisUtil.del(key);
         return 1;
     }
 
@@ -1180,7 +3599,7 @@
             calendar.setTime(date);
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
             int day = calendar.get(Calendar.DAY_OF_MONTH);
-            return day + " " + getWeekDay(dayOfWeek);
+            return getWeekDay(dayOfWeek);
         } catch (Exception e) {
             e.printStackTrace();
         }

--
Gitblit v1.9.3