Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
===================================================================
diff -u -r29768 -r29783
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java	(.../ForeignTousseApplication.java)	(revision 29768)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java	(.../ForeignTousseApplication.java)	(revision 29783)
@@ -627,11 +627,11 @@
 			}
 			// 病人所属科室
 			if(StringUtils.isBlank(foreignTousseApplication.getAscriptionDepartment())){
-				foreignTousseApplication.setAscriptionDepartment(tempUseRecord.getAscriptionDepartment());
+				foreignTousseApplication.setAscriptionDepartment(tempUseRecord.getDepartCodeOfpatient());
 			}
 			// 手术名称
-			if(StringUtils.isBlank(foreignTousseApplication.getOperationRoom())){
-				foreignTousseApplication.setOperationRoom(tempUseRecord.getOperationRoom());
+			if(StringUtils.isBlank(foreignTousseApplication.getSurgery())){
+				foreignTousseApplication.setSurgery(tempUseRecord.getOperation());
 			}
 			// 手术时间
 			if(foreignTousseApplication.getOperationTime() == null){
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r29768 -r29783
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 29768)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 29783)
@@ -2859,7 +2859,7 @@
 							if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
 								foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_RECYCLED);
 								foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_RECYCLED);
-								foreignTousseApplication.setApplicationTime(new Date());
+								foreignTousseApplication.setSubmitTime(new Date());
 								foreignTousseApplication.setUseRecord(useRecord);
 								ForeignTousseApplication.setUseRecordInfo(foreignTousseApplication);
 								//申请单追加备注(说明情况)
@@ -2898,7 +2898,7 @@
 									foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 									foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
 								}
-								foreignTousseApplication.setApplicationTime(new Date());
+								foreignTousseApplication.setSubmitTime(new Date());
 								foreignTousseApplication.setUseRecord(useRecord);
 								ForeignTousseApplication.setUseRecordInfo(foreignTousseApplication);
 							}