Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32754 -r32756
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32754)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32756)
@@ -118,6 +118,7 @@
 import com.forgon.disinfectsystem.entity.foreigntoussecharge.ChargeSettingModeItem;
 import com.forgon.disinfectsystem.entity.foreigntoussecharge.ChargeSettingSpecItem;
 import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseChargeMode;
+import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseSpecification;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
@@ -23515,7 +23516,7 @@
 		if (StringUtils.isNotBlank(startDay)) {
 			startDay += ":00";
 		}
-		String sql = "select tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,sum(price) price,sum(amount) amount,sum(totalPrice) totalPrice from (select cs.supplierName,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='"
+		String sql = "select tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,sum(tempt.price) price,sum(tempt.amount) amount,sum(tempt.totalPrice) totalPrice from (select cs.supplierName,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='"
 				+ ForeignTousseChargeMode.MODE_RATE
 				+ "' then cssi.foreignTousseSpecName else null end specification,case when csmi.chargeMode='"
 				+ ForeignTousseChargeMode.MODE_RATE
@@ -23550,7 +23551,7 @@
 		if(DatabaseUtil.isPoIdValid(specificationId)){
 			sql += " and cssi.foreignTousseSpecID ='" + specificationId + "' ";
 		}
-		sql += " ) tempt where tempt.amount>0 group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification order by tempt.supplierName, tempt.foreignTousseChargeModeName,tempt.specification ";
+		sql += " ) tempt left join "+ ForeignTousseSpecification.class.getSimpleName() +" fts on fts.name=tempt.specification where tempt.amount>0 group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,fts.id  order by tempt.supplierName, tempt.foreignTousseChargeModeName,fts.id ";
 		return sql;
 	}
 	@Override
@@ -23692,7 +23693,7 @@
 		if(DatabaseUtil.isPoIdValid(specificationId)){
 			sql += " and cssi.foreignTousseSpecID ='" + specificationId + "' ";
 		}
-		sql += ") tempt where tempt.amount>0 order by tempt.supplierName,tempt.name,tempt.foreignTousseChargeModeName,tempt.specification";
+		sql += ") tempt left join "+ ForeignTousseSpecification.class.getSimpleName() +" fts on fts.name=tempt.specification where tempt.amount>0 order by tempt.supplierName,tempt.name,tempt.foreignTousseChargeModeName,fts.id";
 		return sql;
 	}
 }