Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r27704 -r27715 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 27704) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 27715) @@ -841,17 +841,12 @@ } //使用记录获取巡回护士和手术间 - UseRecord lastUseRecord = null; - //获取前一个包实例的使用记录 - TousseInstance lastTousseInstance = tousseInstanceManager.get(ti.getLastTousseInstanceId()); - if(lastTousseInstance != null && !lastTousseInstance.isComboTousse()){ - //上一个包实例的使用记录信息显示在回收记录里(不要问我为什么,我也不知道为什么),聚合包没有回收记录。 - lastUseRecord = lastTousseInstance.getUseRecord(objectDao); + UseRecord useRecord = null; + useRecord = ti.getUseRecord(objectDao); + if(useRecord != null){ + recyclingRecordJSON.put("lastUseRecordCircuitNurse", useRecord.getCircuitNurse() == null ? "" : useRecord.getCircuitNurse()); + recyclingRecordJSON.put("lastUseRecordOperationRoom", useRecord.getOperationRoom() == null ? "" : useRecord.getOperationRoom()); } - if(lastUseRecord != null){ - recyclingRecordJSON.put("lastUseRecordCircuitNurse", lastUseRecord.getCircuitNurse() == null ? "" : lastUseRecord.getCircuitNurse()); - recyclingRecordJSON.put("lastUseRecordOperationRoom", lastUseRecord.getOperationRoom() == null ? "" : lastUseRecord.getOperationRoom()); - } //灭菌记录 JSONObject sterilizationRecordJSON = new JSONObject();