Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r23953 -r24004
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 23953)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 24004)
@@ -76,6 +76,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
+import com.forgon.tools.StrutsParamUtils;
 
 /**
  * @author wangyi 2012-08-15 上午12:04
@@ -439,9 +440,20 @@
 	public List<ApparatusInfusionisType> getApparatusInfusionis(String startDay,String endDay,String departCoding,String showDetail);
 
 	public List<BorrowingRecordVo> getBorrowingRecord(String startDay,String endDay,String goodsName,String deptName);
-	
-	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(String startDay,String endDay,String goodsName,String deptName);
+
 	/**
+	 * 外来器械申请单统计报表:
+	 * @param startDay 开始时间(仅年月日,如yyyy-MM-dd)
+	 * @param endDay 结束时间(仅年月日,如yyyy-MM-dd)
+	 * @param goodsName 外来器械包名称
+	 * @param deptName 科室名称
+	 * @param patientName 病人姓名
+	 * @param deliverStatus 发货状态
+	 * @return
+	 */
+	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(String startDay,String endDay,String goodsName,String deptName,
+			String patientName , String deliverStatus);
+	/**
 	 * 获取入库统计的报表数据，以供应商分类
 	 * @param startTime 起始时间
 	 * @param endTime 结束时间
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23953 -r24004
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23953)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 24004)
@@ -13145,7 +13145,7 @@
 
 	@Override
 	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(
-			String startDay, String endDay, String goodsName, String deptName) {
+			String startDay, String endDay, String goodsName, String deptName , String patientName , String deliverStatus) {
 		List<ForeignTousseApplicationVO> list = new LinkedList<ForeignTousseApplicationVO>();
 		if (StringUtils.isNotBlank(endDay)) {
 			endDay += " 23:59:59";
@@ -13158,7 +13158,7 @@
 //						dateQueryAdapter.dateAdapter(startDay),
 //						dateQueryAdapter.dateAdapter(endDay));
 		String sql = String
-				.format("select f.id from %s f,%s i where f.id=i.id and (i.applicationTime between %s and %s)  ",
+				.format("select f.id from %s f join %s i on f.id=i.id where (i.applicationTime between %s and %s)  ",
 						ForeignTousseApplication.class.getSimpleName(),
 						InvoicePlan.class.getSimpleName(),
 						dateQueryAdapter.dateAdapter(startDay),
@@ -13174,7 +13174,15 @@
 			sql = " and i.depart = '" + deptName + "' ";
 			sqlBuilder.append(sql);
 		}
-		sqlBuilder.append(" order by id asc");
+		if (StringUtils.isNotBlank(patientName)) {
+			sql = " and f.patient = '" + patientName + "' ";
+			sqlBuilder.append(sql);
+		}
+		if (StringUtils.isNotBlank(deliverStatus)) {
+			sql = " and i.deliverStatus = '" + deliverStatus + "' ";
+			sqlBuilder.append(sql);
+		}
+		sqlBuilder.append(" order by i.id asc");
 		ResultSet rs = objectDao.executeSql(sqlBuilder.toString());
 		try {
 			while (rs.next()) {
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp
===================================================================
diff -u -r12331 -r24004
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp	(.../foreignTousseApplicationReport.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp	(.../foreignTousseApplicationReport.jsp)	(revision 24004)
@@ -71,7 +71,7 @@
 
 
 
-<title>借还物统计报表</title>
+<title>外来器械申请单统计报表</title>
 </head>
 <body>
 
@@ -85,9 +85,5 @@
 </table>
 
 </strong>
-<form name="parametersFrm">
-    <input type="hidden" id="parm_s_monthSearch" name="parm_s_monthSearch" value="">
-    <input type="hidden" id="parm_s_departSearch" name="parm_s_departSearch" value="">
-</form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r17582 -r24004
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 17582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 24004)
@@ -17,14 +17,18 @@
 		var startTime= $Id('startTime').value;
 		var endTime = $Id('endTime').value;
 		var deptName = $Id('departSearch').value;
+		var patientName = $Id('patientName').value;
+		var deliverStatus = $Id('deliverStatus').value;
 //		var goodsName = $Id('goodsSearch').value;
 		var goodsName = '';
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
 		});
 		myMask.show();
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=foreignTousseApplicationReport.jasper&startDay="+startTime+"&endDay="+endTime+"&deptName="+deptName+"&goodsName="+goodsName+"&reportName=foreignTousseApplicationReport",'thisIframe','_self');
+		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do"
+				+"?jasperreportName=foreignTousseApplicationReport.jasper&startDay="+startTime+"&endDay="+endTime+"&deptName="+deptName+"&goodsName="+goodsName
+				+"&reportName=foreignTousseApplicationReport&patientName="+patientName+"&deliverStatus="+deliverStatus,'thisIframe','_self');
 	}
 	
 	var dt = new Date();
@@ -82,7 +86,7 @@
 				name : 'departCoding',
 				id : 'departCoding'
 			},{
-				width : 220,
+				width : 180,
 				layout : 'form',
 				labelWidth : 60,
 				items : [
@@ -117,7 +121,7 @@
 						} ]
 				}]
 			},{
-				width : 220,
+				width : 180,
 				layout : 'form',
 				labelWidth : 60,
 				items : [{
@@ -148,7 +152,7 @@
 					} ]
 				}]
 			},{
-				width : 240,
+				width : 180,
 				layout : 'form',
 				labelWidth : 40,
 				items : [{
@@ -169,6 +173,44 @@
 					allowBlank : true,
 					anchor : '100%'
 				}]
+			},{
+				width : 180,
+				layout : 'form',
+				labelWidth : 40,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '病人',
+					allowBlank : true,
+					name : "patientName",
+					id : "patientName",
+					anchor : '90%'
+				}]
+			},{
+				width : 150,
+				layout : 'form',
+				labelWidth : 60,
+				items : [{
+					xtype : 'combo',
+					id : 'deliverStatus',
+					name : 'deliverStatus',
+					queryParam : 'spell',
+					fieldLabel : '发货状态',
+					minChars : 0,
+					valueField : 'name',
+					displayField : 'name',
+					store : new Ext.data.SimpleStore({
+						fields : ['name'],
+						data : [['待发货'],['部分发货'],['已发货']]
+					}),
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					mode : 'local',
+					hideTrigger : false,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '100%'
+				}]
 			}
 //			,{
 //				width : 280,
@@ -217,6 +259,8 @@
 				$Id('endTime').value = "";
 				$Id('goodsSearch').value = "";
 				$Id('departSearch').value = "";
+				$Id('patientName').value = "";
+				$Id('deliverStatus').value = "";
 			}
 		}]
 	});
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r23953 -r24004
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 23953)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 24004)
@@ -901,9 +901,12 @@
 			if(StringUtils.isBlank(startDay) && StringUtils.isBlank(endDay)){
 				return null;
 			}
-			String goodsName = StrutsParamUtils.getPraramValue("goodsName", "");;
-			String deptName = StrutsParamUtils.getPraramValue("deptName", "");;
-			return jasperReportManager.getForeignTousseApplicationReport(startDay, endDay, goodsName, deptName);
+			String goodsName = StrutsParamUtils.getPraramValue("goodsName", "");
+			String deptName = StrutsParamUtils.getPraramValue("deptName", "");
+			//新增加病人姓名与发货状态
+			String patientName = StrutsParamUtils.getPraramValue("patientName", "");
+			String deliverStatus = StrutsParamUtils.getPraramValue("deliverStatus", "");
+			return jasperReportManager.getForeignTousseApplicationReport(startDay, endDay, goodsName, deptName , patientName , deliverStatus);
 		}else if("godownEntrySummary".equals(reportName)){  //以供应商分类的一次性物品入库统计报表
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			String timeStart = StrutsParamUtils.getPraramValue("timeStart",