Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16425 -r16446
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16425)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16446)
@@ -1185,10 +1185,11 @@
 				return json;
 			}
 			boolean enabled = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("biologicalMonitoringEnable"),"false"));
-			if(!enabled){
-				//没有启用,不做处理,pda端对应属性有默认值
-				return json;
-			}
+			json.addProperty("biologicalMonitoringEnable", enabled);
+//			if(!enabled){
+//				//没有启用,不做处理,pda端对应属性有默认值
+//				return json;
+//			}
 			String itemType = json.get("type").getAsString();
 			if("tousseInstance".equals(itemType)){
 				JsonObject dataJSON = json.getAsJsonObject("data");
@@ -1199,13 +1200,14 @@
 						JSONObject jroutine = jbarcodeObject.optJSONObject(barcode);
 						if(jroutine != null){
 							String noBiologicalMonitoring = jroutine.optString("noBiologicalMonitoring");
-//							String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult");
+							String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult");
 							String biologicalMonitoringFail = jroutine.optString("biologicalMonitoringFail");
 							String urgentDelivery = jroutine.optString("urgentDelivery");
 							
 							dataJSON.addProperty("noBiologicalMonitoring",StringTools.isNotBlank(noBiologicalMonitoring));
-							dataJSON.addProperty("unconventional", StringTools.isNotBlank(urgentDelivery));
-							dataJSON.addProperty("isUnqualified", StringTools.isNotBlank(biologicalMonitoringFail));
+							dataJSON.addProperty("biologicalMonitoringNoResult", StringTools.isNotBlank(biologicalMonitoringNoResult));
+							dataJSON.addProperty("urgentDelivery", StringTools.isNotBlank(urgentDelivery));
+							dataJSON.addProperty("biologicalMonitoringFail", StringTools.isNotBlank(biologicalMonitoringFail));
 						}
 					}
 				}
@@ -1231,13 +1233,14 @@
 								JSONObject jroutine = jbarcodeObject.optJSONObject(barcode);
 								if(jroutine != null){
 									String noBiologicalMonitoring = jroutine.optString("noBiologicalMonitoring");
-//									String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult");
+									String biologicalMonitoringNoResult = jroutine.getString("biologicalMonitoringNoResult");
 									String biologicalMonitoringFail = jroutine.optString("biologicalMonitoringFail");
 									String urgentDelivery = jroutine.optString("urgentDelivery");
 									
 									jobj.addProperty("noBiologicalMonitoring",StringTools.isNotBlank(noBiologicalMonitoring));
-									jobj.addProperty("unconventional", StringTools.isNotBlank(urgentDelivery));
-									jobj.addProperty("isUnqualified", StringTools.isNotBlank(biologicalMonitoringFail));
+									jobj.addProperty("biologicalMonitoringNoResult",StringTools.isNotBlank(biologicalMonitoringNoResult));
+									jobj.addProperty("urgentDelivery", StringTools.isNotBlank(urgentDelivery));
+									jobj.addProperty("biologicalMonitoringFail", StringTools.isNotBlank(biologicalMonitoringFail));
 								}
 							}
 						}