Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r30834 -r31076 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 30834) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 31076) @@ -267,22 +267,25 @@ function cssdUtils_findForeignTousseApplication(tousseObj){ var foreignTousseAppInfo = {}; + var taskId = tousseObj.taskId || ''; if(haveJquery()){ $.ajax({ url:WWWROOT+"/disinfectSystem/application/foreignTousseApplicationController/findForeignTousseApplication.mhtml", type: "post", cache:false, async:false, data:{ - "foreignTousseAppId":tousseObj.foreignTousseApp_id + foreignTousseAppId:tousseObj.foreignTousseApp_id, + tousseDefinitionId:tousseObj.tousseDefinitionId, + packingTaskIdForSplitForeignTousse:taskId }, success:function(result){ foreignTousseAppInfo = result; } }); }else{ DWREngine.setAsync(false); - ForeignTousseApplicationTableManager.findForeignTousseAndApplicationInfo(tousseObj.foreignTousseApp_id,tousseObj.tousseDefinitionId,function(result){ + ForeignTousseApplicationTableManager.findForeignTousseAndApplicationInfo(tousseObj.foreignTousseApp_id,tousseObj.tousseDefinitionId,taskId,function(result){ if(result != null && result.length > 0){ foreignTousseAppInfo = JSON.parse(result); } @@ -787,7 +790,6 @@ // 打印消毒物品(如果为消毒物品,根据是否追溯的配置决定是否打印科室)。(消毒物品打印科室现在也改为同器械包一致,即按器械包定义的是否打印科室决定 since:2016-02-25) // 如果该器械包配置需要打印科室且科室信息不为空,将科室信息拼加至名称前面进行打印 addDepartPrefixForTousseName(tousseObj); - //丢失、报损未补充器械需要在包名字前加特殊字符提醒 if(tousseObj.haveUnSupplementMaterials){ tousseObj.tousseNameWithoutDepart = "◆" + tousseObj.tousseNameWithoutDepart;