Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r30120 -r30312
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 30120)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 30312)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
-	"version":"4.7.12",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_6p_release.apk",
+	"version":"4.7.13",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_nologo_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java
===================================================================
diff -u -r29647 -r30312
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java	(.../ServerInterfaceImpl.java)	(revision 29647)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServerInterfaceImpl.java	(.../ServerInterfaceImpl.java)	(revision 30312)
@@ -23,6 +23,7 @@
 import com.forgon.exception.BorrowUnRecturnException;
 import com.forgon.exception.SterilingModeNotTheSameException;
 import com.forgon.exception.SystemException;
+import com.forgon.exception.UnScanSterilizationMonitoringPackageException;
 import com.forgon.tools.cache.ForgonThreadLocalResourceManager;
 import com.forgon.tools.json.JSONUtil;
 import com.google.gson.Gson;
@@ -71,7 +72,15 @@
 			e.printStackTrace();
 			logger.debug(e.getMessage());
 			result = obj.toString();
-		}catch(BorrowUnRecturnException e){
+		}catch(UnScanSterilizationMonitoringPackageException e){
+			String msg = e.getMessage();
+			JSONObject obj = JSONUtil.buildJsonObject(false, msg);
+			obj.put(JSONUtil.JSON_KEY_NOTICEMODE, Constants.NOTICE_MODE_GOTO_WARNING_PAGE);
+			//未扫描监测包的消息提示方式
+			e.printStackTrace();
+			logger.debug(e.getMessage());
+			result = obj.toString();
+		} catch(BorrowUnRecturnException e){
 			//有借物未归还的提示
 			String msg = e.getMessage();
 			JSONObject obj = JSONUtil.buildJsonObject(false, msg);
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r30040 -r30312
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 30040)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 30312)
@@ -181,6 +181,7 @@
 import com.forgon.exception.OperationException;
 import com.forgon.exception.SterilingModeNotTheSameException;
 import com.forgon.exception.SystemException;
+import com.forgon.exception.UnScanSterilizationMonitoringPackageException;
 import com.forgon.keyvalue.service.KeyValueManager;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
@@ -437,6 +438,8 @@
 //			return buildErrorMsgJsonResult(targetException.getMessage());
 			if(targetException instanceof SterilingModeNotTheSameException){
 				retException = new SterilingModeNotTheSameException(targetException.getMessage());
+			}else if(targetException instanceof UnScanSterilizationMonitoringPackageException){
+				retException = new UnScanSterilizationMonitoringPackageException(targetException.getMessage());
 			}else if(targetException instanceof BorrowUnRecturnException){
 				retException = new BorrowUnRecturnException(targetException.getMessage());
 			}else{
@@ -2509,13 +2512,35 @@
 			
 			return positionManager.getPositionJsonType(position, false).toString();
 		}  else {
+			JSONObject json = JSONUtil.buildJsonObject(false,"条码无效");
 			if(barcodeDevice != null){
 				barcodeType = barcodeDevice.getType();
+				if (StringUtils.equals(barcodeType, BarcodeDevice.BARCODE_TYPE_BIOLOGICALMONITORTOUSSE)){
+					if(!sterilizationRecordManager.validateBiologyTousseBarcode(barcode)){
+						json = JSONUtil.buildJsonObject(false,"该生物监测包已使用，不能重复使用");
+					}else{
+						json = JSONUtil.buildJsonObject(true);
+						json.put("barcode", barcode);
+						json.put("type", barcodeType);
+					}
+				} else if (StringUtils.equals(barcodeType, BarcodeDevice.BARCODE_TYPE_CHEMISTRYMONITORTOUSSE)){
+					if(!sterilizationRecordManager.validateChemistryTousseBarcode(barcode)){
+						json = JSONUtil.buildJsonObject(false,"该化学监测包已使用，不能重复使用");
+					}else{
+						json = JSONUtil.buildJsonObject(true);
+						json.put("barcode", barcode);
+						json.put("type", barcodeType);
+					}
+				}else{
+					json = JSONUtil.buildJsonObject(true);
+					json.put("barcode", barcode);
+					json.put("type", barcodeType);
+				}
 			}else{
 				barcodeType = LogManager.BARCODE_TYPE_INVALID;
 			}
 			appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_STERILIZATION,barcodeType, barcode, barcodeName);
-			return JSONUtil.buildJsonObject(false,"条码无效").toString();
+			return json.toString();
 		}
 	}
 
@@ -3892,7 +3917,12 @@
 		}
 		return json==null?JSONUtil.buildJsonObject(false).toString():json.toString();
 	}
-	
+
+	/**
+	 * 将人员信息进行转json,包括科室编码、名称等段。增加该科室对应的结算科室名称及编码字段的输出
+	 * @param user
+	 * @return
+	 */
 	private JsonObject userToJson(User user){
 		JsonObject data = new JsonObject();
 		data.addProperty("name", user.getName());
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: forgon-tools/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r30280 -r30312
--- forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 30280)
+++ forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 30312)
@@ -108,8 +108,13 @@
 	 * 消息提示方式-确认提示框
 	 */
 	public static final int NOTICE_MODE_CONFIRM = 3;
-	
+
 	/**
+	 * 消息提示方式-跳转到公共告警页面
+	 */
+	public static final int NOTICE_MODE_GOTO_WARNING_PAGE = 4;
+
+	/**
 	 * 模块代号-审核(review)
 	 */
 	public static final String MODULE_CODE_REVIEW = "review";
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