Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15688 -r15691
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15688)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15691)
@@ -7115,7 +7115,8 @@
 					+ "bd.barcode barcode,"
 					+ "sr.biologicalMonitoringEndDate biologicalMonitoringEndDate,"
 					+ "sr.biologicalMonitoringStartDate biologicalMonitoringStartDate,"
-					+ "sr.endDate endDate "
+					+ "sr.endDate endDate,"
+					+ "sr.biologyResult biologyResult "
 					+ "FROM TousseInstance t,barcodeDevice bd,TousseDefinition td,SterilizationRecord sr "
 					+ "WHERE t.id=bd.id "
 					+ "AND t.tousseDefinition_id=td.id "
@@ -7133,13 +7134,15 @@
 					String biologicalMonitoringStartDate = result.getString("biologicalMonitoringStartDate");
 					String biologicalMonitoringEndDate = result.getString("biologicalMonitoringEndDate");
 					String endDate = result.getString("endDate");
+					String biologyResult = result.getString("biologyResult");
 					
 					Map<String, String> map = new HashMap<String, String>();
 					map.put("tousseName", tousseName);
 					map.put("barcode", barcode);
 					map.put("biologicalMonitoringStartDate", biologicalMonitoringStartDate);
 					map.put("biologicalMonitoringEndDate", biologicalMonitoringEndDate);
 					map.put("endDate", endDate);
+					map.put("biologyResult", biologyResult);
 					list.add(map);
 				}
 			} catch (SQLException e) {
@@ -7172,6 +7175,7 @@
 				String biologicalMonitoringStartDate = map.get("biologicalMonitoringStartDate");  //生物监测的开始时间
 				String biologicalMonitoringEndDate = map.get("biologicalMonitoringEndDate");  //生物监测的结束时间
 				biologicalMonitoringStartDate = StringTools.isBlank(biologicalMonitoringStartDate)?endDate:biologicalMonitoringStartDate;  //生物监测的开始时间默认就是灭菌的结束时间
+				String biologyResult = map.get("biologyResult");  //生物监测的结果
 				
 				long nowTime = System.currentTimeMillis();
 				if (StringTools.isBlank(biologicalMonitoringEndDate)) {  //没有进行生物监测或者忘记录了，则和默认的配置的是生物监测时间比较
@@ -7200,7 +7204,7 @@
 					} catch (ParseException e) {
 						System.out.println("生物监测结束时间格式有误先不处理");
 					}
-					if (biologicalMonitoringEndDateTime > nowTime) {  //生物监测没结束就发货
+					if ("不合格".equals(biologyResult) || biologicalMonitoringEndDateTime > nowTime) {  //生物监测没结束就发货
 						unconventionalForeignTousses += map.get("barcode") + ";";
 					}
 				}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java
===================================================================
diff -u -r15509 -r15691
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java	(.../SterilizerManagerImpl.java)	(revision 15509)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java	(.../SterilizerManagerImpl.java)	(revision 15691)
@@ -121,8 +121,13 @@
 
 		//有待优化，只针对外来器械包和外来器械小分包更加合理
 		String sql = 
-				"select t.id tousseId,t.tousseName tousseName,i.sendTime sendTime "
-				+ "from TousseInstance t,SterilizationRecord sr,Invoice i "
+				"select t.id tousseId,"
+				+ "t.tousseName tousseName,"
+				+ "i.sendTime sendTime,"
+				+ "sr.biologyResult biologyResult "
+				+ "from TousseInstance t,"
+				+ "SterilizationRecord sr,"
+				+ "Invoice i "
 				+ "where t.sterilizationRecord_id=sr.id "
 				+ "and t.invoice_id=i.id "
 				+ "and sr.id=" + (sterilizationRecordId.toString())
@@ -135,13 +140,14 @@
 				String tousseId = result.getString("tousseId");
 				String tousseName = result.getString("tousseName");
 				String sendTime = result.getString("sendTime");
+				String biologyResult = result.getString("biologyResult");
 				
 				try {
 					long sendTimeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(sendTime).getTime();
 					long biologicalMonitoringEndDateStamp = biologicalMonitoringEndDate.getTime();
 					
 					String isRoutine = TousseInstance.ROUTINE_YES;
-					if (biologicalMonitoringEndDateStamp > sendTimeStamp) {  //非常规发货
+					if ("不合格".equals(biologyResult) || biologicalMonitoringEndDateStamp > sendTimeStamp) {  //非常规发货
 						isRoutine = TousseInstance.ROUTINE_NO;
 					}
 					String sql2 = "update TousseInstance set isRoutine='" + isRoutine + "' where id=" + tousseId;