Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r14688 -r14706 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 14688) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 14706) @@ -1713,7 +1713,10 @@ var operator = document.getElementById('operator').value; var depart = document.getElementById('depart').value; var recyclingTime = document.getElementById('recyclingTime').value; - + var recyclingUserDefault = true; + if(sstsConfig.hasOwnProperty('recyclingUserDefault') && !sstsConfig.recyclingUserDefault){ + recyclingUserDefault = false; + } $.ajax({ url : WWWROOT + "/disinfectSystem/recyclingRecordAction!saveRecyclingRecord.do", type : "POST", @@ -1727,7 +1730,8 @@ recyclingUser : recyclingUser, operator : operator, depart : depart, - recyclingTime : recyclingTime + recyclingTime : recyclingTime, + recyclingUserDefault : recyclingUserDefault }, success : function(result) { if(result.success){ Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r14574 -r14706 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14574) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 14706) @@ -446,9 +446,13 @@ application = invoicePlanManager.getInvoicePlanById(app_id); recyclingRecord.setRecyclingApplication(application); } - if (StringUtils.isBlank(recyclingRecord.getRecyclingUser())) { - recyclingRecord.setRecyclingUser(recyclingRecord - .getOperator()); + String recyclingUserDefault = StrutsParamUtils.getPraramValue("recyclingUserDefault", ""); + boolean rt = Boolean.valueOf(recyclingUserDefault); + if(rt == true){ + if (StringUtils.isBlank(recyclingRecord.getRecyclingUser())) { + recyclingRecord.setRecyclingUser(recyclingRecord + .getOperator()); + } } // System.out.println(params.toString()); // 一条回收记录只能有一个对应的回收申请单/器械包申请单 Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js =================================================================== diff -u -r14652 -r14706 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js (.../config.js) (revision 14652) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js (.../config.js) (revision 14706) @@ -43,5 +43,7 @@ //是否开启:把"已审核"的记录返回成"未审核"的按钮 enableBecomeNotAuditedButton : true, //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除配置为2以外的其他值都使用以前的单科室的多单打印 - printInvoiceVersion:2 + printInvoiceVersion:2, + //回收人默认用登录用户 + recyclingUserDefault:false } \ No newline at end of file