Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js =================================================================== diff -u -r20902 -r21186 --- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 20902) +++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 21186) @@ -62,6 +62,8 @@ hideReviewerField:false, //在灭菌视图界面是否显示“生物监测的状态”属性(为true则显示,false或者未配置则不显示) showBiologicalMonitoringStatus: true, + //在使用记录那里是否开启监控物品的回收状态(为true则开启,false或者未配置则不开启) + monitorGoodsRecyclingStatusForUseRecord: true, // 装配界面显示包装人 showWrapperField:false, // 自定义装配界面,灭菌日期的处理方式,,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样,保留当前值 Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java =================================================================== diff -u -r21042 -r21186 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 21042) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 21186) @@ -292,6 +292,12 @@ public JSONArray loadSubTousseUseRecordOfComboTousse(TousseInstance comboTousseInstance , Long useRecordId); /** + * 更新使用记录的recyclingStatus属性. + * @param useRecordId 使用记录的id + */ + public void updateRecyclingStatus(Long useRecordId); + + /** * 根据器械包条码加载使用记录 * @param barcode * @return JSONObject Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r21042 -r21186 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21042) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 21186) @@ -5601,5 +5601,11 @@ return; } } + + @Override + public void updateRecyclingStatus(Long useRecordId) { + // TODO Auto-generated method stub + //待实现 + } }