From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after

---
 inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java |  576 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 346 insertions(+), 230 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index 1593dd4..e764498 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -47,6 +47,7 @@
     @Resource
     InsSampleMapper insSampleMapper;
 
+    //杩戝満
     public void getFuSheWord1(String sonLaboratory, InsOrderFile insOrderFile) {
         //璇诲彇excel鏂囦欢鍐呭
         String excelFilePath = wordUrl + "/" + insOrderFile.getFileUrl(); // 鏇存柊涓轰綘鐨勬枃浠惰矾寰�
@@ -59,6 +60,8 @@
             Exceldata exceldata = new Exceldata();
             Map<Integer, Object> project = new HashMap<>();
             HashMap<String, Object> datas1 = new HashMap<>();
+            HashMap<String, Object> biaozhun = new HashMap<>();
+            Boolean exitLoop = false;
             for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
                 String s = "";
                 Sheet sheet = workbook.getSheetAt(i);
@@ -88,22 +91,55 @@
                                     default:
                                         System.out.print("NULL\t");
                                 }
-                            } else {
+                            }
+                            else {
                                 switch (cell.getCellType()) {
                                     case STRING:
-                                        if (StringUtils.isNotEmpty(s)) {
-                                            datas.put(s, list);
+                                        if (cell.getColumnIndex() == 1) {
+                                            if (cell.getStringCellValue().equals("鎸囨爣")) {
+                                                for (Cell cell1 : row) {
+                                                    switch (cell1.getCellType()) {
+                                                        case STRING:
+                                                            biaozhun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getStringCellValue());
+                                                            break;
+                                                        case NUMERIC:
+                                                            System.out.print(cell1.getNumericCellValue() + "\t");
+                                                            break;
+                                                        case BOOLEAN:
+                                                            System.out.print(cell1.getBooleanCellValue() + "\t");
+                                                            break;
+                                                        case FORMULA:
+                                                            System.out.print(cell1.getCellFormula() + "\t");
+                                                            break;
+                                                        default:
+                                                            System.out.print("NULL\t");
+                                                    }
+                                                }
+                                            }
+                                            exitLoop = true;
+                                            break;
                                         }
-                                        list = new ArrayList<>();
-                                        s = cell.getStringCellValue();
-                                        datas.put(s, cell.getStringCellValue());
-                                        System.out.print(cell.getStringCellValue() + "\t");
+                                        String value = "zss";
+                                        switch (row.getCell(1).getCellType()){
+                                            case STRING:
+                                                value = cell.getStringCellValue();
+                                                break;
+                                        }
+                                        if (value.equals("zss")){
+                                            if (StringUtils.isNotEmpty(s)) {
+                                                datas.put(s, list);
+                                            }
+                                            list = new ArrayList<>();
+                                            s = cell.getStringCellValue();
+                                            datas.put(s, cell.getStringCellValue());
+                                            System.out.print(cell.getStringCellValue() + "\t");
+                                        }
                                         break;
                                     case NUMERIC:
-                                        int columnIndex = cell.getColumnIndex();
-                                        Object o = project.get(columnIndex);
-                                        map.put(o.toString(), cell.getNumericCellValue());
-                                        System.out.print(cell.getNumericCellValue() + "\t");
+                                            int columnIndex = cell.getColumnIndex();
+                                            Object o = project.get(columnIndex);
+                                            map.put(o.toString(), cell.getNumericCellValue());
+                                            System.out.print(cell.getNumericCellValue() + "\t");
                                         break;
                                     case BOOLEAN:
                                         System.out.print(cell.getBooleanCellValue() + "\t");
@@ -115,12 +151,17 @@
                                         System.out.print("NULL\t");
                                 }
                             }
+                            if (exitLoop) {
+                                exitLoop = false;
+                                break;
+                            }
                             if (map.isEmpty()) {
                                 list.add(map);
                             }
                         }
                     }
                 }
+                list=list.stream().filter(map -> !map.isEmpty()).collect(Collectors.toList());
                 datas.put(s, list);
                 map1.put(sheetName, datas);
                 datas1.putAll(map1);
