Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r15756 -r15965 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15756) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 15965) @@ -1709,52 +1709,52 @@ sterilizationColumnTree.getEl().unmask(); var result = response.responseText; if(result != null && result.length > 0){ - if(SHELF == result){//灭菌架 + if(SHELF == result){ //灭菌架 loadSterilizationShelf(barcode); top.Ext.getCmp('inputBarcode').setValue(""); - }else if(USER == result){ + }else if(USER == result){ //用户 if(scanUser == true){ loadSterilizationUser(barcode); }else{ showResult("请输入正确的条码！"); } top.Ext.getCmp('inputBarcode').setValue(""); - }else if(BASKET == result){ + }else if(BASKET == result){ //灭菌篮筐 loadTousseInstanceCheckPosition(barcode,recordID); if(hiddenEndBarcode || currentScanMode == 'single'){ top.Ext.getCmp('inputBarcode').setValue("");//如果使用虚拟篮筐机制,扫描成功后需要清除该文本内容 }else{ top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 } - }else if (STERILIZER == result){ + }else if (STERILIZER == result){ //灭菌炉 getSterilization(barcode,recordID); top.Ext.getCmp('inputBarcode').setValue(""); - }else if(STERILISATION == result){ + }else if(STERILISATION == result){ //灭菌程序 var sterilizerName = top.Ext.getCmp('sterilizerName').getRawValue(); if(sterilizerName.length <= 0){ showResult("请选择灭菌炉！"); return; } loadSterilizationType(barcode,sterilizerName); top.Ext.getCmp('inputBarcode').setValue(""); - }else if(TOUSSEINSTANCE == result){ + }else if(TOUSSEINSTANCE == result){ //器械包实例 loadTousseInstanceCheckPosition(barcode,recordID); if(hiddenEndBarcode || currentScanMode == 'single'){ top.Ext.getCmp('inputBarcode').setValue("");//如果使用虚拟篮筐机制,扫描成功后需要清除该文本内容 }else{ top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 } - }else if(POSITION == result){ + }else if(POSITION == result){ //位置 loadPositionByBarcode(barcode); top.Ext.getCmp('inputBarcode').setValue(""); - }else if("virtualBasket" == result){ + }else if("virtualBasket" == result){ //虚拟篮筐 loadTousseInstance(barcode,recordID,removePendingSterilizationGoods(barcode)); if(hiddenEndBarcode || currentScanMode == 'single'){ top.Ext.getCmp('inputBarcode').setValue("");//如果使用虚拟篮筐机制,扫描成功后需要清除该文本内容 }else{ top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 } - }else if("notFixedBarcode" == result){ + }else if("notFixedBarcode" == result){ //固定条码 showResult("该器械包为可追溯的包，不能扫描固定条码!"); top.Ext.getCmp('inputBarcode').setValue(""); }else if("errorBasket" == result){ @@ -1773,7 +1773,7 @@ } }, failure : function(response, options) { - sterilizationColumnTree.getEl().unmask(); + sterilizationColumnTree.getEl().unmask(); var result = Ext.decode(response.responseText); showResult(result); } @@ -2005,6 +2005,7 @@ items : [{ xtype : 'combo', fieldLabel : "物理监测结果", + readOnly : true, valueField : 'value', displayField : 'value', store : monitorResutlStore, @@ -2021,6 +2022,7 @@ items : [{ xtype : 'combo', fieldLabel : "化学监测结果", + readOnly : true, valueField : 'value', displayField : 'value', store : monitorResutlStore, @@ -2037,6 +2039,7 @@ items : [{ xtype : 'combo', fieldLabel : "生物监测结果", + readOnly : true, valueField : 'value', displayField : 'value', store : monitorResutlStore, @@ -2058,6 +2061,7 @@ id : 'biologicalMonitoringStartDate', name : 'biologicalMonitoringStartDate', editable : false, + readOnly : true, altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', selectOnFocus :true, format : 'Y-m-d H:i', @@ -2095,6 +2099,7 @@ editable : false, altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', selectOnFocus :true, + readOnly : true, format : 'Y-m-d H:i', anchor : '100%' }] @@ -2349,7 +2354,6 @@ }); if(id != null && id > 0){ - top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(action.result.data.biologicalMonitoringEndDate)); //设置生物监测的结束时间 var t_amount = action.result.data.tousseAmount; var f_amount = action.result.data.foreignTousseAmount; var d_amount = action.result.data.dressingTousseAmount; @@ -2358,23 +2362,14 @@ top.Ext.getCmp('typeTotalAmount').setText("篮筐:"+r_amount+" ,器械包:"+t_amount+" ,敷料包:"+d_amount+" ,外来器械包:"+f_amount+", 代理灭菌包:"+p_amount); } - var physicsResult = action.result.data.physicsResult; - var chemistryResult = action.result.data.chemistryResult; - var biologyResult = action.result.data.biologyResult; - if(physicsResult == null || physicsResult.length<=0){ + if(action.result.data.status != statusEnd){ //还没灭菌完成 top.Ext.getCmp('physicsResult').setValue("无"); - } - if(chemistryResult == null || chemistryResult.length<=0){ top.Ext.getCmp('chemistryResult').setValue("无"); - } - if(biologyResult == null || biologyResult.length<=0){ top.Ext.getCmp('biologyResult').setValue("无"); - } - - if(action.result.data.status != statusEnd){ top.Ext.getCmp('physicsResult').disable(); top.Ext.getCmp('chemistryResult').disable(); top.Ext.getCmp('biologyResult').disable(); + top.Ext.getCmp('biologicalMonitoringEndDate').disable(); top.Ext.getCmp('monitorCheckerCode').disable(); top.Ext.getCmp('monitorChecker').disable(); @@ -2386,11 +2381,15 @@ disableItems(); top.Ext.getCmp('saveBtn').setDisabled(true); } - }else{ + }else{ //灭菌完成 var biologicalMonitoringStartDate = action.result.data.biologicalMonitoringStartDate; - if (biologicalMonitoringStartDate) { - top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate)); - } else { //已经添加过生物监测 + if (biologicalMonitoringStartDate) { //已经添加过生物监测 + top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate)); //设置生物监测的开始时间 + top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(action.result.data.biologicalMonitoringEndDate)); //设置生物监测的结束时间 + } else { + top.Ext.getCmp('physicsResult').setValue("合格"); + top.Ext.getCmp('chemistryResult').setValue("合格"); + top.Ext.getCmp('biologyResult').setValue("合格"); top.Ext.getCmp('biologicalMonitoringStartDate').setValue(top.Ext.getCmp('endDate').getValue()); var temp = top.Ext.getCmp('biologicalMonitoringStartDate').getValue().getTime() + _biologicalMonitoringTime; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r15949 -r15965 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15949) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15965) @@ -452,7 +452,7 @@ } sterilizationRecord.setStatus(SterilizationRecord.STERILIZATION_STATUS_END); -// sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); //没做的结果应该为"无"，怎么会给一个"合格"的结果给他呢？（cjr） +// sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); // sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); // sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); // 灭菌记录的的温度压力数据条数