Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r17875 -r17945 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 17875) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 17945) @@ -73,6 +73,12 @@ private String operationRoom;//手术间 + /** + * 病区 + * 针对中大附一提出的问题增加,从手术预约单中获取对应的值,其它项目暂不处理 + */ + private String patientArea; + private String roomNumber;// 病室 private String bedNumber;// 床位 @@ -164,6 +170,14 @@ this.operationRoom = operationRoom; } + public String getPatientArea() { + return patientArea; + } + + public void setPatientArea(String patientArea) { + this.patientArea = patientArea; + } + public String getRoomNumber() { return roomNumber; } Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r17911 -r17945 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 17911) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 17945) @@ -296,6 +296,9 @@ if(patientInfo.operation){ top.Ext.getCmp('operation').setValue(patientInfo.operation); } + if(patientInfo.patientArea){ + top.Ext.getCmp('patientArea').setValue(patientInfo.patientArea); + } if(patientInfo.roomNumber){ top.Ext.getCmp('roomNumber').setValue(patientInfo.roomNumber); } @@ -1290,6 +1293,18 @@ hidden : sstsConfig.hideRoomNumber, items : [{ xtype : 'textfield', + fieldLabel : '病区', + maxLength : '16', + id : 'patientArea', + name : 'patientArea', + anchor : '96%' + }] + }, { + layout : 'form', + columnWidth : 0.33, + hidden : sstsConfig.hideRoomNumber, + items : [{ + xtype : 'textfield', fieldLabel : '病室', maxLength : '16', id : 'roomNumber',