Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java
===================================================================
diff -u -r15680 -r15697
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java	(.../ForeignTousseSterilizationMonitorAndDeliveryVO.java)	(revision 15680)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java	(.../ForeignTousseSterilizationMonitorAndDeliveryVO.java)	(revision 15697)
@@ -5,6 +5,7 @@
 /**
  * 2016-10-18
  * @author Chenjiaru
+ * 外来器械包的植入物和植入型器械灭菌监测及发放报表的javabean
  *
  */
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java
===================================================================
diff -u -r15481 -r15697
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 15481)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 15697)
@@ -6,19 +6,34 @@
 /**
  * 2016-10-22
  * @author Chenjiaru
+ * 外来器械使用后交接报表的javabean
  *
  */
 public class ForeignTousseAfterUseDeliveryVO {
 
 	
-	private String twoRecovery;  //二次回收时间
+	/**
+	 * 二次回收时间
+	 */
+	private String twoRecovery;
 	
-	private String tousseName;  //器械名称
+	/**
+	 * 器械名称
+	 */
+	private String tousseName;
 	
-	private String supplier;  //供应商
+	/**
+	 * 供应商
+	 */
+	private String supplier;
 	
-	private String washAndDisinfectUser;  // 清洗消毒员
+	/**
+	 * 清洗消毒员
+	 */
+	private String washAndDisinfectUser;
 
+	
+	
 	public String getTwoRecovery() {
 		return twoRecovery;
 	}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15693 -r15697
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15693)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15697)
@@ -11590,6 +11590,7 @@
 				+ "t.tousseName tousseName,"
 				+ "fta.supplierName supplierName,"
 				+ "m.materialName materialName,"
+				+ "md.isImplant isImplant,"
 				+ "s.ownGroup ownGroup,"
 				+ "s.name name,"
 				+ "sr.status status,"
@@ -11620,8 +11621,8 @@
 				+ "left join Invoice i on i.id=t.invoice_id "
 				+ "left join UseRecord ur on ur.id=t.useRecord_id "
 				
-				+ "where "
-				+ "md.isImplant='是' "
+				+ "where 1=1 "
+//				+ "and md.isImplant='是' "
 				+ "and (td.tousseType = '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "' or td.tousseType = '" + TousseDefinition.PACKAGE_TYPE_SPLIT + "') "
 				+ "and sr.orgUnitCoding='" + departCoding + "' "
 				+ "and sr.endDate " + betweenSql
@@ -11639,6 +11640,7 @@
 				String tousseName = StringTools.defaultString(result.getString("tousseName"));
 				String supplierName = StringTools.defaultString(result.getString("supplierName"));
 				String materialName = StringTools.defaultString(result.getString("materialName"));
+				String isImplant = StringTools.defaultString(result.getString("isImplant"));
 				String ownGroup = StringTools.defaultString(result.getString("ownGroup"));
 				String name = StringTools.defaultString(result.getString("name"));
 				String status = StringTools.defaultString(result.getString("status"));
@@ -11679,12 +11681,17 @@
 				String splitPackagesAmount = foreignTousseJSONObject.optString("splitPackagesAmount", "1");  //拆包数量如果splitPackagesAmount等于"1"则说明没有拆包，
 				String theFrstFew = CssdUtils.getTheFrstFew(tousseName);
 				
+				if ("是".equals(isImplant)) {
+					vo.setImplantName(materialName);
+					vo.setIsImplant("√");
+				} else {
+					vo.setImplantName("其他");
+				}
+				
 				vo.setTousseNumber(theFrstFew != null ? (splitPackagesAmount + "-" + theFrstFew) : "");
 				vo.setTousseNameId(tousseNameId);
-				vo.setIsImplant(materialName != "" ? "√" :"");
 				vo.setTousseName(tousseName);
 				vo.setSupplier(supplierName);
-				vo.setImplantName(materialName);
 				vo.setUseTime(applicationTime);
 				vo.setUseDepartment(depart);
 				vo.setPatientName(patientName);