Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r16353 -r16359
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16353)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16359)
@@ -559,17 +559,17 @@
 						continue;
 					}
 					
-					if (goods.noBiologicalMonitoring) {  //生物监测为无（1、真的没做 2、填了生物监测的结束时间相当于生物监测正在进行中）
+					if (goods.biologicalMonitoringNoResult) {  //生物监测为无（1、 填了生物监测的结束时间相当于生物监测正在进行中 2、真的没做）
 						var massage = '[' + goods.name + ']生物监测结果为无，确定要发货吗？';
-						if (goods.isRoutine == '否') {
-							massage = '[' + goods.name + ']正在做生物监测，并且生物监测结果为无，确定要发货吗？';
+						if (goods.isRoutine == '否' && !goods.noBiologicalMonitoring) {
+							var massage = '[' + goods.name + ']正在做生物监测，并且生物监测结果为无，确定要发货吗？';
 						}
 						if (!confirm(massage)){
 							continue;
 						}
 					}
 					
-					if (goods.isRoutine == '否' && !goods.noBiologicalMonitoring){  //正在做生物监测（cjr）
+					if (goods.isRoutine == '否' && !goods.biologicalMonitoringNoResult){  //正在做生物监测（cjr）
 						if (!confirm('[' + goods.name + ']正在做生物监测，需要紧急发货吗？')){
 							continue;
 						}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r16274 -r16359
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16274)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16359)
@@ -1554,9 +1554,13 @@
 	private void updateVO(String barcode, InvoiceGoodsVo vo) {
 		
 		JSONObject jsonObj = invoiceManager.isRoutine(barcode);  //判断是否常规发货（cjr）
+		String biologicalMonitoringNoResult = jsonObj.optString("biologicalMonitoringNoResult");
 		String noBiologicalMonitoringForeignTousse = jsonObj.optString("noBiologicalMonitoringForeignTousses");
 		String unconventionalForeignTousse = jsonObj.optString("unconventionalForeignTousses");
 		String isUnqualified = jsonObj.optString("isUnqualified");
+		if (!StringTools.isBlank(biologicalMonitoringNoResult)) {  //此器械包生物监测结果为"无"（但是如果登记了生物监测结束时间那么，也算是做了生物监测，相当于进行中）
+			vo.setBiologicalMonitoringNoResult(true);;
+		}
 		if (!StringTools.isBlank(noBiologicalMonitoringForeignTousse)) {  //此器械包没做生物监测
 			vo.setNoBiologicalMonitoring(true);
 		}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r16353 -r16359
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16353)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16359)
@@ -7522,6 +7522,7 @@
 	
 	/**
 	 * 验证器械包是否常规发货，以及生物监测的情况，返回值JSONObject对象的三个元素的具体如下：<br/>
+	 * biologicalMonitoringNoResult：生物监测结果为无的器械包集合，用分号分隔<br/>
 	 * noBiologicalMonitoringForeignTousses：没做生物监测的器械包集合，用分号分隔<br/>
 	 * unconventionalForeignTousses生物监测没结束就要发货的器械包集合，用分号分隔<br/>
 	 * isUnqualified：生物监测结果为"不合格"的器械包集合，用分号分隔
@@ -7534,6 +7535,7 @@
 		
 		List<Map<String, String>> list = getTousseIntoForBarcodes(tousseBarcodes);
 		
+		String biologicalMonitoringNoResult = "";
 		String noBiologicalMonitoringForeignTousses = "";
 		String unconventionalForeignTousses = "";
 		String isUnqualified = "";
@@ -7548,8 +7550,8 @@
 				
 				long nowTime = System.currentTimeMillis();
 				if (SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)) {
-					noBiologicalMonitoringForeignTousses += map.get("barcode") + ";";
-					if (StringUtils.isNotBlank(biologicalMonitoringEndDate)) {  //填了生物监测的结束时间
+					biologicalMonitoringNoResult += map.get("barcode") + ";";
+					if (StringUtils.isNotBlank(biologicalMonitoringEndDate)) {  //填了生物监测的结束时间，这种情况就相当于，进行中
 						try {
 							long biologicalMonitoringEndDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDate).getTime();
 							if (biologicalMonitoringEndDateTime > nowTime) {
@@ -7558,7 +7560,8 @@
 						} catch (ParseException e) {
 							logger.debug("生物监测结束时间格式有误先不处理");
 						}
-					} else {
+					} else {  //没填生物监测的结束时间，这种情况，可能是漏填（只提示他结果为无即可，但是是否紧急发货还是要根据对应的灭菌炉配置的参数来判断）
+						noBiologicalMonitoringForeignTousses += map.get("barcode") + ";";
 						if (StringUtils.isNotBlank(lagTimeString) && StringUtils.isNotBlank(biologicalMonitoringTimeString)) {  //在对应的灭菌炉"灭菌与生物监测间隔时间"和"生物监测持续时间"两个参数都要有配才会去判断是否紧急发货，否则默认常规
 							try {
 								Integer lagTime = new Integer(lagTimeString)*60*1000;
@@ -7592,6 +7595,8 @@
 		}
 		
 		
+		biologicalMonitoringNoResult = biologicalMonitoringNoResult.equals("") ? "" :
+			biologicalMonitoringNoResult.substring(0, biologicalMonitoringNoResult.length() - 1);
 		noBiologicalMonitoringForeignTousses = noBiologicalMonitoringForeignTousses.equals("") ? "" :
 			noBiologicalMonitoringForeignTousses.substring(0, noBiologicalMonitoringForeignTousses.length() - 1);
 		unconventionalForeignTousses = unconventionalForeignTousses.equals("") ? "" :
@@ -7602,6 +7607,7 @@
 		
 		
 		JSONObject jsonObj = new JSONObject();
+		jsonObj.put("biologicalMonitoringNoResult", biologicalMonitoringNoResult);
 		jsonObj.put("noBiologicalMonitoringForeignTousses", noBiologicalMonitoringForeignTousses);
 		jsonObj.put("unconventionalForeignTousses", unconventionalForeignTousses);
 		jsonObj.put("isUnqualified", isUnqualified);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
===================================================================
diff -u -r16274 -r16359
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 16274)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 16359)
@@ -72,6 +72,11 @@
 	 */
 	private Boolean isUnqualified = false;
 	
+	/**
+	 * 生物监测的结果是否为"无"，默认不是
+	 */
+	private Boolean biologicalMonitoringNoResult = false;
+	
 	private Long invoicePlanID = null;
 	private Long proxyDisinfection_id = null;
 	
@@ -292,5 +297,13 @@
 	public void setProxyDisinfection_id(Long proxyDisinfection_id) {
 		this.proxyDisinfection_id = proxyDisinfection_id;
 	}
+
+	public Boolean getBiologicalMonitoringNoResult() {
+		return biologicalMonitoringNoResult;
+	}
+
+	public void setBiologicalMonitoringNoResult(Boolean biologicalMonitoringNoResult) {
+		this.biologicalMonitoringNoResult = biologicalMonitoringNoResult;
+	}
 	
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
===================================================================
diff -u -r16353 -r16359
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java	(.../InvoiceManager.java)	(revision 16353)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java	(.../InvoiceManager.java)	(revision 16359)
@@ -177,6 +177,7 @@
 	
 	/**
 	 * 验证器械包是否常规发货，以及生物监测的情况，返回值JSONObject对象的三个元素的具体如下：<br/>
+	 * biologicalMonitoringNoResult：生物监测结果为无的器械包集合，用分号分隔<br/>
 	 * noBiologicalMonitoringForeignTousses：没做生物监测的器械包集合，用分号分隔<br/>
 	 * unconventionalForeignTousses生物监测没结束就要发货的器械包集合，用分号分隔<br/>
 	 * isUnqualified：生物监测结果为"不合格"的器械包集合，用分号分隔