Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
===================================================================
diff -u -r17411 -r17734
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java	(.../ClassifiedItem.java)	(revision 17411)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java	(.../ClassifiedItem.java)	(revision 17734)
@@ -29,6 +29,7 @@
 ,@Index(columnList = "itemType", name = "itemType_index")
 ,@Index(columnList = "materialdefinition_id", name = "materialdefinition_id_index")
 ,@Index(columnList = "recyclingRecordId", name = "recyclingRecordId_index")
+,@Index(columnList = "invoicePlanID", name = "invoicePlanID_index")
 })
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class ClassifiedItem {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17722 -r17734
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17722)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17734)
@@ -12008,7 +12008,6 @@
 	@Override
 	public List<ForeignTousseAfterUseDeliveryVO> getforeignTousseAfterUseDeliveryVOList(
 			String startTime, String endTime, String departCoding) {
-		
 		if(StringUtils.isNotBlank(startTime) && startTime.trim().length() == 10){
 			startTime = startTime + " 00:00:00";
 		}
@@ -12030,30 +12029,26 @@
 				+ "rr.recyclingTime recyclingTime,"
 				+ "fta.tousseName tousseName,"
 				+ "fta.supplierName supplierName,"
-				+ "case when (cb.personInCharge is null or "+sqlLengthFunctionName+"(cb.personInCharge)=0) then wr.operator else cb.personInCharge end personInCharge,"
+				+ "case when "+sqlLengthFunctionName+"(cb.personInCharge)>0 then cb.personInCharge else wr.operator end personInCharge,"
 				+ "cw.WashAndDisinfectRecord_ID washAndDisinfectRecordId "
 				
 				+ "from RecyclingRecord rr "
 				+ "inner join ClassifyBasket_RecyclingRecord cr on cr.RecyclingRecord_ID=rr.id "
 				+ "inner join ClassifyBasket cb on cb.id=cr.ClassifyBasket_ID "
 				+ "inner join ClassifiedItem ci on ci.classifybasket_id=cb.id "
-				+ "inner join invoicePlan ip on ip.id=ci.invoicePlanID "
-				+ "inner join ForeignTousseApplication fta on fta.id=ip.id "
+				+ "inner join ForeignTousseApplication fta on fta.id=ci.invoicePlanID "
 				+ "left join ClassifyBasket_WashRecord cw on cw.ClassifyBasket_ID=cb.id "
 				+ "left join WashAndDisinfectRecord wr on wr.id=cw.WashAndDisinfectRecord_ID "
 				
-				+ "where 1=1 "
-				+ "and ci.isSencondWashForForeignTousse=1 "
-				+ "and ip.handleDepartCoding='" + departCoding + "' "
+				+ "where ci.isSencondWashForForeignTousse=1 "
+				+ "and rr.orgUnitCoding='" + departCoding + "' "
 				+ "and rr.recyclingTime " + betweenSql
 				+ "order by rr.recyclingTime desc"
 				;
 		
 		ResultSet result = objectDao.executeSql(sql);
-		
 		try {
 			while(result.next()){
-				
 				String invoicePlanID = StringTools.defaultString(result.getString("invoicePlanID"));
 				ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID);
 				String personInCharge = StringTools.defaultString(result.getString("personInCharge"));
@@ -12079,7 +12074,6 @@
 					String personInChargeTemp = vo.getWashAndDisinfectUser();
 					vo.setWashAndDisinfectUser(personInChargeTemp + "," + personInCharge);  //解决拆包清洗的器械包
 				}
-				
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -12111,14 +12105,10 @@
 				}
 				vo.setWashAndDisinfectUser(washAndDisinfectUserTemp);
 			}
-			
-			
 			voList.add(vo);
 		}
 		
-		
 		return voList;
-	
 	}
 
 	@Override
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js
===================================================================
diff -u -r17582 -r17734
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js	(.../foreignTousseAfterUseDelivery.js)	(revision 17582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js	(.../foreignTousseAfterUseDelivery.js)	(revision 17734)
@@ -83,7 +83,6 @@
 							format : 'Y-m-d',
 							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',
 							allowBlank : false,
-							readOnly : true,
 							anchor : '95%',
 							value: new Date(startDayofMonth)
 						}]
@@ -95,7 +94,6 @@
 						xtype : 'datefield',
 						fieldLabel : '结束日期',
 						allowBlank : false,
-						readOnly : true,
 						id : 'endTime',
 						name : 'endTime',
 						editable : false,