Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34460 -r34463
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34460)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34463)
@@ -6316,16 +6316,6 @@
 					if(showSendTime){
 						mdi.setSendTime(rs.getString("sendTime"));
 					}
-					if(queryUnit && DisposableGoods.TYPE_NAME.equals(type)){
-						int beginIndex = goodsName.indexOf("[");
-						int endIndex = goodsName.lastIndexOf("]");
-						if(beginIndex != -1 && endIndex != -1){
-							String specification = goodsName.substring(beginIndex + 1, endIndex);
-							goodsName = goodsName.substring(0, beginIndex);
-							mdi.setSpecification(specification);
-						}
-					}
-					mdi.setGoodsName(goodsName);
 					mdi.setType(type);
 					mdi.setSettlementPrice(settlementPrice);
 					mdi.setSettlementDiscountPrice(settlementDiscountPrice);
@@ -6347,6 +6337,16 @@
 							mdi.setExternalCode(tousseExternalCodeMap.get(goodsName));
 						}
 					}
+					if(queryUnit && DisposableGoods.TYPE_NAME.equals(type)){
+						int beginIndex = goodsName.indexOf("[");
+						int endIndex = goodsName.lastIndexOf("]");
+						if(beginIndex != -1 && endIndex != -1){
+							String specification = goodsName.substring(beginIndex + 1, endIndex);
+							goodsName = goodsName.substring(0, beginIndex);
+							mdi.setSpecification(specification);
+						}
+					}
+					mdi.setGoodsName(goodsName);
 					if(showMaterialsAmountColumnOfDetailMonthReport){
 						if("一次性物品".equals(type) || "材料".equals(type) || ExpensiveGoods.TYPE_NAME.equals(type) || "收费项目".equals(type) || "高值耗材".equals(type)){
 							mdi.setMaterialAmount(totalAmount);