Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15259 -r15335 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15259) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15335) @@ -1036,7 +1036,7 @@ } }); }else if (result.returnType == 'user'){ - loadPeopleByBarcode(barcode,top.Ext.getCmp('applicant')); + loadPeopleByBarcode(barcode,top.Ext.getCmp('sterilizationUser')); }else if(result.returnType == 'container'){ if(result.containerType == '灭菌筐'){ if(result.status == '灭菌'){ @@ -1147,7 +1147,7 @@ listeners : { specialkey : function(thiz, e){ if(e.getKey() == 13){ - loadPeopleByBarcode(thiz,top.Ext.getCmp('applicant')); + loadPeopleByBarcode(thiz,top.Ext.getCmp('sterilizationUser')); } } }, @@ -1162,8 +1162,8 @@ xtype : 'textfield', fieldLabel : '灭菌员', maxLength : '16', - id : 'applicant', - name : 'applicant', + id : 'sterilizationUser', + name : 'sterilizationUser', allowBlank : sstsConfig.hiddenForeignProxyPartElement, readOnly : true, anchor : '100%' @@ -1514,9 +1514,9 @@ id :'viewTousseInstances', text : '查看器械包', handler : function(){ - var applicant = top.Ext.getCmp('applicant').getValue(); + var sterilizationUser = top.Ext.getCmp('sterilizationUser').getValue(); var depart = top.Ext.getCmp('depart').getValue(); - rePrintBarcodeWinForForeignProxyDisinfection(id,applicant,depart); + rePrintBarcodeWinForForeignProxyDisinfection(id,sterilizationUser,depart); } },{ id :'saveBtn', @@ -1729,11 +1729,12 @@ } if(!id){ - if(isSupplyRoomUser){ - top.Ext.getCmp('applicant').setValue($Id('userName').value); - }else{ - top.Ext.getCmp('maker').setValue($Id('userName').value); - } +// if(isSupplyRoomUser){ +// top.Ext.getCmp('sterilizationUser').setValue($Id('userName').value); +// }else{ +// top.Ext.getCmp('maker').setValue($Id('userName').value); +// } + top.Ext.getCmp('sterilizationUser').setValue($Id('userName').value); top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); top.Ext.getCmp('arrivedTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); } @@ -1964,8 +1965,8 @@ xtype : 'textfield', fieldLabel : '灭菌员', maxLength : '41', - id : 'applicant', - name : 'applicant', + id : 'sterilizationUser', + name : 'sterilizationUser', readOnly:true, anchor : '99%' }] @@ -2176,7 +2177,7 @@ var columns = [ {header : "流水号",width : 90,dataIndex : 'serialNumber', renderer : modifyRecord}, - {header : "灭菌员",width : 80,dataIndex : 'applicant',hidden : sstsConfig.hiddenForeignProxyPartElement}, + {header : "灭菌员",width : 80,dataIndex : 'sterilizationUser',hidden : sstsConfig.hiddenForeignProxyPartElement}, {header : "申请科室",width : 150,dataIndex : 'depart'}, {header : "器械包数量",width : 80,dataIndex : 'tousseAmount'}, {header : "是否打印",width : 65,dataIndex : 'hasPrinted'}, @@ -2214,6 +2215,7 @@ var readerDetail = [ {name : 'id'}, {name : 'applicant'}, + {name : 'sterilizationUser'}, {name : 'lendGoodsBrief'}, {name : 'maker'}, {name : 'assistant'}, @@ -2234,6 +2236,7 @@ filters : [ {type : 'string',dataIndex : 'serialNumber'}, {type : 'string',dataIndex : 'applicant'}, + {type : 'string',dataIndex : 'sterilizationUser'}, {type : 'string',dataIndex : 'maker'}, {type : 'string',dataIndex : 'assistant'}, {type : 'string',dataIndex : 'deliverStatus'}, Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r15157 -r15335 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15157) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15335) @@ -18,7 +18,7 @@ public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", - "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8"};// 版本列表 + "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java =================================================================== diff -u -r15157 -r15335 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 15157) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java (.../ForeignProxyDisinfection.java) (revision 15335) @@ -43,6 +43,10 @@ */ private String assistant; /** + * 灭菌员 + */ + private String sterilizationUser = ""; + /** * 送来时间 */ private Date arrivedTime; @@ -109,6 +113,15 @@ public void setAssistant(String assistant) { this.assistant = assistant; } + + public String getSterilizationUser() { + return sterilizationUser; + } + + public void setSterilizationUser(String sterilizationUser) { + this.sterilizationUser = sterilizationUser; + } + @Transient public String getArrivedTimeStr(){ if(arrivedTime != null){ Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.8_4.3.9.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.8_4.3.9.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.8_4.3.9.sql (revision 15335) @@ -0,0 +1 @@ +update ForeignProxyDisinfection set sterilizationUser=(select applicant from InvoicePlan where id=ForeignProxyDisinfection.id) where sterilizationUser is null; \ No newline at end of file