diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index d3bd0f51..7f1a6e28 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -440,7 +440,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService putEmptyData(emptyRow, 1,10); rowList.add(emptyRow); } - addTitleToRowList(fixedCol, fixedColRight, dynamicColCount, t, rowList, fieldList); + addTitleToRowList(fixedCol, fixedColRight, dynamicColCount, t, rowList, fieldList, i); //插入样品数据 addDataToRowList(fixedCol, fixedColRight, dynamicFieldList, dataList, rowList, fixedColCount_left, dynamicColCount, hasRemark); //检出限 @@ -455,11 +455,12 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService * @param * * */ - private void addTitleToRowList(JSONArray fixedCol, JSONArray fixedColRight, Integer dynamicColCount, JSONObject t, JSONArray rowList, List fieldList){ + private void addTitleToRowList(JSONArray fixedCol, JSONArray fixedColRight, Integer dynamicColCount, JSONObject t, JSONArray rowList, List fieldList, Integer groupIndex){ //处理固定列 int index = 1; String colKey = ""; //固定列-左 + for(int i=0;i