diff --git a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
index d10d675..d63293f 100644
--- a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
+++ b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
@@ -435,9 +435,15 @@ public class PrimaryDataAppController {
 		}
 		for (int i = 0; i < cellIndexArr.length; i++) {
 			if (i % 2 == 0) {
-				sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
+				if(cellIndexArr[i] != cellIndexArr[i]){
+					sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
+				}
+//				sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
 			} else {
-				sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
+				if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
+					sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
+				}
+//				sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
 			}
 		}
 		sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 0));
@@ -516,7 +522,10 @@ public class PrimaryDataAppController {
 			ConfigItemsVo itemsVo = configItemsVos.get(i);
 			itemsIndex += itemsVo.getExperNum();
 			r6 = setCellValueAndStyle(r6, csItemsIndex, itemsVo.getExperTypeName(), commonStyle);
-			sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
+			if(csItemsIndex != itemsIndex){
+				sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
+			}
+//			sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
 			for (int j = csItemsIndex + 1; j < csItemsIndex + itemsVo.getExperNum(); j++) {
 				r6 = setCellValueAndStyle(r6, j, "", commonStyle);
 			}
@@ -544,9 +553,9 @@ public class PrimaryDataAppController {
 		r7 = setCellValueAndStyle(r7, 4, "生产日期", commonStyle);
 		r7 = setCellValueAndStyle(r7, 5, "型号", commonStyle);
 		r7 = setCellValueAndStyle(r7, 6, "", commonStyle);
-		sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3));
-		sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4));
-		sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5));
+//		sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3));
+//		sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4));
+//		sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5));
 		// 设置编号、客户自编号、样品信息等位置
 		sheet.addMergedRegion(new CellRangeAddress(6, 7, 0, 1));
 		sheet.addMergedRegion(new CellRangeAddress(6, 7, 2, 2));
@@ -560,7 +569,10 @@ public class PrimaryDataAppController {
 			for (int j = 0; j < itemList.size(); j++) {
 				ConfigItemVo itemVo = itemList.get(j);
 				r7 = setCellValueAndStyle(r7, csItemIndex, itemVo.getItemName(), commonStyle);
-				sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
+				if(csItemIndex!=csItemIndex){
+					sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
+				}
+//				sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
 				csItemIndex++;
 			}
 		}
diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
index c060e2f..20f0f0d 100644
--- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
+++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
@@ -464,9 +464,9 @@ public class DownLoadController {
                 }
 //                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
             } else {
-                if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
-                    sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
-                }
+                    if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
+                        sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
+                    }
 //                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
             }
         }