Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r25743 -r25803
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25743)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25803)
@@ -1126,7 +1126,8 @@
 			//新增加病人姓名与发货状态
 			String patientName = StrutsParamUtils.getPraramValue("patientName", "");
 			String deliverStatus = StrutsParamUtils.getPraramValue("deliverStatus", "");
-			return customReportsOfXjjqzyy.getForeignTousseApplicationReport(startDay, endDay, assemblingStartTime, assemblingEndTime, goodsName, deptName, patientName, deliverStatus);
+			String queryHourSection = StrutsParamUtils.getPraramValue("queryHourSection", "");
+			return customReportsOfXjjqzyy.getForeignTousseApplicationReport(startDay, endDay, assemblingStartTime, assemblingEndTime, goodsName, deptName, patientName, deliverStatus, queryHourSection);
 		}else if("godownEntrySummary".equals(reportName)){  //以供应商分类的一次性物品入库统计报表
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			String timeStart = StrutsParamUtils.getPraramValue("timeStart",
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js
===================================================================
diff -u -r25757 -r25803
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 25757)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/reports/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 25803)
@@ -34,6 +34,7 @@
 		var endTime = $Id('endTime').value;
 		var assemblingStartTime = $Id('assemblingStartTime').value;
 		var assemblingEndTime = $Id('assemblingEndTime').value;
+		var queryHourSection = $Id('queryHourSection').value;
 		if(assemblingStartTime > assemblingEndTime && assemblingEndTime != ""){
 			showResult('装配开始时间不能大于装配结束时间');
 			$Id('assemblingStartTime').focus();
@@ -51,7 +52,7 @@
 		myMask.show();
 		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do"
 				+"?jasperreportName=foreignTousseApplicationReport-xjjqzyy.jasper&startDay="+startTime+"&endDay="+endTime+ "&assemblingStartTime=" + assemblingStartTime + "&assemblingEndTime=" + assemblingEndTime + "&deptName="+deptName+"&goodsName="+goodsName
-				+"&reportName=foreignTousseApplicationReport-xjjqzyy&patientName="+patientName+"&deliverStatus="+deliverStatus,'thisIframe','_self');
+				+"&reportName=foreignTousseApplicationReport-xjjqzyy&patientName="+patientName+"&deliverStatus="+deliverStatus+"&queryHourSection="+queryHourSection,'thisIframe','_self');
 	}
 	
 	var dt = new Date();
@@ -296,6 +297,34 @@
 					allowBlank : true,
 					anchor : '100%'
 				}]
+			},{
+				width : 210,
+				layout : 'form',
+				labelWidth : 110,
+				items : [{
+					xtype : 'combo',
+					id : 'queryHourSection',
+					name : 'queryHourSection',
+					queryParam : 'spell',
+					fieldLabel : '每天装配时间段',
+					minChars : 0,
+					editable : false,
+					valueField : 'queryHour',
+					displayField : 'queryHour',
+					value : ['所有'],
+					store : new Ext.data.SimpleStore({
+						fields : ['queryHour'],
+						data : [['所有'],['19:00-23:59'],['00:00-18:59']]
+					}),
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					mode : 'local',
+					hideTrigger : false,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '100%'
+				}]		
 			}
 //			,{
 //				width : 280,
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
===================================================================
diff -u -r25756 -r25803
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 25756)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 25803)
@@ -43,8 +43,14 @@
 	 * @return 外来器械申请报表数据列表
 	 */
 	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(
-			String startDay, String endDay, String assemblingStartTime, String assemblingEndTime, String goodsName, String deptName , String patientName , String deliverStatus) {
+			String startDay, String endDay, String assemblingStartTime, String assemblingEndTime, String goodsName, String deptName , String patientName , String deliverStatus, String queryHourSection) {
 		List<ForeignTousseApplicationVO> list = new LinkedList<ForeignTousseApplicationVO>();
+		String queryHourSectionSql = "";
+		if("19:00-23:59".equals(queryHourSection)){
+			queryHourSectionSql = "and CONVERT(CHAR(5), ti.operationTime, 14) BETWEEN '19:00:00' AND '23:59:59'";
+		}else if("00:00-18:59".equals(queryHourSection)){
+			queryHourSectionSql = "and CONVERT(CHAR(5), ti.operationTime, 14) BETWEEN '00:00:00' AND '18:59:59'";
+		}
 		if (StringUtils.isNotBlank(endDay)) {
 			endDay += " 23:59:59";
 		}
@@ -74,7 +80,7 @@
 						dateQueryAdapter.dateAdapter(startDay),
 						dateQueryAdapter.dateAdapter(endDay));
 		StringBuilder sqlBuilder = new StringBuilder();
-		sqlBuilder.append(sql).append(operationTimeSql);
+		sqlBuilder.append(sql).append(operationTimeSql).append(queryHourSectionSql);
 		if (StringUtils.isNotBlank(goodsName)) {
 			sql = String.format(" and f.id=(select t.recyclingApplication_ID from %s t where t.recyclingApplication_ID=f.id and t.tousseName = '%s')",TousseItem.class.getSimpleName(),goodsName);
 			sqlBuilder.append(sql);