Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/service/BioreaderManagerImpl.java =================================================================== diff -u -r27025 -r28942 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/service/BioreaderManagerImpl.java (.../BioreaderManagerImpl.java) (revision 27025) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/service/BioreaderManagerImpl.java (.../BioreaderManagerImpl.java) (revision 28942) @@ -139,11 +139,6 @@ //间隔的分数:生物监测器上的生物监测开始时间和灭菌结束时间的间隔分数 minutesCount = DateTools.getDateDiff(endDate, startDate, TimeUnit.MINUTES); } - Long hoursCount = null; - if(controlTubeResult == null){//未获取对照管结果时 - //对照管开始时间和当前时间的小时差 - hoursCount = DateTools.getDateDiff(startDate, new Date(), TimeUnit.HOURS); - } //根据生物监测开始时间和生物监测持续时间获取结束时间 Date endDateOfBioreader = getEndDateOfBioreader(startDate, bioreader.getMonitoringDuration()); if(monitoringTubeResult == null && resultCardPosition.equals(cardPosition) && minutesCount < timeOfMonitoringInterval && minutesCount >= 0){//监测管 @@ -160,7 +155,7 @@ biVO.setBiologicalMonitoringStartDate(startDate); biVO.setBiologicalMonitoringEndDate(endDateOfBioreader); biVO.setMonitoringTubeResult(monitoringTubeResult); - }else if(controlTubeResult == null && resultCardPosition.equals(cardPositionOfControlTube) && hoursCount <= 23){//对照管监测数据只查24小时以内的,刚好24小时不算在内 + }else if(controlTubeResult == null && resultCardPosition.equals(cardPositionOfControlTube)){ controlTubeResult = element.child(3).text(); if("-".equals(controlTubeResult)){ controlTubeResult = SterilizationRecord.MONITOR_RESULT_NEGATIVE;