Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js =================================================================== diff -u -r24500 -r24535 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24500) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js (.../record.js) (revision 24535) @@ -1,3 +1,13 @@ +/*alert('currentUserName=' + currentUserName); +alert('currentUserFullName=' + currentUserFullName); +alert('currentOrgUnitCode=' + currentOrgUnitCode); +alert('currentOrgUnitName=' + currentOrgUnitName);*/ + +$('#addHandle').click(function(){ + $('#adddepart').val(currentOrgUnitName)//科室 + $('#adddepart').attr('disabled',true) + $('#addoperator').val(currentUserFullName) +}) //重置表格header对齐 $(window).resize(function () { $("#table").bootstrapTable('resetView'); @@ -498,6 +508,25 @@ }); //图片模态框 +//加载使用物品明细 +function RecordGoodes(obj){ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadUseItemsByUseRecordId.mhtml?useRecordId='+obj, + async:false, + type:'get', + dataType:'json', + success:function(data){ + var datas =data.rows; + if(data.success===true){ + $('#RecordGoodes').val(JSON.stringify(data.rows)) + $('#Goods-table').bootstrapTable('load',datas); + + }else{ + alert(data.message) + } + } + }) +} // 封装动态模态框 function AjaxModal(obj){ var str=""; @@ -508,7 +537,8 @@ dataType:'json', success:function(data){ if(data.success===true){ - var datas =data.data[0]; + var datas =data.data; + $('#ModifySaveStr').val(JSON.stringify(datas)) $('#hospitalNum').val(datas.hospitalNum);//住院号 $('#treatmentNum').val(datas.treatmentNum);//诊疗号 $('#washHandNurse').val(datas.washHandNurse);//洗手护士 @@ -535,38 +565,169 @@ $('#remark').val(datas.remark);//备注 $('#reviewTime').val(datas.reviewTimeStr);//审核时间 $('#patientName').val(datas.patientName);//姓名 - } } }) + } +//封装修改保存 +function ModifySave(){ + var ModifySaveStr = $('#ModifySaveStr').val(); + var ModifySaveId =$('#ModifySaveId').val(); + var RecordGoodes =$('#RecordGoodes').val(); + var hospitalNum = $('#hospitalNum').val();//住院号 + var treatmentNum =$('#treatmentNum').val();//诊疗号 + var washHandNurse =$('#washHandNurse').val();//洗手护士 + var circuitNurse =$('#circuitNurse').val()//巡回护士 + var depart =$('#depart').val()//科室 + var operationRoom =$('#operationRoom').val()//手术间 + var patientAge=$('#patientAge').val()//年纪 + var patientSex =$('#Select').val();//性别 + var patientArea =$('#patientArea').val();//病区 + var roomNumber =$('#roomNumber').val()//病室 + var bedNumber =$('#bedNumber').val()//床位 + var patientIDCard =$('#patientIDCard').val();//身份证 + var doctorName =$('#doctorName').val();//医生 + var specialInfection=$('#specialInfection').val();//特殊感染类型 + var operation =$('#operation').val();//手术名称 + var operationScheduleId =$('#operationScheduleId').val();//手术单号 + var operationTime =$('#operationTime').val();//手术时间 + var visitId =$('#visitId').val();//住院次数 + var enteringTime=$('#enteringTime').val(); // enteringDateStr录入时间 + var operator =$('#operator').val();//录入人 + var reviewer =$('#reviewer').val() // 缺审核人 + var applicationTime =$('#applicationTime').val();// 申请时间 + var remark =$('#remark').val();//备注 + var reviewTime =$('#reviewTime').val();//审核时间 + var patientName =$('#patientName').val();//姓名 + var tempBarcode =$('#tempBarcodes').val();//机械报信息 + var recordGoodsArray = [];//[{"barcode":"003"}] + var allTableData = $('#Goods-table').bootstrapTable('getData'); + for(var i=0;ix请输入诊疗号或者住院号或者病人姓名') + $ ('#Alert').show ().delay (1500).fadeOut (); + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml', + type:'post', + async:false, + dataType:'json', + data:{id:ModifySaveId,originalFormParams:ModifySaveStr,originalItems:RecordGoodes,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse, + circuitNurse:circuitNurse,depart:depart,operationRoom:operationRoom,patientAge:patientAge,patientSex:patientSex,patientArea:patientArea,roomNumber:roomNumber, + patientIDCard:patientIDCard,bedNumber:bedNumber,doctorName:doctorName,surgeon:doctorName,specialInfection:specialInfection,operation:operation, + operationScheduleId:operationScheduleId,operationTimeStr:operationTime,visitId:visitId,enteringDateStr:enteringTime,operator:operator, + remark:remark,patientName:patientName,applicationTime:applicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#mymodal-data").modal('hide'); + window.location.href = window.location.href; + }else{ + alert(data.message) + } + } + }) + } +} //修改功能 function ClickName(obj){ + $('#ModifySaveId').val(obj) if(obj!=''){ - AjaxModal(obj) + AjaxModal(obj); + RecordGoodes(obj); + var ModifySaveStr = $('#ModifySaveStr').val(); + var ModifySaveId =$('#ModifySaveId').val(); + var RecordGoodesa =$('#RecordGoodes').val(); + var hospitalNum = $('#hospitalNum').val();//住院号 + var treatmentNum =$('#treatmentNum').val();//诊疗号 + var washHandNurse =$('#washHandNurse').val();//洗手护士 + var circuitNurse =$('#circuitNurse').val()//巡回护士 + var depart =$('#depart').val()//科室 + var operationRoom =$('#operationRoom').val()//手术间 + var patientAge=$('#patientAge').val()//年纪 + var patientSex =$('#Select').val();//性别 + var patientArea =$('#patientArea').val();//病区 + var roomNumber =$('#roomNumber').val()//病室 + var bedNumber =$('#bedNumber').val()//床位 + var patientIDCard =$('#patientIDCard').val();//身份证 + var doctorName =$('#doctorName').val();//医生 + var specialInfection=$('#specialInfection').val();//特殊感染类型 + var operation =$('#operation').val();//手术名称 + var operationScheduleId =$('#operationScheduleId').val();//手术单号 + var operationTime =$('#operationTime').val();//手术时间 + var visitId =$('#visitId').val();//住院次数 + var enteringTime=$('#enteringTime').val(); // enteringDateStr录入时间 + var operator =$('#operator').val();//录入人 + var reviewer =$('#reviewer').val() // 缺审核人 + var applicationTime =$('#applicationTime').val();// 申请时间 + var remark =$('#remark').val();//备注 + var reviewTime =$('#reviewTime').val();//审核时间 + var patientName =$('#patientName').val();//姓名 + var tempBarcode =$('#tempBarcodes').val();//机械报信息 + var recordGoodsArray = [];//[{"barcode":"003"}] + var allTableData = $('#Goods-table').bootstrapTable('getData'); + for(var i=0;ix请输入诊疗号或者住院号或者病人姓名') + $ ('#Alert').show ().delay (1500).fadeOut (); + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml', + type:'post', + async:false, + dataType:'json', + data:{id:ModifySaveId,originalFormParams:ModifySaveStr,originalItems:RecordGoodesa,hospitalNum:hospitalNum,treatmentNum :treatmentNum,addwashHandNurse:washHandNurse, + circuitNurse:circuitNurse,depart:depart,operationRoom:operationRoom,patientAge:patientAge,patientSex:patientSex,patientArea:patientArea,roomNumber:roomNumber, + patientIDCard:patientIDCard,bedNumber:bedNumber,doctorName:doctorName,surgeon:doctorName,specialInfection:specialInfection,operation:operation, + operationScheduleId:operationScheduleId,operationTimeStr:operationTime,visitId:visitId,enteringDateStr:enteringTime,operator:operator, + remark:remark,patientName:patientName,applicationTime:applicationTime,items:recordGoodsArrays}, + success:function(data){ + if(data.success===true){ + $("#mymodal-data").modal('hide'); + }else{ + alert(data.message) + } + } + }) + } + + }else{ alert('请选择一行数据') } -}; +} $('#updateHandle').click(function(){ - var $table=$('#table'); - var selectContent = $table.bootstrapTable('getSelections')[0]; - console.log(selectContent) - ; + var $table=$('#table'); + var selectContent = $table.bootstrapTable('getSelections')[0]; if(typeof(selectContent) == 'undefined') { $('#Alert').html('x 请选择需要修改的使用记录信息！') $ ('#Alert').show ().delay (1500).fadeOut (); return false; }else{ var obj =selectContent.id; + $('#ModifySaveId').val(obj) AjaxModal(obj) + RecordGoodes(obj); } }) //删除使用记录 $("#finishHandle").on("click", function () { var rows = $("#table").bootstrapTable('getSelections'); - console.log(rows); if (rows.length ==0) { $('#Alert').html('x 请选择需要删除的使用记录信息！') $ ('#Alert').show ().delay (1500).fadeOut (); @@ -646,24 +807,15 @@ var addreviewTime =$('#addreviewTime').val();//审核时间 var addpatientName =$('#addpatientName').val();//姓名 var tempBarcode =$('#tempBarcode').val();//机械报信息 - var recordGoodsArray = [];//[{"containerBarcode":"01","children":["001","002"]}, {"containerBarcode":"02","children":["003","004"]} , {"tousseInstanceBarcode":"003"}] + var recordGoodsArray = [];//[{"barcode":"003"}] var allTableData = $('#addGoods-table').bootstrapTable('getData'); for(var i=0;i 0){ - objConservation.containerBarcode = data.barcode; - var tousseBarcodeArray = []; - for (var j = 0; j < data.children.length; j++) { - tousseBarcodeArray.push(data.children[j].barcode); - } - objConservation.children = tousseBarcodeArray; - recordGoodsArray.push(objConservation); - }else{ - objConservation.tousseInstanceBarcode = data.barcode; - recordGoodsArray.push(objConservation); - } + objConservation.barcode = data.barcode; + recordGoodsArray.push(objConservation); + } var recordGoodsArrays= JSON.stringify(recordGoodsArray) console.log(recordGoodsArrays) @@ -684,7 +836,7 @@ circuitNurse:addcircuitNurse,depart:adddepart,operationRoom:addoperationRoom,patientAge:addpatientAge,patientSex:patientSex,patientArea:addpatientArea,roomNumber:addroomNumber, patientIDCard:addpatientIDCard,bedNumber:addbedNumber,doctorName:adddoctorName,surgeon:adddoctorName,specialInfection:addspecialInfection,operation:addoperation, operationScheduleId:addoperationScheduleId,operationTimeStr:addoperationTime,visitId:addvisitId,enteringDateStr:addenteringTime,operator:addoperator, - remark:addremark,patientName:addpatientName,applicationTime:addapplicationTime,items:recordGoodsArrays}, + remark:addremark,patientName:addpatientName,applicationTime:addapplicationTime,items:recordGoodsArrays,departCoding:currentOrgUnitCode}, success:function(data){ if(data.success===true){ $("#mymodal-data").modal('hide'); @@ -697,5 +849,96 @@ } } }) +//修改保存 +$('#tempBarcodes').on('keydown',function(e){ + if (e.keyCode == "13") { + if($(this).val()==""){ + alert('请输入条码') + return false; + }else{ + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(), + type:'get', + dataType:'json', + async:false, + success:function(data){ + if(data.success===true){ + $('#Goods-table').bootstrapTable('append',data.data); + } + } + }) + } + } +}) +$('#ModifySave').on('click',function(){ + ModifySave(); +}) +//审核 +$('#SvaExamines').on('click',function(){ + var rows = $("#table").bootstrapTable('getSelections'); + if(rows.length==0){ + $('#Alert').html('x 请选择需要审核的使用记录信息！') + $ ('#Alert').show ().delay (1500).fadeOut (); + return false; + }else{ + $('#SvaExamine').on('click',function(){ + var arrays = new Array();// 声明一个数组 + $(rows).each(function () {// 通过获得别选中的来进行遍历 + arrays.push(this.id);// cid为获得到的整条数据中的一列 + }); + var idcards =JSON.stringify(arrays) + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewMultiUseRecord.mhtml?useRecordIds='+idcards, + type:'get', + dataType:'json', + async:false, + success:function(data){ + if(data.success===true){ + window.location.href = window.location.href; + }else{ + $('#Alert').html('x '+data.message+'！') + $ ('#Alert').show ().delay (1500).fadeOut (); + return false; + } + } + }) + }) + } +}) +//生成申请单 +$('#CreateApplication').on('click',function(){ + var rows = $("#table").bootstrapTable('getSelections'); + if(rows.length==0){ + $('#Alert').html('x 请选择需要生成申请单的使用记录信息！') + $ ('#Alert').show ().delay (1500).fadeOut (); + return false; + }else{ + $('#Createapplication').on('click',function(){ + var arrays = new Array();// 声明一个数组 + var departAll=''; + var departCoding =''; + $(rows).each(function () {// 通过获得别选中的来进行遍历 + arrays.push(this.id);// cid为获得到的整条数据中的一列 + departAll=this.depart; + alldepartCoding=this.departCoding; + }); + var idcards =JSON.stringify(arrays) + $.ajax({ + url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/reviewAndConvertMuitiUseRecordForm.mhtml', + type:'get', + dataType:'json', + async:false, + data:{operator:currentUserName,useRecordIds:idcards,depart:departAll,departCoding:currentOrgUnitCode}, + success:function(data){ + if(data.success===true){ + $("#Createapplication").modal('hide'); + window.location.href = window.location.href; + } + } + }) + }) + } + +}) \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js =================================================================== diff -u -r24518 -r24535 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24518) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24535) @@ -571,34 +571,14 @@ columns: [ { field: 'tiaoma', - title: '条码' - }, { - field: 'name', - title: '名称', - // formatter: operateFormatter //自定义方法，添加操作按钮 - }, { - field: 'fangshi', - title: '灭菌方式' + title: '器械包统计名称' }, { field: 'total', title: '数量' - }, - { - field: 'zuoz', - title: '操作' } + ], - data: [{tiaoma: '010004105',name: '灭菌筐02灭菌筐02灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'}, - {tiaoma: '010004105',name: '灭菌筐02',fangshi: '高温',total:'1',zuoz:'1'} - ], }); //时间插件 @@ -831,23 +811,9 @@ // 灭菌物品列表 loadSterilizationGoods(obj) $('#deteils').val(obj) + allTableDatas() - //灭菌物品统计 - var allTableDatas = $('#udsterilizationListTbale').bootstrapTable('getData'); - var allType=''; - if(allTableDatas==''){ - $('#sterils_1').text('0') - $('#sterils_2').text('0') - $('#sterils_3').text('0') - $('#sterils_4').text('0') - $('#sterils_5').text('0') - }else{ - for(var i=0;i"+datas[i]['sterilisation']+" "; + str +=" "; } $("#udprocedure").html(str); }else { @@ -1172,9 +1138,14 @@ var datas= data.rows; if(data.success===true){ var str = ""; - str=" " + // str=" " for(var i=0;i"+datas[i]['sterilisation']+" "; + if(datas[i]['sterilisation']==='无'){ + str +=" "; + }else{ + str +=" "; + } + } $("#procedure").html(str); }else { @@ -1373,3 +1344,48 @@ } }) +//灭菌物品统计 +function allTableDatas(){ + var allTableDatas = $('#udsterilizationListTbale').bootstrapTable('getData'); + + var alltotle=[] ,allchildren=[],countResult={},countResults=[]; + if(allTableDatas==''){ + $('#sterils_1').text('0') + $('#sterils_2').text('0') + $('#sterils_3').text('0') + $('#sterils_4').text('0') + $('#sterils_5').text('0') + }else { + for(var i =0; i < allTableDatas.length; i++){ + var objs =allTableDatas[i] + if(allTableDatas[i].type===1){ + + alltotle.push(allTableDatas[i].type) + for(var j=0;j
+ + +
使用记录列表
@@ -39,11 +42,11 @@ 删除 - - @@ -215,20 +218,20 @@
@@ -243,7 +246,7 @@
@@ -299,6 +302,36 @@ + + + + + +