@@ -137,20 +178,21 @@
                     for (Map<String, Object> number : hashMaps) {
                         number.put("绔彛", s1);
                         Double o = (Double) number.get("棰戠巼");
-                        floatList.add(o);
+                        if (o != null) {
+                            floatList.add(o);
+                        }
                     }
                     Double maxValue = Collections.max(floatList);
                     Double minValue = Collections.min(floatList);
-                    if (map.get(minValue + "-" + maxValue + "-" + s) == null) {
-                        map.put(minValue + "-" + maxValue + "-" + s, s1);
+                    if (map.get(minValue + "," + maxValue + "," + s) == null) {
+                        map.put(minValue + "," + maxValue + "," + s, s1);
                     } else {
-                        Object o = map.get(minValue + "-" + maxValue + "-" + s);
-                        map.put(minValue + "-" + maxValue + "-" + s, s1 + "," + o);
+                        Object o = map.get(minValue + "," + maxValue + "," + s);
+                        map.put(minValue + "," + maxValue + "," + s, s1 + "," + o);
                     }
                 }
             }
             System.out.println(map);
-            int size = map.size();
             for (String s1 : map.keySet()) {
                 String o = map.get(s1).toString();
                 List<String> collect = Arrays.stream(o.split(",")).collect(Collectors.toList());
@@ -171,7 +213,7 @@
                 }
             }
             System.out.println(map);
-            createWord(sonLaboratory, document, exceldata, map, insOrderFile);
+            createWord(sonLaboratory, document, exceldata, map, biaozhun, insOrderFile);
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
@@ -189,151 +231,249 @@
         }
     }
 
