Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35900 -r35901 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35900) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35901) @@ -45,16 +45,11 @@ import com.forgon.directory.model.BrancheOfHospital; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.model.Org_OrgGroup; -import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; -import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager; -import com.forgon.disinfectsystem.basedatamanager.rinser.service.RinserManager; import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; -import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.customform.formdefinition.service.FormDefinitionManager; import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager; import com.forgon.disinfectsystem.diposablegoods.util.DisposableGoodsUtils; import com.forgon.disinfectsystem.diposablegoods.util.GodownEntryUtil; @@ -153,10 +148,8 @@ import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; -import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; import com.forgon.disinfectsystem.jasperreports.javabeansource.*; import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex; -import com.forgon.disinfectsystem.jasperreports.service.dataindex.WorkQualityCollectionDataIndex; import com.forgon.disinfectsystem.jasperreports.util.AmountContrastReportHelper; import com.forgon.disinfectsystem.jasperreports.util.CssdWorkloadReportForTangshanWorkersHospitalHelper; import com.forgon.disinfectsystem.jasperreports.util.CssdWorkloadReportHelper; @@ -207,7 +200,6 @@ import com.forgon.disinfectsystem.jasperreports.util.YearWorkloadReportHelper; import com.forgon.disinfectsystem.jasperreports.util.YearWorkloadReportSpecialHelper; import com.forgon.disinfectsystem.packing.service.PackingManager; -import com.forgon.disinfectsystem.qualitymonitoring.definition.service.QualityMonitoringDefinitionManager; import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo; import com.forgon.disinfectsystem.report.dao.ReportDao; @@ -216,14 +208,11 @@ import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryItemManager; -import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; -import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking; import com.forgon.disinfectsystem.vo.TousseOperate; import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; -import com.forgon.oa.onlineusers.service.OnlineUserManager; import com.forgon.security.model.User; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; @@ -267,12 +256,8 @@ @Autowired private InitDbConnection dbConnection; @Autowired - private TousseDefinitionManager tousseDefinitionManager; - @Autowired private MaterialDefinitionManager materialDefinitionManager; @Autowired - private TousseInstanceManager tousseInstanceManager; - @Autowired private HttpOptionManager httpOptionManager; private static final String DIPOSABLEGOODS = "一次性物品"; @@ -283,30 +268,12 @@ @Autowired private MaterialEntryItemManager materialEntryItemManager; @Autowired - private WareHouseManager wareHouseManager; - @Autowired private MaterialCheckManager materialCheckManager; @Autowired - private OrgUnitManager orgUnitManager; - @Autowired - private ForeignTousseApplicationManager foreignTousseApplicationManager; - @Autowired - private QualityMonitoringDefinitionManager qualityMonitoringDefinitionManager; - @Autowired - private FormDefinitionManager formDefinitionManager; - @Autowired - private BarcodeManager barcodeManager; - @Autowired private SterilizerManager sterilizerManager; @Autowired - private RinserManager rinserManager; - @Autowired private DataIndex dataIndex; @Autowired - private OnlineUserManager onlineUserManager; - @Autowired - private WorkQualityCollectionDataIndex workQualityCollectionDataIndex; - @Autowired private InstrumentRepairReportHelper instrumentRepairReportHelper; @Autowired private ForeignTousseApplicationReportHelper foreignTousseApplicationReportHelper;