Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40558 -r40669 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40558) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40669) @@ -872,16 +872,17 @@ } /** * 是否需要查询灭菌参数条数(部分接口是匹配到灭菌记录才把灭菌参数保存的数据库,不需要再保存修改灭菌记录的时候去查询关联) + * 目前也就江汉和史帝瑞非Amsco V-PRO MAX 还在用旧数据表了SterilizerRecord * @param sterilizer 灭菌炉 * @return */ private boolean needReadSterilerRecordsCount(Sterilizer sterilizer){ if(sterilizer != null && DatabaseUtil.isPoIdValid(sterilizer.getDeviceInterfaceId())){ DeviceInterface deviceInterface = (DeviceInterface)objectDao.getById(DeviceInterface.class.getSimpleName(), sterilizer.getDeviceInterfaceId()); if(deviceInterface != null){ - if(!(DeviceInterface.GETINGE.equals(deviceInterface.getDeviceBrand()) && (DeviceInterface.GETINGETYPE_HS_ONE.equals(deviceInterface.getDeviceModel()) || DeviceInterface.GETINGETYPE_HS66.equals(deviceInterface.getDeviceModel())) - || DeviceInterface.XINHUA.equals(deviceInterface.getDeviceBrand()) && (DeviceInterface.XINHUATYPE_PS_100GXP.equals(deviceInterface.getDeviceModel()) || DeviceInterface.DEVICETYPE_LOW.equals(deviceInterface.getDeviceModel()) || DeviceInterface.DEVICETYPE_HIGH.equals(deviceInterface.getDeviceModel())) - || DeviceInterface.JOHNSON.equals(deviceInterface.getDeviceBrand()))){ + if(DeviceInterface.JIANGHAN.equals(deviceInterface.getDeviceBrand()) || + DeviceInterface.STERIS.equals(deviceInterface.getDeviceBrand()) && !DeviceInterface.STERIS_AMSCO_V_PRO_MAX.equals(deviceInterface.getDeviceModel()) + ){ return true; } }