高温灭菌
@@ -588,7 +591,7 @@
@@ -1024,7 +1027,7 @@
-
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js
===================================================================
diff -u -r24436 -r24487
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24436)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js (.../sterilization.js) (revision 24487)
@@ -110,16 +110,16 @@
searchOnEnterKey: "true",//回车搜索
showRefresh: "true",//刷新按钮
showColumns: true,//列选择按钮
- minimumCountColumns: 2, //最少允许的列数
- clickToSelect: true, //是否启用点击选中行
- uniqueId: "ID", //每一行的唯一标识，一般为主键列
- cardView: false, //是否显示详细视图
- detailView: false, //是否显示父子表
+ minimumCountColumns: 2, //最少允许的列数
+ clickToSelect: true,//是否启用点击选中行
+ uniqueId: "ID", //每一行的唯一标识，一般为主键列
+ cardView: false, //是否显示详细视图
+ detailView: false, //是否显示父子表
showExport: true,
- exportDataType: "selected", //导出checkbox选中的行数
- paginationLoop: false, //是否无限循环
+ exportDataType: "selected",//导出checkbox选中的行数
+ paginationLoop: false,//是否无限循环
columns: columnArray,
- height:'650',
+ height:$(window).height()-($('.Nan-content').height()+$('.content-header').height()+87)
});
return InitTable;
}
@@ -711,183 +711,6 @@
}
//ajax 修改 deteils
-/*function AjaxModal(obj){
- var str="";
- $.ajax({
- url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml?id='+obj,
- type:'get',
- async:true,
- dataType:'json',
- success:function(data){
- if(data.success===true){
- var datas=data.data;
- var str=
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '
- $('#sterilizationList_ul').html(str)
-
-
- var sterilizationList=''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '+
- ''+
- ' '
- $('#sterilizationList_li').html(sterilizationList);
- }
-
-
- }
-
- })
-}*/
function AjaxModal(obj){
var str="";
$.ajax({
@@ -906,11 +729,10 @@
$('#udfurnace').val(datas.frequency);
$('#udfurnace').attr('disabled',true);
-
-
- // $('#udsters').html('');
var sterilizerName =datas.sterilizerName;
- // var sterilizerName ='3号高压炉灭菌';
+ $('#sterilizerNames').val(sterilizerName)
+ var sterilizationPurpose =datas.sterilizationPurpose;
+ $('#sterilizationPurposes').val(sterilizationPurpose)
$.ajax({
async:false,
url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup="+sterilerGroup,
@@ -920,22 +742,60 @@
var lie=data.rows;
if(data.success===true){
var str = "";
+ var isExist=false;
for(var j=0;j"+lie[j]['name']+" ";
+ str +=" ";
}
if(lie[j]['name']===sterilizerName){
str+=" ";
+ isExist=true;
}
+
}
+
+ if(isExist == false){
+ str=" ";
+ }
$("#udsters").html(str);
}
}
});
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
+ type:'get',
+ dataType:'json',
+ success:function(data){
+ var datas =data.rows;
+ var str ="";
+ var isExist =false;
+ if(data.success===true){
+ for(var i=0;i"+datas[i]['optionText']+"");
+ // $('#purpose').append(opt)
+ // alert(datas[i]['optionText'])
+ if(datas[i]['optionText'].indexOf(sterilizationPurpose)==-1){
+ str +=" ";
+ }
+ if(datas[i]['optionText']===sterilizationPurpose){
+ str+=" ";
+ isExist=true;
+ }
+ }
+ if(isExist == false){
+ str=" ";
+ }
+ $("#udpurpose").html(str);
+ }else{
+ alert(data.message)
+ }
+
+ }
+ })
$('#udprocedure').html('');
$('#udpurpose').html('');
$('#udstarttime').val(datas.startDateStr);
@@ -962,14 +822,146 @@
})
}
function ClickName (obj){
+
if(obj!==''){
AjaxModal(obj);
+
// 灭菌物品列表
loadSterilizationGoods(obj)
+ $('#deteils').val(obj)
+
}else {
alert('选择一行')
}
}
+$('#udbarCode').on('keydown',function(e){
+ if(e.keyCode=='13'){
+ if($(this).val()==""){
+ alert('请输入条码')
+ return false;
+ }else{
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml?barcode='+$(this).val(),
+ type:'get',
+ dataType:'json',
+ async:false,
+ success:function(data){
+ var datas =data.rows;
+ console.log()
+ if(data.success===true){
+ if(data['barcodeType']==='器械包'){
+ $('#udsterilizationListTbale').bootstrapTable('append',datas);
+ $('#udbarCode').val("")
+ }
+ if(data['barcodeType']==='用户'){
+ $('#udsterilization').val(datas[0]['name']);
+ $('#udbarCode').val("")
+ }
+ if(data['barcodeType']==='灭菌篮筐'){
+ $('#udsterilizationListTbale').bootstrapTable('append',datas);
+ $('#udbarCode').val("")
+ }
+ if(data['barcodeType']==='灭菌架'){
+ $('#udsterilizationName').val(datas[0]['name']);
+ $('#udbarCode').val("")
+ }
+ }
+ }
+ })
+ }
+
+ }
+})
+//修改时重新条用 灭菌目的 //灭菌炉列表 //灭菌程序关联
+$('#udsters').change(function(){
+ $('#udprocedure').html("");
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#udsters').val(),
+ type:'get',
+ dataType:'json',
+ success:function(data){
+ var datas= data.rows;
+ console.log(datas)
+ if(data.success===true){
+ var str = "";
+ for(var i=0;i"+datas[i]['sterilisation']+" ";
+ }
+ $("#udprocedure").html(str);
+ }else {
+ alert(data.message)
+ }
+ }
+ })
+})
+$('#udprocedure').change(function(){
+ $('#textareas').text($(this).find("option:selected").attr("data-itme"))
+})
+//修改保存
+$('#conservation').on('click',function(){
+ var deteilsId= $('#deteils').val();
+ var udsterilization =$('#udsterilization').val();
+ var udsterilizationName =$('#udsterilizationName').val();
+ var udfurnace =$('#udfurnace').val();
+ var udsters =$('#udsters').val()
+ var sterilizerNames=$('#sterilizerNames').val();
+ var sterilizermames ='';
+ if(udsters==''){
+ sterilizermames =sterilizerNames;
+ }else {
+ sterilizermames =udsters;
+ }
+ var udprocedure =$('#udprocedure').val();
+ var udpurpose =$('#udpurpose').val()
+ var sterilizationPurposes =$('#sterilizationPurposes').val();
+ console.log(sterilizationPurposes)
+ var sterilizationP ="";
+ if(udpurpose==''){
+ sterilizationP=sterilizationPurposes;
+ }else{
+ sterilizationP=udpurpose;
+ }
+ var udstarttime=$('#udstarttime').val();
+ var textareas=$('#textareas').html();
+ var udSterilizingnote=$('#udSterilizingnote').val();
+ var sterilingGoodsArray = [];//[{"containerBarcode":"01","children":["001","002"]}, {"containerBarcode":"02","children":["003","004"]} , {"tousseInstanceBarcode":"003"}]
+ var allTableData = $('#udsterilizationListTbale').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;
+ sterilingGoodsArray.push(objConservation);
+ }else{
+ objConservation.tousseInstanceBarcode = data.barcode;
+ sterilingGoodsArray.push(objConservation);
+ }
+ }
+ var sterilingGoodsArrays= JSON.stringify(sterilingGoodsArray)
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/saveSterilizationRecord.mhtml',
+ type:'post',
+ dataType:'json',
+ // async:false,
+ data:{id:deteilsId, recordId:'',barcodePositionInfo:'',sterilizationUser:udsterilization,sterilizationShelf:udsterilizationName,
+ frequency:udfurnace,sterilizerName:sterilizermames,sterilizationType:udprocedure,sterilizationPurpose:sterilizationP,startDate:udstarttime,parameter:textareas,
+ remark:udSterilizingnote,sterilizationGoods:sterilingGoodsArrays,srSituationComfirmer:'',cycleCounter:5,endDate:''},
+ success:function(data){
+ if(data.success===true){
+ $("#mymodal-data").modal('hide');
+ window.location.href = window.location.href;
+ }else{
+ alert(data.message)
+ }
+
+ }
+ })
+})
//完成灭菌
$("#completes").on("click", function () {
var rows = $("#table").bootstrapTable('getSelections');
@@ -1115,93 +1107,50 @@
var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
var r = window.location.search.substr(1).match(reg); //匹配目标参数
if (r != null) {
- //alert(decodeURI(unescape(r[2])));
- //alert(decodeURI(r[2]));
sterilerGroup = decodeURI(r[2])
}
$.ajax({
- // url:'./data/getSterilizationPurposeList.json',
- url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
+ url:WWWROOT+'/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup='+sterilerGroup,
type:'get',
dataType:'json',
success:function(data){
- if(data.success===true){
- for(var i =0;i"+data.rows[i]['optionText']+"");
- $('#purpose').append(opt)
- }
+ var datas =data.rows;
+ var str = "";
+ str=" "
+ for(var j=0;j"+datas[j]['name']+" ";
}
+ $('#sters').append(str)
}
+
})
- $.ajax({
- async:false,
- /* url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup=111&includeNone=yes",*/
- url:WWWROOT+"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml?sterilerGroup="+sterilerGroup,
- dataType:"json",
- type:'get',
- success:function(data){
- var lie=data.rows;
- if(data.success===true){
- var str = "";
- str=" "
- for(var i=0;i"+lie[i]['name']+" ";
- }
- $("#sters").html(str);
- }else {
- $('#Alert').html('x '+data.message+'！')
- $ ('#Alert').show ().delay (1500).fadeOut ();
- return false;
- }
- }
- });
- $.ajax({
- url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
- dataType:'json',
- type:'get',
- async:false,
- success:function(data){
- var list=data.rows;
- if(data.success===true){
- var str = "";
- str=" "
- for(var i=0;i"+list[i]['sterilisation']+" ";
- }
- $("#procedure").html(str);
- }else {
- alert(data.message)
- }
- }
- })
$('#sters').change(function(){
- $('.Option').hide();
$.ajax({
url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml?sterilizerName='+$('#sters').val(),
dataType:'json',
type:'get',
async:false,
success:function(data){
if(data.success===true){
- $('#furnace').val(data.data.maxFrequency)
- $('#furnace').attr('disabled','disabled')
- }else{
+ $('#furnace').val(data.data.maxFrequency);
+ $('#furnace').attr('disabled','disabled');
+ }else {
alert(data.message)
}
}
})
$.ajax({
url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
- dataType:'json',
type:'get',
- async:false,
+ dataType:'json',
success:function(data){
- var list=data.rows;
+ var datas= data.rows;
+ console.log(datas)
if(data.success===true){
var str = "";
str=" "
- for(var i=0;i"+list[i]['sterilisation']+" ";
+ for(var i=0;i"+datas[i]['sterilisation']+" ";
}
$("#procedure").html(str);
}else {
@@ -1210,23 +1159,31 @@
}
})
})
-
$('#procedure').change(function(){
- $('.procedure').hide();
- $.ajax({
- url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$('#sters').val(),
- type:'get',
- dataType:'json',
- async:false,
- success:function(data){
- var datas=data.rows;
+ $('#form_input').text($(this).find("option:selected").attr("data-itme"))
+
+ })
+ $.ajax({
+ url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getSterilizationPurposeList.mhtml',
+ type:'get',
+ dataType:'json',
+ success:function(data){
+ var datas =data.rows;
+ if(data.success===true){
for(var i=0;i"+datas[i]['optionText']+"");
+ $('#purpose').append(opt)
}
+ }else{
+ alert(data.message)
}
- })
+
+ }
})
+
+
+
+
})
//扫描条码add
$('#barCode').on('keydown',function(e){
@@ -1388,26 +1345,7 @@
var obj =selectContent.id;
AjaxModal(obj);
loadSterilizationGoods(obj);
+ $('#deteils').val(obj)
}
})
-//修改时重新条用 灭菌目的 //灭菌炉列表 //灭菌程序关联
-$('#udsters').change(function(){
- $.ajax({
- url:WWWROOT+'/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml?sterilizerName='+$(this).val(),
- dataType:'json',
- type:'get',
- async:false,
- success:function(data) {
- var datas=data.rows;
- if(data.success===true){
- var str = "";
- for(var k=0;k"+datas[k]['sterilisation']+"";
- $('#textareas').text(datas[k]['parameter'])
- }
- $("#udprocedure").html(str);
- }
- }
- })
-})
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24436 -r24487
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24436)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp (.../index.jsp) (revision 24487)
@@ -314,7 +314,7 @@
基础数据
'+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- ''+
- ''+
- '
'+
- '-
-
+
-
@@ -551,21 +551,21 @@
- 
- 
- 
- 
- 
- -
-
- --%>
+ <%--
- --%>
+ <%--
- --%>
+ <%--
- --%>
+ <%--
- --%>
+ <%--
- --%>
+ <%--
- --%>
+ <%--
- 
+ <%----%>
+ <%----%>
-
-
-
- --%>
+ <%--