Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r26443 -r26444 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 26443) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 26444) @@ -116,8 +116,6 @@ public class WashAndDisinfectRecordManagerImpl extends BasePoManagerImpl implements WashAndDisinfectRecordManager { - private WashAndDisinfectRecordManager washAndDisinfectRecordManager; - private BeCleanItemManager beCleanItemManager; private ClassifyBasketManager classifyBasketManager; @@ -165,11 +163,6 @@ @Autowired(required = false) private DeviceDataByCommunicationManager deviceDataByCommunicationManager; - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - public void setIdCardDefinitionManager( IDCardDefinitionManager idCardDefinitionManager) { this.idCardDefinitionManager = idCardDefinitionManager; @@ -3221,7 +3214,7 @@ @Override public WashDataOfMarge loadWashDataOfMargeByWashAndDisinfectRecordId(String washAndDisinfectRecordId) { if (DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)) { - WashAndDisinfectRecord wd = washAndDisinfectRecordManager.get(washAndDisinfectRecordId); + WashAndDisinfectRecord wd = this.get(washAndDisinfectRecordId); Rinser rs = (Rinser)objectDao.getByProperty(Rinser.class.getSimpleName(), "id", wd.getRinserId()); if(wd != null && rs != null){ String hql = null;