Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r15348 -r15361 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15348) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15361) @@ -918,6 +918,7 @@ obj.put("sterilizer", foreignProxyDisinfection.getSterilizer()); obj.put("frequency", foreignProxyDisinfection.getFrequency()); obj.put("applicant", foreignProxyDisinfection.getApplicant()); + obj.put("sterilizationUser", foreignProxyDisinfection.getSterilizationUser()); obj.put("depart", foreignProxyDisinfection.getDepart()); String validUntilStr = tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD);; Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js =================================================================== diff -u -r15327 -r15361 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 15327) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 15361) @@ -420,6 +420,10 @@ id : 'serialNumber' },{ xtype : 'hidden', + name : 'sterilizationUser', + id : 'sterilizationUser' + },{ + xtype : 'hidden', name : 'itemIds', id : 'itemIds' },{ Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15348 -r15361 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15348) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15361) @@ -798,6 +798,10 @@ id : 'serialNumber' },{ xtype : 'hidden', + name : 'applicant', + id : 'applicant' + },{ + xtype : 'hidden', name : 'itemIds', id : 'itemIds' },{ @@ -1293,7 +1297,7 @@ width: 200, minWidth : 190, // hidden : sstsConfig.printLabelWhenReviewing, -// emptyText : '2016-02-01', + emptyText : '默认为今天', // inputAttrTpl: " data-qtip='空白表示灭菌日期为今天' ", 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',