Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r36974 -r37019
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 36974)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 37019)
@@ -1262,7 +1262,7 @@
result += "";
return result
} },
- { header: "灭菌总数量", width: 70, align: 'center', dataIndex: 'amount' },
+ { header: "灭菌包总数量", width: 70, align: 'center', dataIndex: 'amount' },
{
header: "灭菌器参数", width: 70, dataIndex: 'sterilizerRecordAmount', sortable: false, renderer: function (v, p, record) {
var buttonGroup = "";
@@ -1613,6 +1613,14 @@
}
}
}, '-', {
+ text: '器械包名称:'
+ }, {
+ xtype: 'textfield',
+ fieldLabel: "器械包名称",
+ allowBlank: true,
+ name: "tousseName",
+ id: "tousseName"
+ }, '-', {
text: '查询',
minWidth: 50,
iconCls: 'icon_search',
@@ -1621,6 +1629,7 @@
var requestEndTime = Ext.getCmp('requestEndTime');
if (requestStartTime.isValid() && requestEndTime.isValid()) {
$Id("parm_s_requestTimeQuantum").value = Ext.util.Format.date(requestStartTime.getValue(), 'Y-m-d H:i') + ';' + Ext.util.Format.date(requestEndTime.getValue(), 'Y-m-d H:i');
+ $Id("parm_s_tousseName").value = Ext.getCmp('tousseName').getValue();
grid.getStore().lastOptions.params['start'] = 0;
grid.dwrReload();
} else {
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r36189 -r37019
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 36189)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 37019)
@@ -163,6 +163,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r36701 -r37019
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36701)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 37019)
@@ -656,7 +656,7 @@
var basketAmount = 0; //篮筐数量
var isDoubleCheckOfSterilization = '否';
var tousseNameOfAmount = {}; //器械包名称和数量
- var statisticsAmount = { '篮筐': 0, '器械包': 0, '敷料包': 0, '外来器械包': 0, '代理灭菌包': 0, '灭菌物品总数量': 0, '植入物': 0 };
+ var statisticsAmount = { '篮筐': 0, '器械包': 0, '敷料包': 0, '外来器械包': 0, '代理灭菌包': 0, '灭菌包总数量': 0, '植入物': 0 };
rootNode.eachChild(function (pNode) {
if (pNode.attributes.type == '篮筐') { //此节点是篮筐
statisticsAmount['篮筐'] = statisticsAmount['篮筐'] + 1;
@@ -672,11 +672,11 @@
sumTousseAndBasket(pNode, tousseNameOfAmount, statisticsAmount);
}
});
- top.Ext.getCmp('totalAmount').setText("灭菌物品总数量:" + (statisticsAmount['灭菌物品总数量']));
+ top.Ext.getCmp('totalAmount').setText("灭菌包总数量:" + (statisticsAmount['灭菌包总数量']));
if (sstsConfig.enableDoubleCheckOfSterilizationFunction) {
isDoubleCheckOfSterilization = top.Ext.getCmp('isDoubleCheckOfSterilization').getValue();
if (isDoubleCheckOfSterilization !== '是') {
- top.Ext.getCmp('checkTousseAmount').setValue(statisticsAmount['灭菌物品总数量']);
+ top.Ext.getCmp('checkTousseAmount').setValue(statisticsAmount['灭菌包总数量']);
}
}
top.Ext.getCmp('typeTotalAmount').setText(
@@ -747,9 +747,9 @@
statisticsAmount['植入物'] = statisticsAmount['植入物'] + 1;
}
statisticsAmount[typeForSterilizationStatistics] = statisticsAmount[typeForSterilizationStatistics] + amount;
- statisticsAmount['灭菌物品总数量'] = statisticsAmount['灭菌物品总数量'] + amount;
+ statisticsAmount['灭菌包总数量'] = statisticsAmount['灭菌包总数量'] + amount;
//给已扫描数量(大号字体)赋值
- top.Ext.getCmp('nowScanAmountId').setValue(statisticsAmount['灭菌物品总数量'])
+ top.Ext.getCmp('nowScanAmountId').setValue(statisticsAmount['灭菌包总数量'])
}
/**