Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r34859 -r34991 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 34859) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 34991) @@ -3782,7 +3782,7 @@ return true; } - // 校验是否有选中外来器械 + // 校验是否有选中包 function ifCheckedForeignTousse() { var bRet = false; var basketTree = Ext4.getCmp('basketTreeGrid'); @@ -3793,7 +3793,7 @@ //遍历器械包节点 Ext4.each(selNodes, function (pNode) { var tousseType = pNode.get('tousseType'); - if (tousseType == '外来器械包') { + if(sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf(tousseType) >= 0){ bRet = true; return false; } @@ -3961,7 +3961,6 @@ } var confirmIndicatorCardWin = null; function packingTousseBtnClick0(btn, isPacking) { - if (sstsConfig.packingView_confirmIndicatorCard && ifCheckedForeignTousse()) { if (confirmIndicatorCardWin) { return; Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r34895 -r34991 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 34895) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 34991) @@ -1317,7 +1317,7 @@ function splitForeignTousse_packingTousseBtnClick0(btn){ - if(sstsConfig.packingView_confirmIndicatorCard){ + if(sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf('外来器械包') >= 0){ if(splitForeignTousse_confirmIndicatorCardWin){ return; } Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js =================================================================== diff -u -r34932 -r34991 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 34932) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 34991) @@ -200,6 +200,8 @@ expandQueryFieldsConfigOfTousseInfoQuery: [ {"fieldName":"urgentLevel","QueryName":"加急级别"} ], + //装配物品时提示放置指示卡的包类型 + packingView_confirmIndicatorCard : ["器械包" , "外来器械包"], // 手术仪器管理 enableSurgicalInstrumentsManagement: true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js =================================================================== diff -u -r34334 -r34991 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 34334) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 34991) @@ -76,8 +76,8 @@ confirmRecyclingAmount:false, //录入使用记录时,"诊疗号"、"住院号"、"病人姓名"是否都可以不填 noInputTreatmentNumOrHospitalNum:true, - // 装配外来器械时确认是否放置指示卡 - packingView_confirmIndicatorCard:true, + // 装配物品时提示放置指示卡的包类型 + packingView_confirmIndicatorCard : ["外来器械包"], //启用设备接口 disableDeviceInterface : false, //是否打印灭菌温度压力曲线