tx-lims-after.git

			@@ -2328,7 +2328,8 @@
			}
			result2VOS.add(insProductResult2VO1);
			}
			} else {
			}
			else {
			insProductResult2VO.setValue(value.replace("\"", ""));
			result2VOS.add(insProductResult2VO);
			}
			@@ -2741,103 +2742,11 @@
			));
			insOrderDocFiles.addAll(insOrderFiles);
			radiationReportNum = insOrderFiles.size();
			// if (insOrderFiles.size() > 0) {
			// int aa = 0;
			// for (InsOrderFile insOrderFile : insOrderFiles) {
			// try {
			// XWPFDocument circuitParamsDoc = new XWPFDocument(new FileInputStream(wordUrl + "/" + insOrderFile.getFileUrl()));
			// // 遍历电路参数文件的所有元素，段落和表格
			// for (IBodyElement element : circuitParamsDoc.getBodyElements()) {
			// Map<String, Object> table3 = new HashMap<>();
			// TableRenderData tableData = new TableRenderData();
			// List<RowRenderData> rows = new ArrayList<>();
			// if (element instanceof XWPFTable) {
			// aa += 1;
			// XWPFTable tab = (XWPFTable) element;
			// List<XWPFTableRow> row = tab.getRows();
			// for (int i = 0; i < row.size(); i++) {
			// RowRenderData rowRenderData = new RowRenderData();
			// List<CellRenderData> cells = new ArrayList<>();
			// List<XWPFTableCell> cell = row.get(i).getTableCells();
			// for (int j = 0; j < cell.size(); j++) {
			// CellRenderData cellRenderData = new CellRenderData();
			// 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);
			// CTTcPr tcPr = cell.get(j).getCTTc().getTcPr();
			// if (tcPr != null) {
			// //合并列
			// CTHMerge hMerge = tcPr.getHMerge();
			// if (ObjectUtils.isNotEmpty(hMerge)) {
			// if (STMerge.RESTART.equals(hMerge.getVal()) \|\| STMerge.CONTINUE.equals(hMerge.getVal())) {
			// int index = j;
			// String text = null;
			// while (text == null \|\| text.equals("")) {
			// if (index < 0) {
			// text = "/";
			// }
			// text = cell.get(index).getText();
			// index--;
			// }
			// textRenderData.setText(text + "∑88" + aa + i);
			// }
			// }
			// //合并行
			// CTVMerge vMerge = tcPr.getVMerge();
			// if (ObjectUtils.isNotEmpty(vMerge)) {
			// if (STMerge.RESTART.equals(vMerge.getVal()) \|\| STMerge.CONTINUE.equals(vMerge.getVal())) {
			// int index = i;
			// String text = null;
			// while (text == null \|\| text.equals("")) {
			// if (index < 0) {
			// text = "/";
			// break;
			// }
			// text = row.get(index).getCell(j).getText();
			// index--;
			// }
			// if (text.equals("合格") \|\| text.equals("不合格")) {
			// textRenderData.setText(text + "∑25" + aa + j);
			// } else {
			// textRenderData.setText(text + "∑22" + aa + j);
			// }
			// }
			// }
			// } else {
			// textRenderData.setText(cell.get(j).getText());
			// }
			// renderData.add(textRenderData);
			// paragraphRenderData.setContents(renderData);
			// paragraphRenderDataList.add(paragraphRenderData);
			// cellRenderData.setParagraphs(paragraphRenderDataList);
			// cells.add(cellRenderData);
			// }
			// rowRenderData.setCells(cells);
			// rows.add(rowRenderData);
			// }
			// tableData.setRows(rows);
			// table3.put("table3", tableData);
			// tables3.add(table3);
			// }
			// }
			// } catch (IOException e) {
			// e.printStackTrace();
			// }
			// }
			// }
			}
			//辐射的标题
			String title3 = "";
			if (radiationReportNum > 0) {
			title3 = "辐射方向图参数";
			title3 = "辐射性能参数";
			}
			//环境表格
			List<Map<String, Object>> tables4 = new ArrayList<>();
			@@ -3268,7 +3177,7 @@
			private void getWord1(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
			AtomicInteger lable = new AtomicInteger(1);
			AtomicInteger index = new AtomicInteger();
			String title = term + "电路参数";
			String title = term + "电性能参数";
			InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
			//查询项目
			List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
			@@ -3585,8 +3494,9 @@
			if (i % 2 == 0) {
			//最差值
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			String text = value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))];
			try {
			textRenderData.setText(value.split(",")[(j - 5) + (i - 1) / 2 * (Math.min(ports, 8))]);
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3674,7 +3584,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - cc - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3686,7 +3597,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - cc - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3766,7 +3678,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3778,7 +3691,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (dd == 0 ? cc : dd) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3858,7 +3772,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3870,7 +3785,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3950,7 +3866,8 @@
			} else if (j % 2 == 0) {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "∑5" + i + (j - 6));
			String text = value.split(",")[(j - 6) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -3962,7 +3879,8 @@
			} else {
			String value = result2s.get(0).getValue().replaceAll("[\\[\\]\"]", "");
			try {
			textRenderData.setText(value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4] + "∑5" + i + (j - 5));
			String text = value.split(",")[(j - 5) / 2 + (i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) - 1) * 4];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4053,7 +3971,8 @@
			String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
			String[] split = value[(i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 2) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
			String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4157,7 +4076,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))]);
			String text = split[(j - 5) + ((i + (angles - 1)) / (angles + 1) - 1) * (Math.min(ports, 8))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4272,13 +4192,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - cc) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4395,13 +4317,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (dd == 0 ? cc : dd)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4518,13 +4442,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (ee == 0 ? ((dd == 0 ? cc : dd)) : ee)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4640,13 +4566,15 @@
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			if (j % 2 == 0) {
			try {
			textRenderData.setText(split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 6));
			String text = split[(j - 6) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 6));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			} else {
			try {
			textRenderData.setText(split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)] + "∑5" + i + (j - 5));
			String text = split[(j - 5) / 2 + ((i - (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff)) / (angles + 2)) * (ports > 8 ? 4 : (ports + 1) / 2)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)) + "∑5" + i + (j - 5));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4745,7 +4673,8 @@
			String[] value = result2s.get((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg)) / portRow / (angles + 2)).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))]);
			String text = split[((j - 5) + ((i - (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) - 1) / (angles + 1) % portRow) * (Math.min(ports, 8)))];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -4841,7 +4770,12 @@
			//最差值
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			textRenderData.setText(split[0] + "∑7" + i);
			String text = split[0];
			if (ObjectUtils.isEmpty(text)){
			textRenderData.setText("" + "∑7" + i);
			}else {
			textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "∑7" + i);
			}
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -4934,7 +4868,12 @@
			//最差值
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			textRenderData.setText(split[0] + "∑7" + i);
			String text = split[0];
			if (ObjectUtils.isEmpty(text)){
			textRenderData.setText("" + "∑7" + i);
			}else {
			textRenderData.setText(String.format("%.2f", Double.parseDouble(text)) + "∑7" + i);
			}
			}
			renderData.add(textRenderData);
			paragraphRenderData.setContents(renderData);
			@@ -5036,7 +4975,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn)) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5143,7 +5083,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - (pp == 0 ? (nn == 0 ? (mm == 0 ? (hh == 0 ? (gg == 0 ? (ff == 0 ? (ee == 0 ? ((dd == 0 ? cc : dd)) : ee) : ff) : gg) : hh) : mm) : nn) : pp)) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5250,7 +5191,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - rr) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5356,7 +5298,8 @@
			String[] value = result2s.get(0).getValue().split("\\],\\[");
			String[] split = value[(i + (angles - 1)) % (angles + 1)].replaceAll("[\\[\\]\"]", "").split(",");
			try {
			textRenderData.setText(split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)]);
			String text = split[(j - 5) + ((i - ss) / (angles + 2)) * Math.min(length, 8)];
			textRenderData.setText(String.format("%.2f",Double.parseDouble(text)));
			} catch (Exception e) {
			textRenderData.setText("");
			}
			@@ -5409,7 +5352,7 @@
			//电路报告用于总报告的方法(无源器件)
			private void getWord2(String term, InsOrderState insOrderState, List<Map<String, Object>> tables2) {
			AtomicInteger index = new AtomicInteger();
			String title = term + "电路参数";
			String title = term + "电性能参数";
			//查询样品
			InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
			//查询项目
			@@ -5441,7 +5384,7 @@
			List<RowRenderData> rows = new ArrayList<>();
			Set<String> itemSet = new HashSet<>();
			//表格的行数
			for (int i = 0; i < result2VOS.size()+1; i++) {
			for (int i = 0; i < result2VOS.size(); i++) {
			RowRenderData rowRenderData = new RowRenderData();
			RowStyle rowStyle = new RowStyle();
			rowStyle.setHeight(40);