+    //杩滃満
     public void getFuSheWord2(String sonLaboratory, InsOrderFile insOrderFile) {
         //璇诲彇excel鏂囦欢鍐呭
         String excelFilePath = wordUrl + "/" + insOrderFile.getFileUrl(); // 鏇存柊涓轰綘鐨勬枃浠惰矾寰�
-        String fileEncoding = "GBK"; // 鎴栧叾浠栫紪鐮佹牸寮忥紝濡侴BK, ISO-8859-1 绛�
-        Exceldata exceldata = new Exceldata();
-        HashMap<Integer, Object> project = new HashMap<>();
-        HashMap<String, Object> biaozhun = new HashMap<>();
-        HashMap<String, Object> pingjunzhi = new HashMap<>();
-        HashMap<String, Object> datas1 = new HashMap<>();
-        HashMap<String, Object> map2 = new HashMap<>();
-        List<Map<String, Object>> list = new ArrayList<>();
-        XWPFDocument document = new XWPFDocument();
-        String jiaodu = "";
-        String port = "";
-        try (CSVReader reader = new CSVReader(new InputStreamReader(new FileInputStream(excelFilePath), fileEncoding))) {
-            List<String[]> records = reader.readAll();
-            for (int i = 0; i < records.size(); i++) {
-                HashMap<String, Object> map1 = new HashMap<>();
-                HashMap<String, Object> pingjun = new HashMap<>();
-                String[] record = records.get(i);
-
-                for (int i1 = 0; i1 < record.length; i1++) {
-                    String value = record[i1];
-                    if (i == 0) {
-                        project.put(i1, value);
-                    }
-                    if (i == 1) {
-                        biaozhun.put(project.get(i1).toString(), value);
-                    }
-                    if (i > 2) {
-                        if (i1 == 0 && StringUtils.isNotEmpty(value)) {
-
-                            if (map2.size() != 0) {
-                                map2.put(port, list);
-                                datas1.put(jiaodu, map2);
-                                map2 = new HashMap<>();
-                            }
-                            datas1.put(value, "");
-                            jiaodu = value;
-                        } else if (i1 == 1 && StringUtils.isNotEmpty(value)) {
-                            if (list.size() != 0) {
-                                map2.put(port, list);
-                                list = new ArrayList<>();
-                            }
-                            map2.put(value, "");
-                            port = value;
-                        } else if (StringUtils.isNotEmpty(value)) {
-                            if (value.equals("鏈�澶у��") || value.equals("鏈�灏忓��") || value.equals("鎸囨爣") || value.equals("绫诲埆")) {
-                                break;
-                            } else if (value.equals("骞冲潎鍊�")) {
-                                for (int i2 = 0; i2 < record.length; i2++) {
-                                    String value1 = record[i2];
-                                    if (value1.equals("骞冲潎鍊�")) {
-                                        continue;
-                                    }
-                                    pingjun.put(project.get(i2).toString(), value1);
-                                }
-                                break;
-                            }
-                            map1.put(project.get(i1).toString(), value);
-                        }
-                    }
-                    System.out.print(value + " ");
-                }
-                if (map1.size() != 0) {
-                    list.add(map1);
-                }
-                if (pingjun.size() != 0) {
-                    pingjunzhi.put(jiaodu, pingjun);
-                }
-                if (i == records.size() - 1) {
-                    map2.put(port, list);
-                    datas1.put(jiaodu, map2);
-                }
-                System.out.println();
-            }
-            System.out.println("-----------------");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        exceldata.setProject(project);
-        exceldata.setDataRow(datas1);
-        System.out.println(exceldata);
-
-
-        HashMap<String, Object> map = new HashMap<>();
-        for (String s : datas1.keySet()) {
-            Map<String, List<HashMap<String, Object>>> numbers = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
-            for (String s1 : numbers.keySet()) {
-                List<HashMap<String, Object>> hashMaps = numbers.get(s1);
-
-                List<Integer> floatList = new ArrayList<>();
-                for (Map<String, Object> number : hashMaps) {
-                    number.put("绔彛", s1);
-                    floatList.add(Integer.parseInt((String) number.get("娴嬭瘯棰戠巼(MHZ)")));
-                }
-                Integer maxValue = Collections.max(floatList);
-                Integer minValue = Collections.min(floatList);
-
-                if (map.get(minValue + "-" + maxValue + "-" + s) == null) {
-                    map.put(minValue + "-" + maxValue + "-" + s, s1);
-                } else {
-                    Object o = map.get(minValue + "-" + maxValue + "-" + s);
-                    map.put(minValue + "-" + maxValue + "-" + s, s1 + "," + o);
-                }
-            }
-
-        }
-        System.out.println(map);
-
-        int size = map.size();
-        for (String s1 : map.keySet()) {
-            String o = map.get(s1).toString();
-
-            List<String> collect = Arrays.stream(o.split(",")).collect(Collectors.toList());
-            int size1 = -1;
-
-            for (String s : datas1.keySet()) {
-                Map<String, List<HashMap<String, Object>>> o1 = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
-                for (String s3 : o1.keySet()) {
-                    List<HashMap<String, Object>> numbers = o1.get(s3);
-                    for (String s2 : collect) {
-                        if (s3.equals(s2)) {
-                            if (numbers.size() > size1) {
-                                size1 = numbers.size();
-                            }
-                        }
-                    }
-                    map.put(s1, o + "," + size1);
-                }
-            }
-
-        }
-        System.out.println(map);
+        FileInputStream fileInputStream = null;
+        Workbook workbook = null;
 
         try {
-            createWord2(sonLaboratory, document, exceldata, map, pingjunzhi, biaozhun, insOrderFile);
+            fileInputStream = new FileInputStream(new File(excelFilePath));
+            workbook = new XSSFWorkbook(fileInputStream); // 瀵逛簬 .xlsx 鏂囦欢
+            XWPFDocument document = new XWPFDocument();
+            for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
+                Exceldata exceldata = new Exceldata();
+                HashMap<Integer, Object> project = new HashMap<>();
+                HashMap<String, Object> biaozhun = new HashMap<>();
+                HashMap<String, Object> pingjunzhi = new HashMap<>();
+                HashMap<String, Object> datas1 = new HashMap<>();
+                HashMap<String, Object> map2 = new HashMap<>();
+                List<Map<String, Object>> list = new ArrayList<>();
+                String jiaodu = "";
+                String port = "";
+                Integer count = 0;
+                Sheet sheet = workbook.getSheetAt(i);
+                Boolean biaoji = false;
+                int lastRowNum = sheet.getLastRowNum();
+                for (Row row : sheet) {
+                    count++;
+                    HashMap<String, Object> map1 = new HashMap<>();
+                    HashMap<String, Object> pingjun = new HashMap<>();
+                    for (Cell cell : row) {
+                        if (row.getRowNum() == 0) {
+                            switch (cell.getCellType()) {
+                                case STRING:
+                                    project.put(cell.getColumnIndex(), cell.getStringCellValue());
+                                    System.out.print(cell.getStringCellValue() + "\t");
+                                    break;
+                                case NUMERIC:
+                                    System.out.print(cell.getNumericCellValue() + "\t");
+                                    break;
+                                case BOOLEAN:
+                                    System.out.print(cell.getBooleanCellValue() + "\t");
+                                    break;
+                                case FORMULA:
+                                    System.out.print(cell.getCellFormula() + "\t");
+                                    break;
+                                default:
+                                    System.out.print("NULL\t");
+                            }
+                        } else if (row.getRowNum() > 2) {
+                            if (cell.getColumnIndex() == 0 && StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                if (map2.size() != 0) {
+                                    map2.put(port, list);
+                                    datas1.put(jiaodu, map2);
+                                    map2 = new HashMap<>();
+                                }
+                                datas1.put(cell.getStringCellValue(), "");
+                                jiaodu = cell.getStringCellValue();
+                            } else if (cell.getColumnIndex() == 1 && StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                if (list.size() != 0) {
+                                    map2.put(port, list);
+                                    list = new ArrayList<>();
+                                }
+                                map2.put(cell.getStringCellValue(), "");
+                                port = cell.getStringCellValue();
+
+                            } else {
+                                switch (cell.getCellType()) {
+                                    case STRING:
+                                        String value = cell.getStringCellValue();
+                                        if (value.equals("avg")) {
+                                            for (Cell cell1 : row) {
+                                                switch (cell1.getCellType()) {
+                                                    case STRING:
+
+                                                        break;
+                                                    case NUMERIC:
+                                                        pingjun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getNumericCellValue());
+                                                        System.out.print(cell1.getNumericCellValue() + "\t");
+                                                        break;
+                                                    case BOOLEAN:
+                                                        System.out.print(cell1.getBooleanCellValue() + "\t");
+                                                        break;
+                                                    case FORMULA:
+                                                        String cellFormula = cell1.getCellFormula();
+                                                        Double numericCellValue = cell1.getNumericCellValue();
+                                                        pingjun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getNumericCellValue());
+                                                        System.out.print(cellFormula);
+                                                        break;
+                                                    default:
+                                                        System.out.print("NULL\t");
+                                                }
+
+                                            }
+                                        } else if (value.equals("鎸囨爣")) {
+                                            for (Cell cell1 : row) {
+                                                switch (cell1.getCellType()) {
+                                                    case STRING:
+                                                        biaozhun.put(project.get(cell1.getColumnIndex()).toString(), cell1.getStringCellValue());
+                                                        break;
+                                                    case NUMERIC:
+                                                        System.out.print(cell1.getNumericCellValue() + "\t");
+                                                        break;
+                                                    case BOOLEAN:
+                                                        System.out.print(cell1.getBooleanCellValue() + "\t");
+                                                        break;
+                                                    case FORMULA:
+                                                        System.out.print(cell1.getCellFormula() + "\t");
+                                                        break;
+                                                    default:
+                                                        System.out.print("NULL\t");
+                                                }
+                                            }
+                                        } else {
+                                            biaoji = true;
+                                        }
+                                        break;
+                                    case NUMERIC:
+                                        map1.put(project.get(cell.getColumnIndex()).toString(), cell.getNumericCellValue());
+                                        System.out.print(cell.getNumericCellValue() + "\t");
+                                        break;
+                                    case BOOLEAN:
+                                        System.out.print(cell.getBooleanCellValue() + "\t");
+                                        break;
+                                    case FORMULA:
+                                        System.out.print(cell.getCellFormula() + "\t");
+                                        break;
+                                    default:
+                                        System.out.print("NULL\t");
+                                }
+                            }
+                        }
+                        if (biaoji) {
+                            biaoji = false;
+                            break;
+                        }
+                    }
+                    if (map1.size() != 0) {
+                        list.add(map1);
+                    }
+                    if (pingjun.size() != 0) {
+                        pingjunzhi.put(jiaodu, pingjun);
+                    }
+
+                    if (count == lastRowNum + 1) {
+                        map2.put(port, list);
+                        datas1.put(jiaodu, map2);
+                    }
+                    System.out.println();
+                }
+                exceldata.setProject(project);
+                exceldata.setDataRow(datas1);
+                System.out.println(exceldata);
+
+
+                HashMap<String, Object> map = new HashMap<>();
+                for (String s : datas1.keySet()) {
+                    Map<String, List<HashMap<String, Object>>> numbers = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
+                    for (String s1 : numbers.keySet()) {
+                        List<HashMap<String, Object>> hashMaps = numbers.get(s1);
+                        List<Integer> floatList = new ArrayList<>();
+                        for (Map<String, Object> number : hashMaps) {
+                            number.put("绔彛", s1);
+                            Double o = (Double) number.get("娴嬭瘯棰戠巼(MHZ)");
+                            floatList.add(o.intValue());
+                        }
+                        Integer maxValue = Collections.max(floatList);
+                        Integer minValue = Collections.min(floatList);
+
+                        if (map.get(minValue + "-" + maxValue + "-" + s) == null) {
+                            map.put(minValue + "-" + maxValue + "-" + s, s1);
+                        } else {
+                            Object o = map.get(minValue + "-" + maxValue + "-" + s);
+                            map.put(minValue + "-" + maxValue + "-" + s, s1 + "," + o);
+                        }
+                    }
+
+                }
+                System.out.println(map);
+
+                for (String s1 : map.keySet()) {
+                    String o = map.get(s1).toString();
+                    List<String> collect = Arrays.stream(o.split(",")).collect(Collectors.toList());
+                    int size1 = -1;
+                    for (String s : datas1.keySet()) {
+                        Map<String, List<HashMap<String, Object>>> o1 = (Map<String, List<HashMap<String, Object>>>) datas1.get(s);
+                        for (String s3 : o1.keySet()) {
+                            List<HashMap<String, Object>> numbers = o1.get(s3);
+                            for (String s2 : collect) {
+                                if (s3.equals(s2)) {
+                                    if (numbers.size() > size1) {
+                                        size1 = numbers.size();
+                                    }
+                                }
+                            }
+                            map.put(s1, o + "," + size1);
+                        }
+                    }
+
+                }
+                System.out.println(map);
+
+                createWord2(sonLaboratory, document, exceldata, map, pingjunzhi, biaozhun, insOrderFile);
+
+            }
+            // 杈撳嚭鍒版枃浠�
+            InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
+            String[] split = insOrderFile.getFileName().split("\\.");
+            String name = insOrderFile.getFileName().replace("#", "&").substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
+            String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "_" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
+            url = url.replace("#", "&");
+            FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
+            document.write(out);
+            out.close();
+            document.close();
+            InsOrderFile orderFile = new InsOrderFile();
+            orderFile.setInsOrderId(insOrderFile.getInsOrderId());
+            orderFile.setInsSampleId(insOrderFile.getInsSampleId());
+            orderFile.setFileUrl(url);
+            orderFile.setType(2);
+            orderFile.setFileName(insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+            orderFile.setSonLaboratory(sonLaboratory);
+            insOrderFileMapper.insert(orderFile);
+
         } catch (IOException e) {
             e.printStackTrace();
-        }
+        } finally {
+            // 鍏抽棴璧勬簮
+            try {
+                if (workbook != null) {
+                    workbook.close();
+                }
+                if (fileInputStream != null) {
+                    fileInputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
 
+        }
     }
 
-
-    public void createWord(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, InsOrderFile insOrderFile) throws IOException {
+    //杩戝満
+    public void createWord(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, HashMap<String, Object> bz, InsOrderFile insOrderFile) throws IOException {
         int size = 1;
         XWPFParagraph paragraphs = document.createParagraph();
         XWPFRun runs = paragraphs.createRun();
@@ -341,8 +481,8 @@
         runs.setText("杈愬皠鏂瑰悜鍥惧弬鏁�");
         for (String s : map.keySet()) {
             Map<String, Object> dataRow = exceldata.getDataRow();
-            String result = s.substring(s.lastIndexOf("-") + 1);
-            String result1 = s.substring(0, s.lastIndexOf("-"));
+            String result = s.substring(s.lastIndexOf(",") + 1);
+            String result1 = s.substring(0, s.lastIndexOf(","));
             String o = map.get(s).toString();
             String[] split = o.split(",");
             Integer s1 = Integer.parseInt(split[split.length - 1]);
@@ -385,7 +525,7 @@
             XWPFParagraph paragraph18 = table1.getRow(1).getCell(0).getParagraphArray(0);
             paragraph18.setAlignment(ParagraphAlignment.CENTER);
             XWPFRun run18 = paragraph18.createRun();
-            run18.setText("棰戞锛� " + result1 + "MHz " + "涓嬪�捐" + result);
+            run18.setText("涓嬪�捐" + result);
             List<String> collect = Arrays.stream(split).collect(Collectors.toList());
             List<Map<String, Object>> list = new ArrayList<>();
             // 瀵规墍鏈夌殑閿仛鍚�
@@ -442,20 +582,26 @@
                 paragraph1.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run1 = paragraph1.createRun();
                 run1.setText(s2);
-                // 璋冪敤鏂规硶鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
-                String firstContent = extractFirstContentFromBrackets(s2);
-                if (firstContent != null) {
-                    XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
-                    paragraph2.setAlignment(ParagraphAlignment.CENTER);
-                    XWPFRun run2 = paragraph2.createRun();
-                    run2.setText(firstContent);
+                // 鍗曚綅
+                XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
+                XWPFRun run2 = paragraph2.createRun();
+                if (s2.contains("澧炵泭")) {
+                    run2.setText("dBi");
+                } else if (s2.contains("娉㈢摚瀹藉害") || s2.contains("娉㈡潫瀹藉害") || s2.contains("涓嬪�捐")) {
+                    run2.setText("掳");
+                } else if (s2.contains("鍓嶅悗姣�") || s2.contains("浜ゅ弶鏋佸寲") || s2.contains("鏃佺摚鎶戝埗") || s2.contains("涓嬮檷") || s2.contains("闆剁偣濉厖") || s2.contains("鍓摚鐢靛钩")) {
+                    run2.setText("dB");
+                } else if (s2.contains("鏁堢巼") || s2.contains("鎵囧尯鍗犳瘮")) {
+                    run2.setText("%");
                 } else {
-                    System.out.println("娌℃湁鎵惧埌鎷彿鍐呯殑鍐呭銆�");
+                    run2.setText("");
                 }
                 XWPFParagraph paragraph3 = table.getRow(0).getCell(3).getParagraphArray(0);
                 paragraph3.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run3 = paragraph3.createRun();
-                run3.setText("/");
+                if (bz.get(s2) != null) {
+                    run3.setText(bz.get(s2).toString());
+                } else run3.setText("");
                 XWPFParagraph paragraph4 = table.getRow(0).getCell(4).getParagraphArray(0);
                 paragraph4.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run4 = paragraph4.createRun();
@@ -467,7 +613,7 @@
                 XWPFParagraph paragraph6 = table.getRow(0).getCell(cell - 1).getParagraphArray(0);
                 paragraph6.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run6 = paragraph6.createRun();
-                run6.setText("/");
+                run6.setText("鍒ゅ畾");
                 XWPFParagraph paragraph7 = table.getRow(2).getCell(cell - 1).getParagraphArray(0);
                 paragraph7.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run7 = paragraph7.createRun();
@@ -479,7 +625,7 @@
                 XWPFParagraph paragraph9 = table.getRow(row - 1).getCell(cell - 1).getParagraphArray(0);
                 paragraph9.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run9 = paragraph9.createRun();
-                run9.setText("/");
+                run9.setText("");
                 for (int i = 0; i < collect.size(); i++) {
                     String s3 = collect.get(i);
                     if (s3.contains("绔彛")) {
@@ -528,15 +674,17 @@
         try {
             InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
             String[] split = insOrderFile.getFileName().split("\\.");
-            String name = insOrderFile.getFileName().substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
-            FileOutputStream out = new FileOutputStream(wordUrl + "/" + UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+            String name = insOrderFile.getFileName().replace('#', '&').substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
+            String url = UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx";
+            url.replace("#", "&");
+            FileOutputStream out = new FileOutputStream(wordUrl + "/" + url);
             document.write(out);
             out.close();
             document.close();
             InsOrderFile orderFile = new InsOrderFile();
             orderFile.setInsOrderId(insOrderFile.getInsOrderId());
             orderFile.setInsSampleId(insOrderFile.getInsSampleId());
-            orderFile.setFileUrl(UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
+            orderFile.setFileUrl(url);
             orderFile.setType(2);
             orderFile.setFileName(insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
             orderFile.setSonLaboratory(sonLaboratory);
@@ -546,6 +694,7 @@
         }
     }
 
+    //杩滃満
     public void createWord2(String sonLaboratory, XWPFDocument document, Exceldata exceldata, HashMap<String, Object> map, HashMap<String, Object> pj, HashMap<String, Object> bz, InsOrderFile insOrderFile) throws IOException {
         int size = 1;
         for (String s : map.keySet()) {
@@ -591,12 +740,11 @@
 
             XWPFParagraph paragraph18 = table1.getRow(1).getCell(0).getParagraphArray(0);
             XWPFRun run18 = paragraph18.createRun();
-            run18.setText("棰戞锛� " + result1 + "MHz " + "涓嬪�捐" + result);
+            run18.setText("涓嬪�捐" + result);
 
 
             List<String> collect = Arrays.stream(split).collect(Collectors.toList());
-
-            int size1 = 0;
+            collect.sort((o1, o21) -> Integer.parseInt(o1.substring((o1.length() - 1))) - Integer.parseInt(o21.substring(o21.length() - 1)));
 
             List<Map<String, Object>> list = new ArrayList<>();
 
@@ -633,14 +781,6 @@
                 XWPFTable table = document.createTable(row, cell);
                 table.setWidth("100%");
 
-
-
-
-
-           /* // 鍚堝苟鍗曞厓鏍�
-            mergeCellsHorizontally(table, 0, 0, 7);*/
-
-
                 //鍨傜洿
                 mergeCellsVertically(table, 0, 0, row - 1);
                 mergeCellsVertically(table, 1, 0, row - 1);
@@ -663,32 +803,42 @@
                 XWPFRun run1 = paragraph1.createRun();
                 run1.setText(s2);
 
-                // 璋冪敤鏂规硶鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
-                String firstContent = extractFirstContentFromBrackets(s2);
-                if (firstContent != null) {
-                    XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
-                    XWPFRun run2 = paragraph2.createRun();
-                    run2.setText(firstContent);
+                // 鍗曚綅
+                XWPFParagraph paragraph2 = table.getRow(0).getCell(2).getParagraphArray(0);
+                XWPFRun run2 = paragraph2.createRun();
+                if (s2.contains("澧炵泭")) {
+                    run2.setText("dBi");
+                } else if (s2.contains("娉㈢摚瀹藉害") || s2.contains("娉㈡潫瀹藉害") || s2.contains("涓嬪�捐")) {
+                    run2.setText("掳");
+                } else if (s2.contains("鍓嶅悗姣�") || s2.contains("浜ゅ弶鏋佸寲") || s2.contains("鏃佺摚鎶戝埗") || s2.contains("涓嬮檷") || s2.contains("闆剁偣濉厖") || s2.contains("鍓摚鐢靛钩")) {
+                    run2.setText("dB");
+                } else if (s2.contains("鏁堢巼") || s2.contains("鎵囧尯鍗犳瘮")) {
+                    run2.setText("%");
                 } else {
-                    System.out.println("娌℃湁鎵惧埌鎷彿鍐呯殑鍐呭銆�");
+                    run2.setText("");
                 }
 
 
                 XWPFParagraph paragraph3 = table.getRow(0).getCell(3).getParagraphArray(0);
+                paragraph3.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run3 = paragraph3.createRun();
-                run3.setText(bz.get(s2).toString());
+                if (bz.get(s2) != null) {
+                    run3.setText(bz.get(s2).toString());
+                } else run3.setText("");
+
 
                 XWPFParagraph paragraph4 = table.getRow(0).getCell(4).getParagraphArray(0);
                 XWPFRun run4 = paragraph4.createRun();
                 run4.setText("棰戠巼锛圡Hz锛�");
 
                 XWPFParagraph paragraph5 = table.getRow(0).getCell(5).getParagraphArray(0);
+                paragraph5.setAlignment(ParagraphAlignment.CENTER);
                 XWPFRun run5 = paragraph5.createRun();
                 run5.setText("绔彛");
 
                 XWPFParagraph paragraph6 = table.getRow(0).getCell(cell - 1).getParagraphArray(0);
                 XWPFRun run6 = paragraph6.createRun();
-                run6.setText("/");
+                run6.setText("鍒ゅ畾");
 
                 XWPFParagraph paragraph7 = table.getRow(1).getCell(cell - 1).getParagraphArray(0);
                 XWPFRun run7 = paragraph7.createRun();
@@ -701,7 +851,7 @@
 
                 XWPFParagraph paragraph9 = table.getRow(row - 1).getCell(cell - 1).getParagraphArray(0);
                 XWPFRun run9 = paragraph9.createRun();
-                run9.setText("/");
+                run9.setText("");
 
                 for (int i = 0; i < collect.size(); i++) {
                     String s3 = collect.get(i);
@@ -713,7 +863,10 @@
                 }
 
                 Map<Integer, List<Map<String, Object>>> group = mapList.stream()
-                        .collect(Collectors.groupingBy(item -> Integer.parseInt(item.get("娴嬭瘯棰戠巼(MHZ)").toString())));
+                        .collect(Collectors.groupingBy(item -> {
+                            Double aDouble = (Double) item.get("娴嬭瘯棰戠巼(MHZ)");
+                            return aDouble.intValue();
+                        }));
 
 
                 int hang = 2;
@@ -744,34 +897,11 @@
                 XWPFParagraph paragraph11 = table.getRow(row - 1).getCell(5).getParagraphArray(0);
                 XWPFRun run11 = paragraph11.createRun();
                 double v = count / (Double.parseDouble(s1.toString()) * Double.parseDouble(i1.toString()));
-                run11.setText(o2.get(s2).toString());
+                run11.setText(String.format("%.2f",(double)o2.get(s2)));
 
                 size++;
             }
         }
-
-
-        // 杈撳嚭鍒版枃浠�
-        try {
-            InsSample insSample = insSampleMapper.selectById(insOrderFile.getInsSampleId());
-            String[] split = insOrderFile.getFileName().split("\\.");
-            String name = insOrderFile.getFileName().replace("#", "&").substring(0, (insOrderFile.getFileName().length() - split[split.length - 1].length()));
-            FileOutputStream out = new FileOutputStream(wordUrl + "/" + UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
-            document.write(out);
-            out.close();
-            document.close();
-            InsOrderFile orderFile = new InsOrderFile();
-            orderFile.setInsOrderId(insOrderFile.getInsOrderId());
-            orderFile.setInsSampleId(insOrderFile.getInsSampleId());
-            orderFile.setFileUrl(UUID.randomUUID() + "_" + insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
-            orderFile.setType(2);
-            orderFile.setFileName(insSample.getSampleCode() + "&" + sonLaboratory + name + "瑙f瀽鐨勮緪灏勭珯鐐规姤鍛�.docx");
-            orderFile.setSonLaboratory(sonLaboratory);
-            insOrderFileMapper.insert(orderFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
     }
 
 
@@ -797,20 +927,6 @@
                 table.getRow(i).getCell(col).getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.CONTINUE);
             }
         }
-    }
-
-    // 鎻愬彇绗竴涓嫭鍙峰唴鐨勫唴瀹�
-    public static String extractFirstContentFromBrackets(String str) {
-        // 瀹氫箟姝e垯琛ㄨ揪寮忥紝鍖归厤鎷彿鍐呯殑鍐呭锛屽悓鏃舵敮鎸佷腑鏂囧拰鑻辨枃鎷彿
-        Pattern pattern = Pattern.compile("\\锛�(.*?)\\锛墊\\((.*?)\\)");
-        Matcher matcher = pattern.matcher(str);
-
-        // 鏌ユ壘绗竴涓尮閰嶇殑鍐呭
-        if (matcher.find()) {
-            // 鑾峰彇鎷彿鍐呯殑鍐呭锛屽垽鏂槸涓枃鎷彿杩樻槸鑻辨枃鎷彿
-            return matcher.group(1) != null ? matcher.group(1) : matcher.group(2);
-        }
-        return null; // 濡傛灉娌℃湁鎵惧埌鍖归厤椤癸紝鍒欒繑鍥瀗ull
     }
 
 }

--
Gitblit v1.9.3