Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
===================================================================
diff -u -r14551 -r15409
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
===================================================================
diff -u -r14551 -r15409
--- ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml	(.../sterilizationRecordReport.jrxml)	(revision 14551)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml	(.../sterilizationRecordReport.jrxml)	(revision 15409)
@@ -83,7 +83,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[炉次]]></text>
+				<text><![CDATA[炉次12]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="94039f67-df2f-4528-9496-109ad6b0f769" style="table_TH" x="210" y="0" width="137" height="35"/>
@@ -129,14 +129,14 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilizerName}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sterilizerName}==null?"":$F{sterilizerName}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="007f7452-c88f-49e4-aea6-8c4cf4d41dcf" style="table_TD" x="150" y="0" width="60" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{frequency}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{frequency}==null?0:$F{frequency}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="47dec957-0601-4ed1-b37e-4155eec51208" style="table_TD" x="210" y="0" width="137" height="30"/>
@@ -157,7 +157,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sendDepart}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sendDepart}==null?"":$F{sendDepart}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="56ca541b-be38-4f27-96c3-4926518766c3" style="table_TD" x="549" y="0" width="80" height="30"/>
@@ -171,7 +171,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilizationUser}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{sterilizationUser}==null?"":$F{sterilizationUser}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r15314 -r15409
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 15314)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 15409)
@@ -1110,6 +1110,10 @@
 				// 所有的器械包的状态改为[灭菌中]
 				tousseInstance.setStatus(TousseInstance.STATUS_STERILING);
 			}
+			tousseInstance.setSterileFrequency(sterilizationRecord.getFrequency()+"");  //（cjr）
+			tousseInstance.setSterilizationUser(sterilizationRecord.getSterilizationUser());
+			tousseInstance.setSterilizerName(sterilizationRecord.getSterilizerName());
+			tousseInstance.setSterileStartTime(TousseInstanceUtils.buildSterileStartTime(new Date()));
 			tousseInstanceManager.saveOrUpdate(tousseInstance);
 		}
 
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15403 -r15409
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15403)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15409)
@@ -1474,7 +1474,7 @@
 //				updateGoodsStock(invoice,tousseInstancesToUpdate);
 				updateStockInfo.put(invoice, new HashSet<TousseInstance>(tousseInstancesToUpdate));
 				saveInvoice(invoice);
-				updateTousseInstanceStatus(tousseInstancesToUpdate,submitInvoiceItems);  //修改器械包是否常规发货的方法（cjr）
+				updateTousseInstanceAttributeForIsRoutine(tousseInstancesToUpdate,submitInvoiceItems);  //修改器械包是否常规发货的方法（cjr）
 				// 设置发货单和器械包实例的关联以及修改器械包状态等属性
 				updateTousseInstanceStatus(invoice,tousseInstancesToUpdate);
 
@@ -1504,7 +1504,13 @@
 			}
 		}
 	}
-	private void updateTousseInstanceStatus(
+	
+	/**
+	 * 修改器械包的isRoutine属性（判断此器械包是否常规发货）
+	 * @param tousseInstancesToUpdate
+	 * @param submitInvoiceItems
+	 */
+	private void updateTousseInstanceAttributeForIsRoutine(
 			Set<TousseInstance> tousseInstancesToUpdate,
 			List<SubmitInvoiceItem> submitInvoiceItems) {
 		
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r15400 -r15409
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 15400)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 15409)
@@ -2209,16 +2209,28 @@
 		String frequency = StrutsParamUtils.getPraramValue("frequency", "");
 		
 		String sql = "  select ti.sterilizerName,ti.sterileFrequency,ti.tousseName,ti.locationForDisplay,"
-				+ " ti.sterileEndTime,ti.sterilizationUser,count(*) amount from tousseinstance ti ";
+				+ " ti.sterileStartTime,ti.sterilizationUser,count(*) amount from tousseinstance ti ";
 				
   		String endSql = " group by ti.sterilizerName,ti.sterileFrequency,ti.tousseName,"
-		  				+" ti.locationForDisplay,ti.sterileEndTime,ti.sterilizationUser"
-		  				+" order by ti.sterileEndTime desc";
+		  				+" ti.locationForDisplay,ti.sterileStartTime,ti.sterilizationUser,ti.status"
+		  				+" order by ti.sterileStartTime desc";
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
-			sql += " where " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " between "
-						+ dateQueryAdapter.dateAdapter(startDate+" 00:00:00")
-						+ " and " + ""
-						+ dateQueryAdapter.dateAdapter(endDate+" 23:59:59");
+			
+			sql += " where ti.sterileStartTime between "
+					+ dateQueryAdapter.dateConverAdapter2(startDate+" 00:00:00", "yyyy-mm-dd HH24:MI:SS")
+					+ " and " + dateQueryAdapter.dateConverAdapter2(endDate+" 23:59:59", "yyyy-mm-dd HH24:MI:SS")
+					+ " and ti.status <> '已审核' "
+					;
+			
+			
+			
+//			sql += " where " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " between "
+//						+ dateQueryAdapter.dateAdapter(startDate+" 00:00:00")
+//						+ " and " + ""
+//						+ dateQueryAdapter.dateAdapter(endDate+" 23:59:59");
+			
+			
+			
 			// 器械包的供应室
 			if(StringUtils.isNotBlank(querySupplyRoom)){
 				sql += " and ti.orgUnitCoding = '" + querySupplyRoom + "'";