Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r30446 -r30454 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 30446) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 30454) @@ -3528,7 +3528,7 @@ String completedTimeStr = washDataList.get(washDataList.size()-1).getTime(); resultData.put("completedTime", completedTimeStr); //运行次数 - resultData.put("cycleCounter", wdr.getCycleCounter()); + resultData.put("cycleCounter", washDataList.get(washDataList.size()-1).getCycleCounter()); //运行周期(结束时间-启动时间)2020-06-22 10:40:50 Date startedDate = DateTools.coverStrToDate(startedDateTimeStr.replaceAll("/", "-"), DateTools.COMMON_DATE_HMS); Date completedDate = DateTools.coverStrToDate(completedTimeStr.replaceAll("/", "-"), DateTools.COMMON_DATE_HMS); @@ -3625,7 +3625,7 @@ resultData.put("startedTimeStr",ForgonDateUtils.safelyFormatDate(startedDateTime,DateTools.COMMON_DATE_HMS,"")); resultData.put("operator",wdr.getOperator());//操作员 resultData.put("washStatus",wdr.getWashStatus());//清洗状态 - resultData.put("cycleCounter", wdr.getCycleCounter());//循环次数 + resultData.put("cycleCounter", washDataOfChangLong.getCycleCounter());//循环次数 resultData.put("batchNumber", washDataOfChangLong.getBatchNumber());//批号 resultData.put("methodName",washDataOfChangLong.getMethodName());//清洗程序 resultData.put("AO",washDataOfChangLong.getAO());//AO值