Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r16710 -r16724
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 16710)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 16724)
@@ -1736,6 +1736,9 @@
 					}
 					tousseInstance.setLocation(deptCode);
 					tousseInstance.setLocationForDisplay(deptName);
+					//结算科室赋值为所在位置,解决不能退货的问题
+					tousseInstance.setSettleAccountsDepartCode(deptCode);
+					tousseInstance.setSettleAccountsDepart(deptName);
 					tousseInstanceManager.saveOrUpdate(tousseInstance);
 				}
 				objectDao.saveOrUpdate(invoice);
@@ -1771,6 +1774,9 @@
 				}
 				tousseInstance.setLocation(deptCode);
 				tousseInstance.setLocationForDisplay(deptName);
+				//结算科室赋值为所在位置,解决不能退货的问题
+				tousseInstance.setSettleAccountsDepartCode(deptCode);
+				tousseInstance.setSettleAccountsDepart(deptName);
 				tousseInstance.setInvoice_id(invoice.getId());
 				tousseInstanceManager.saveOrUpdate(tousseInstance);
 				TousseDefinition td = tousseInstance
@@ -2032,7 +2038,7 @@
 		String sql = " where po.sterilizer.name='" + sterileName
 				+ "' and po.frequency>="
 				+ Integer.valueOf(sterilizingFrequency_start)
-				+ " and po.endDate>="
+				+ " and po.startDate>="
 				+ dateQueryAdapter.dateAdapter(startDate)
 				//+ " and po.sterilizationPurpose!='"+ SterilizationRecord.STERILIZATIONPURPOSE_TYPE + "' "
 				+ "and po.status='"