Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_release.apk
===================================================================
diff -u -r39500 -r39520
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_6p_release.apk
===================================================================
diff -u -r39500 -r39520
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_nologo_release.apk
===================================================================
diff -u -r39500 -r39520
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r39500 -r39520
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 39500)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 39520)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
 	"version":"4.7.40",
-	"urlSuffix":       "/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_nologo_release.apk",
-	"urlSuffix-6p":    "/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_6p_release.apk",
+	"urlSuffix":       "/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_nologo_release.apk",
+	"urlSuffix-6p":    "/mobileClient/SterileSupplySystem_Android_V4.7.40_20250211_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r39500 -r39520
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 39500)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 39520)
@@ -185,8 +185,10 @@
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionHelper;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.vo.MaterialInstanceVo;
 import com.forgon.disinfectsystem.tousse.toussedefinition.vo.ThirdPartyTousseInstanceVo;
 import com.forgon.disinfectsystem.tousse.toussedefinition.vo.ThirdPartyTousseReceiveRecordVo;
+import com.forgon.disinfectsystem.tousse.toussedefinition.vo.TousseTurnaroundDetailsEvent;
 import com.forgon.disinfectsystem.tousse.videomanager.service.VideoFileManager;
 import com.forgon.disinfectsystem.tousseReturnDisinfectRecord.service.TousseReturnDisinfectRecordManager;
 import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager;
@@ -447,6 +449,8 @@
 	private ForeignTousseApplicationManager foreignTousseApplicationManager;
 	@Autowired
 	private ThirdPartyTousseReceiveRecordManager thirdPartyTousseReceiveRecordManager;
+	@Autowired
+	private ThirdPartyTousseReceiveRecordManager laoKenThirdPartyTousseReceiveRecordManager;
 	/**
 	 * 新的独立事务manager
 	 */
@@ -9027,10 +9031,22 @@
 	// 在第三方器械包模块的上下文，根据条码获取信息
 	@SuppressWarnings("unchecked")
 	public String getInfoByBarcode_ThirdPartyTousse(JSONObject params) {
+		JSONObject result = JSONUtil.buildJsonObject(true);
 		String barcode = params.optString("barcode");
 		if (StringUtils.isBlank(barcode)) {
 			return JSONUtil.buildErrorMsgJsonResult("缺失参数barcode");
 		}
+		ThirdPartyTousseInstanceVo thirdPartyTousseInstanceVo = null;
+		//如果有开启enabledCreateNewDefinitionOnReceiving则先调用老肯的接口
+		if(CssdUtils.getSystemSetConfigByNameBool("enabledCreateNewDefinitionOnReceiving")){
+			thirdPartyTousseInstanceVo = thirdPartyTousseReceiveRecordManager.getLaoKenTurnaroundInformation(barcode);
+			if(thirdPartyTousseInstanceVo != null){
+				//如果有查找到,则输出该物品信息.未找到则按用户信息处理
+				JSONUtil.addDataProperty(result, thirdPartyTousseInstanceVo);
+				JSONUtil.addProperty(result, "type", "ThirdPartyTousseInstance");
+				return result.toString();
+			}
+		}
 		BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode, false);
 		if (barcodeDevice == null) {
 			return JSONUtil.buildErrorMsgJsonResult("该条码为非法条码");
@@ -9046,8 +9062,8 @@
 		if(!StringUtils.equals(departCode, user.getCurrentOrgUnitCode())){
 			return JSONUtil.buildErrorMsgJsonResult("扫描的条码不是本科室用户");
 		}
-		JSONObject result = JSONUtil.buildJsonObject(true);
 		JSONUtil.addDataProperty(result, JSONObject.fromObject(user,JSONUtil.buildJsonConfig("id","name","fullName")));
+		JSONUtil.addProperty(result, "type", "User");
 		return result.toString();
 	}
 
@@ -9089,6 +9105,12 @@
 				vo.setReviewer(item.optString("reviewer"));
 				vo.setSterileTime(item.optString("sterileTime"));
 				vo.setValidUntil(item.optString("validUntil"));
+				//处理老肯的东西
+				vo.setMaterialInstanceVos(JSONUtil.fromJson(JSONArray.fromObject(item.optString("materialInstanceVos")), MaterialInstanceVo.class));
+				vo.setEvents(JSONUtil.fromJson(JSONArray.fromObject(item.optString("events")), TousseTurnaroundDetailsEvent.class));
+				vo.setInstanceID(item.optString("instanceID"));
+				vo.setItemBaseTypeId(item.optLong("itemBaseTypeId"));
+				vo.setItemDefinitionID(item.optLong("itemDefinitionID"));
 				thirdPartyTousseInstanceVoList.add(vo);
 			}
 			thirdPartyTousseReceiveRecordVo.setThirdPartyTousseInstances(thirdPartyTousseInstanceVoList);
@@ -9102,9 +9124,14 @@
 	public String receiveThirdPartyTousse(JSONObject params){
 		JSONObject result = JSONUtil.buildJsonObject(false);
 		ThirdPartyTousseReceiveRecordVo thirdPartyTousseReceiveRecordVo = new ThirdPartyTousseReceiveRecordVo();
-		buildThirdPartyTousseReceiveRecordVo(thirdPartyTousseReceiveRecordVo,params);
 		//对vo进行请求参数赋值
-		thirdPartyTousseReceiveRecordManager.receiveThirdPartyTousse(thirdPartyTousseReceiveRecordVo);
+		buildThirdPartyTousseReceiveRecordVo(thirdPartyTousseReceiveRecordVo,params);
+		if(CssdUtils.getSystemSetConfigByNameBool("enabledCreateNewDefinitionOnReceiving") 
+				&& StringUtils.equals(thirdPartyTousseReceiveRecordVo.getDataSource(), ThirdPartyTousseReceiveRecord.DATASOURCE_LAOKEN)){
+			laoKenThirdPartyTousseReceiveRecordManager.receiveThirdPartyTousse(thirdPartyTousseReceiveRecordVo);
+		}else{
+			thirdPartyTousseReceiveRecordManager.receiveThirdPartyTousse(thirdPartyTousseReceiveRecordVo);
+		}
 		JSONUtil.addSuccess(result, true);
 		return result.toString();
 	}
@@ -9115,8 +9142,8 @@
 	public String receiveAndInvoiceThirdPartyTousse(JSONObject params){
 		JSONObject result = JSONUtil.buildJsonObject(false);
 		ThirdPartyTousseReceiveRecordVo thirdPartyTousseReceiveRecordVo = new ThirdPartyTousseReceiveRecordVo();
-		buildThirdPartyTousseReceiveRecordVo(thirdPartyTousseReceiveRecordVo,params);
 		//对vo进行请求参数赋值
+		buildThirdPartyTousseReceiveRecordVo(thirdPartyTousseReceiveRecordVo,params);
 		invoiceManager.receiveAndInvoiceThirdPartyTousse(thirdPartyTousseReceiveRecordVo);
 		JSONUtil.addSuccess(result, true);
 		return result.toString();