Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21043 -r21046
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21043)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21046)
@@ -78,8 +78,6 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.ConsumptiveInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.DetectionItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
@@ -7943,35 +7941,28 @@
 	 * @param expensiveManufacture 生产厂家的map,输出参数
 	 * @param expensiveExternalCode 外部编码的map,输出参数
 	 */
-	private void expensiveManufactureAndExternalCode(
-			Map<String, String> expensiveManufacture,
-			Map<String, String> expensiveExternalCode) {
-		String sql = "select eg.externalCode,s.companyName,eg.name,eg.specification from " 
-					+ RegistrationCertification.class.getSimpleName() + " rc join " + Supplier.class.getSimpleName() 
-					+ " s on s.id = rc.supplier_id join " + ExpensiveGoods.class.getSimpleName() + " eg on eg.certificationId = rc.id where s.rentTousse = '"+Supplier.SUPPLIER_TYPE_EXPENSIVEGOODSSUPPLIER+"'";
+	private Map<String, String> expensiveExternalCode() {
+		String sql = "select eg.externalCode,eg.name,eg.specification from " 
+			+ ExpensiveGoods.class.getSimpleName() + " eg ";
 		ResultSet rs = objectDao.executeSql(sql);
+		Map<String, String> expensiveExternalCode = new HashMap<>();
 		try {
 			while(rs.next()){
 				String name = rs.getString("name");
 				String sp = rs.getString("specification");
 				String externalCode = rs.getString("externalCode");
-				String companyName = rs.getString("companyName");
 				String key = name;
 				if(StringUtils.isNotBlank(sp)){
 					key += "[" + sp + "]";
 				}
-				if(expensiveManufacture != null){
-					expensiveManufacture.put(key, companyName);
-				}
-				if(expensiveExternalCode != null){
-					expensiveExternalCode.put(key, externalCode);
-				}				
+				expensiveExternalCode.put(key, externalCode);			
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}finally {
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
+		return expensiveExternalCode;
 	}
 	private Map<String, String> disposableGoodsExternalCodeMap(){
 		String sql = "select name,specification,externalCode from DisposableGoods where externalCode is not null";
@@ -8541,16 +8532,12 @@
 		}
 		
 		logger.debug("执行sql:" + sql);
-		
-		
-		
+
 		Map<String, List<DepartmentMonthDetailItem>> detailMap = new HashMap<String, List<DepartmentMonthDetailItem>>();
 		Map<String, String> manufacturerMap = getDiposableGoodsManufacturer();
 		
 		Map<String, String> disposableGoodsExternalCodeMap = disposableGoodsExternalCodeMap();
-		Map<String, String> expensiveExternalCode = new HashMap<>();
-		Map<String, String> expensiveManufacture = new HashMap<>();
-		expensiveManufactureAndExternalCode(expensiveManufacture,expensiveExternalCode);
+		Map<String, String> expensiveExternalCode = expensiveExternalCode();
 		Map<String, String> materialExternalCodeMap = getMaterialExternalCode();
 		Map<String, String> tousseExternalCodeMap = getTousseExternalCode();
 		ResultSet rs = objectDao.executeSql(sql);
@@ -8607,7 +8594,6 @@
 						if(enableExpensiveGoods && ExpensiveGoods.TYPE_NAME.equals(type)){
 							//新的高值耗材设置外部编码及生产厂家
 							mdi.setExternalCode(expensiveExternalCode.get(goodsName));
-							mdi.setManufacturer(expensiveManufacture.get(goodsName));
 						}else{
 							mdi.setExternalCode(tousseExternalCodeMap.get(goodsName));
 						}