Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r16347 -r16402 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16347) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16402) @@ -65,6 +65,8 @@ import com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.service.SterilizerRecordManager; import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.security.model.User; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; @@ -103,6 +105,8 @@ private HttpOptionManager httpOptionManager; + private LogManager appLogManager; + private ObjectDao objectDao; private String sterilizationGoods;// 灭菌物品 @@ -123,7 +127,10 @@ this.objectDao = objectDao; } - + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void setImageFileManager(ImageFileManager imageFileManager) { this.imageFileManager = imageFileManager; } @@ -479,7 +486,7 @@ */ public void getBarcodeType() { String result = null; - + LoginUserData loginUser = AcegiHelper.getLoginUser(); try { String barcodeStr = StrutsParamUtils.getPraramValue("barcode", ""); String[] barcodeArray = barcodeStr.split(";"); @@ -506,10 +513,18 @@ result = "errorBasket"; } } + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,container.getContainerType(),container.getContainerName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } else if (barcodeDevice instanceof Sterilizer) {// 灭菌炉 result = STERILIZER; + Sterilizer sterilizer = (Sterilizer) barcodeDevice; + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,"灭菌炉",sterilizer.getName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } else if (barcodeDevice instanceof Sterilisation) {// 灭菌程序 result = STERILISATION; + Sterilisation sterilsation = (Sterilisation)barcodeDevice; + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,"灭菌程序",sterilsation.getSterilisation()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } else if (barcodeDevice instanceof TousseInstance) {// 器械包 result = TOUSSEINSTANCE; @@ -519,10 +534,18 @@ TousseDefinition.STR_YES.equals(tousseInstance.getTousseDefinition().getIsTraceable())){ result = "notFixedBarcode"; } + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,"器械包",tousseInstance.getTousseName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } else if(barcodeDevice instanceof User){ result = BarcodeDevice.BARCODE_TYPE_USER; + User user = (User)barcodeDevice; + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,"用户",user.getName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); }else if(barcodeDevice instanceof Position){ result = BarcodeDevice.BARCODE_TYPE_POSITION; + Position position = (Position)barcodeDevice; + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcode,"位置",position.getPositionName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } }else{ result = "barcodeInvalid"; @@ -542,10 +565,15 @@ }else{ result = "barcodeEndInvalid"; } + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcodeEnd,"篮筐(尾)",container.getContainerName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); } else if (barcodeDeviceEnd instanceof TousseInstance) {// 器械包 if(result != TOUSSEINSTANCE){ result = "notTheSame"; } + TousseInstance tousseInstance = (TousseInstance)barcodeDeviceEnd; + String sanceMsg = String.format("扫描条码：%s,类型: %s,名称：%s", barcodeEnd,"器械包(尾)",tousseInstance.getTousseDefinitionName()); + appLogManager.saveLog(loginUser, Log.MODEL_STERILIZATION, "扫描", sanceMsg); }else{ result = "barcodeEndInvalid"; } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16353 -r16402 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16353) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16402) @@ -940,16 +940,36 @@ addOrUpdateTousseStoreItemCount(clickNode.attributes.name,-1); } addPendingStarilizationGoodsFromRecord(clickNode); + var desMsg = "删除灭菌条码：" + clickNode.attributes.barcode + " ,名称：" + clickNode.attributes.name; + desMsg = desMsg + " ,类型：" + clickNode.attributes.type; + buildSterilizationLogInfo("删除",desMsg); clickNode.remove(); statisticsTousseAndBasket(); } //待灭菌物品点击按钮添加至灭菌物品栏 -function addPendingSterilizationGoodsToRecord(barcode) { +function addPendingSterilizationGoodsToRecord(barcode,type,name) { + var desMsg = "载入条码：" + barcode + " ,名称：" + name; + alert(type) + if (type == 'BASKET') { + desMsg = desMsg + " ,类型：篮筐"; + }else if(type == 'TOUSSE'){ + desMsg = desMsg + " ,类型：器械包"; + } + buildSterilizationLogInfo("载入",desMsg); loadTousseInstanceCheckPosition(barcode,id); //loadTousseInstance(barcode,id,removePendingSterilizationGoods); } +function buildSterilizationLogInfo(type,description){ + Ext.Ajax.request({ + url : WWWROOT + '/log/saveLog.do', + params : {model : '灭菌模块',type : type,description : description}, + success : function(response, options) { + } + }); +} + //移除右边表格的数据(今天待审核的数据列表),barcode可能为单个器械包条码,也可能为两个条码中间用分号隔开 function removePendingSterilizationGoods(barcode) { pendingSterilizationColumnTree.getRootNode().eachChild(function(pNode){ @@ -1311,7 +1331,7 @@ width : 35, dataIndex : 'type', renderer : function(v,p,record){ - var str = "\"\""; + var str = "\"\""; if (record.type == 'BASKET' || record.type == 'TOUSSE') { if(currentStatus != statusEnd && currentStatus != statusFailure){ return str; @@ -1371,7 +1391,7 @@ width : 35, dataIndex : 'type', renderer : function(v,p,record){ - var str = "\"\""; + var str = "\"\""; if (record.type == 'BASKET' || record.type == 'TOUSSE') { if(currentStatus != statusEnd && currentStatus != statusFailure){ return str; @@ -1424,7 +1444,7 @@ } //查询节点的数据是否存在,如果存在则进行循环 Ext.each(rootNode.childNodes, function(cNode){ - addPendingSterilizationGoodsToRecord(cNode.attributes["objBarcode"]); + addPendingSterilizationGoodsToRecord(cNode.attributes["objBarcode"],cNode.attributes["type"],cNode.attributes["objName"]); }); }}], columns : pendingSterilizationColumnTreeColumnArray,