Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r35194 -r35256 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 35194) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 35256) @@ -1396,7 +1396,7 @@ vo.setUseAmount(useAmount); //维修次数 //总使用天数 - Long useDay = getInstrumentInstanceUseDay(instrumentInstance); + Long useDay = getInstrumentInstanceUseDay(vo.getMaterialEntryTime()); vo.setUseDay(useDay); //平均成本:根据该器械的使用次数以及购买价格进行计算,按照成本公式计算(待定) Double averageCost = vo.getMaterialEntryCost() == null ? 0.0 : vo.getMaterialEntryCost(); @@ -1442,15 +1442,10 @@ * @return */ private long getInstrumentInstanceUseDay( - InstrumentInstance instrumentInstance) { - if(instrumentInstance == null || !DatabaseUtil.isPoIdValid(instrumentInstance.getMaterialEntryId())){ + Date materialEntryTime) { + if(materialEntryTime == null){ return 0; } - MaterialEntry materialEntry = (MaterialEntry) objectDao.getById(MaterialEntry.class.getSimpleName(), instrumentInstance.getMaterialEntryId()); - if(materialEntry == null || materialEntry.getTime() == null){ - return 0; - } - Date materialEntryTime = materialEntry.getTime(); long l = new Date().getTime() - materialEntryTime.getTime(); long d = l / (24 * 60 * 60 * 1000); return d;