Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r31033 -r31176 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 31033) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 31176) @@ -575,7 +575,17 @@ record.setCycleCounter(cycleCounter); record.setRemark(remark); // 灭菌记录的的温度压力数据条数 - Long count = (long)getSterilerRecordsCount(record.getSterilizer().getDeviceInterfaceId(),record.getSterilizer().getMachineNumber(),record.getCycleCounter()); + DeviceInterface devInterface = record.getSterilizer().getDeviceInterface(); + long count = 0L; + if(devInterface != null){ + if(DeviceInterface.BELIMED.equals(devInterface.getDeviceBrand()) && !DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER.equals(devInterface.getParaMatchingMethod())){ + count = sterilizationRecordManager.getSterilerRecordsCount(record.getSterilizer().getDeviceInterfaceId(), + record.getSterilizer().getMachineNumber(), + record.getStartDate()); + }else{ + count = (long)getSterilerRecordsCount(record.getSterilizer().getDeviceInterfaceId(),record.getSterilizer().getMachineNumber(),record.getCycleCounter()); + } + } record.setSterilizerRecordAmount(count); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r31158 -r31176 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31158) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31176) @@ -642,10 +642,20 @@ } if(needReadSterilerRecordsCount(sterilizer)){ // 灭菌记录的的温度压力数据条数 - int count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), - sterilizer.getMachineNumber(), - sterilizationRecord.getCycleCounter()); - sterilizationRecord.setSterilizerRecordAmount(Long.valueOf(count)); + DeviceInterface devInterface = sterilizer.getDeviceInterface(); + if(devInterface != null){ + int count = 0; + if(DeviceInterface.BELIMED.equals(devInterface.getDeviceBrand()) && !DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER.equals(devInterface.getParaMatchingMethod())){ + count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), + sterilizer.getMachineNumber(), + sterilizationRecord.getStartDate()); + }else{ + count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), + sterilizer.getMachineNumber(), + sterilizationRecord.getCycleCounter()); + } + sterilizationRecord.setSterilizerRecordAmount(Long.valueOf(count)); + } } saveOrUpdate(sterilizationRecord); } @@ -2126,10 +2136,20 @@ Sterilizer sterilizer = sterilizationRecord.getSterilizer(); if(needReadSterilerRecordsCount(sterilizer)){ // 灭菌记录的的温度压力数据条数 - Long count = (long) getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), - sterilizer.getMachineNumber(), - sterilizationRecord.getCycleCounter()); - sterilizationRecord.setSterilizerRecordAmount(count); + DeviceInterface devInterface = sterilizer.getDeviceInterface(); + if(devInterface != null){ + int count = 0; + if(DeviceInterface.BELIMED.equals(devInterface.getDeviceBrand()) && !DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER.equals(devInterface.getParaMatchingMethod())){ + count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), + sterilizer.getMachineNumber(), + sterilizationRecord.getStartDate()); + }else{ + count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), + sterilizer.getMachineNumber(), + sterilizationRecord.getCycleCounter()); + } + sterilizationRecord.setSterilizerRecordAmount(Long.valueOf(count)); + } } //灭菌记录关联的器械包 List allTousseInstanceOfRecord = new ArrayList(); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r31172 -r31176 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 31172) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 31176) @@ -550,9 +550,16 @@ SterilizationRecord record = sterilizationRecordManager .getSterilizationRecordById(id); // 灭菌记录的的温度压力数据条数 - Long count = (long) sterilizationRecordManager.getSterilerRecordsCount(record.getSterilizer() - .getDeviceInterfaceId(), record.getSterilizer() - .getMachineNumber(), record.getStartDate()); + Long count = 0L; + if(DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER.equals(devInterface.getParaMatchingMethod())){ + count = (long) sterilizationRecordManager.getSterilerRecordsCount(record.getSterilizer() + .getDeviceInterfaceId(), record.getSterilizer() + .getMachineNumber(), cycleCounter); + }else{ + count = (long) sterilizationRecordManager.getSterilerRecordsCount(record.getSterilizer() + .getDeviceInterfaceId(), record.getSterilizer() + .getMachineNumber(), record.getStartDate()); + } record.setSterilizerRecordAmount(count); sterilizationRecordManager.saveOrUpdate(record); }