Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js =================================================================== diff -u -r17497 -r17539 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 17497) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 17539) @@ -122,7 +122,8 @@ url: WWWROOT + '/disinfectSystem/useRecordAction!loadScanedGoods.do', params: { barcode: barcode, - scanedBarcodes: getTousseGridData() + scanedBarcodes: getTousseGridData(), + useInterfere : true }, success: function (response, options) { var result = response.responseText; Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java =================================================================== diff -u -r17512 -r17539 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 17512) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java (.../UseRecordAction.java) (revision 17539) @@ -609,6 +609,8 @@ public void loadScanedGoods(){ String barcode = StrutsParamUtils.getPraramValue("barcode", null); String scanedBarcodes = StrutsParamUtils.getPraramValue("scanedBarcodes", ""); + //是否来自干预管理 + String useInterfere = StrutsParamUtils.getPraramValue("useInterfere", null); JSONObject obj = new JSONObject(); HttpServletResponse response = StrutsParamUtils.getResponse(); response.setCharacterEncoding("UTF-8"); @@ -697,7 +699,7 @@ } }else{ //判断包实例所在位置与当前用户所在科室是否一致 - if(StringUtils.equals(currentOrgUnitCode, ti.getLocation())){ + if(StringUtils.equals(currentOrgUnitCode, ti.getLocation()) || useInterfere != null){ String validUntilStr = ti.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD); TousseDefinition td = ti.getTousseDefinition(); String tousseDefinitionName = "";