更新

TUICallKit-Vue3/pages/Card/edit_card.vue

@@ -141,6 +141,7 @@
 						class="form-input-inline"
 						type="digit"
 						placeholder="请填写空腹血糖(数值)"
+						required
 					/>
 					<text class="form-unit">mmol/L</text>
 				</view>

TUICallKit-Vue3/pages/order/monad/monad.vue

@@ -460,7 +460,7 @@ onMounted(() => {
 onShareAppMessage((res) =>{
     return {
       title: '点击进入诊室',
-      path: '/pages/order/monad/monad?id='+diagnosisId+'&share_user_id='+share_user_id,
+      path: '/pages/order/monad/monad?id='+diagnosisId+'&share_user_id='+share_user_id+'&doctor_id='+doctorId.value,
       imageUrl: '/static/zs.jpg',
       desc: '点击进入诊室',
       success() {
@@ -567,7 +567,7 @@ const loadDiagnosisDetail = async () => {
 	const params = proxy.$parsePageParams(currentPage.options);
 	dingdan_ok.value=false;
 	diagnosisId = params.id;
-	share_user_id = params.share_user_id;
+	share_user_id = params.share_user;
 	doctorId.value = params.doctor_id;
 	console.log('进入onMounted:', params, '诊单ID:', diagnosisId, '医生ID:', doctorId);
 	
@@ -585,7 +585,7 @@ const loadDiagnosisDetail = async () => {
 			method: 'GET',
 			data: {
 				id: diagnosisId,
-				user_id: params.user_id || 0,
+				user_id: params.share_user_id || 0,
 				share_user_id: params.share_user || 0
 			},
 		}, false); // 不显示加载中
@@ -622,24 +622,29 @@ const closePatientModal = async () => {
 	confirmBtnLoading.value = true;
 	try {
 		const app = getApp();
-		const userID = app.globalData.userID;
-		const userSig = app.globalData.userSig;
-		const SDKAppID = app.globalData.SDKAppID;
+		// const userID = app.globalData.userID;
+		// const userSig = app.globalData.userSig;
+		// const SDKAppID = app.globalData.SDKAppID;
 		const doctor = 'doctor_' + doctorId.value;
-
+			confirmDiagnosis(diagnosisId);
+		if(!diagnosisId.includes('patient')){
+			diagnosisId='patient_'+diagnosisId
+		}
+		const { userSig, SDKAppID } = GenerateTestUserSig.genTestUserSig({
+		  userID:diagnosisId,
+		});
 		if (!doctorId.value) {
 			uni.showToast({ title: '诊室号不存在，联系助理处理！', icon: 'none' });
 			return;
 		}
-		if (!userID || !userSig) {
-			await video();
-		}
-		console.log(userID, app.globalData, diagnosisId);
+	
+		console.log(app.globalData, diagnosisId);
 
-		confirmDiagnosis();
+	
+		
 		showPatientModal.value = false;
 		uni.redirectTo({
-			url: `/TUIKit/pages/chat/chat?userID=${encodeURIComponent(userID)}&userSig=${encodeURIComponent(userSig)}&SDKAppID=${SDKAppID}&targetUserID=${doctor}`
+			url: `/TUIKit/pages/chat/chat?userID=${encodeURIComponent(diagnosisId)}&userSig=${encodeURIComponent(userSig)}&SDKAppID=${SDKAppID}&targetUserID=${doctor}&msg=1`
 		});
 	} catch (err) {
 		console.error(err);
@@ -807,14 +812,12 @@ const handleConfirm = () => {
 };
 
 // 提交确认诊单
-const confirmDiagnosis = async () => {
-	const pages = getCurrentPages();
-	const currentPage = pages[pages.length - 1];
-	const params = proxy.$parsePageParams(currentPage.options);
+const confirmDiagnosis = async (diagnosisId) => {
 	
-	console.log('确认诊单参数:', params);
 	
-	if (!params.id) {
+	console.log('确认诊单参数:', diagnosisId);
+	
+	if (!diagnosisId) {
 		uni.showToast({ title: '缺少诊单ID', icon: 'none' });
 		return;
 	}
@@ -822,15 +825,22 @@ const confirmDiagnosis = async () => {
 
 
 	uni.showLoading({ title: '提交中...' });
-	
+	const app = getApp();
+  const rawUserID = app?.globalData?.userID;
+  const userID = (typeof rawUserID === 'string' ? rawUserID : '').replace(/patient_/g, '');
+	if (!userID) {
+		uni.hideLoading();
+		uni.showToast({ title: '请先登录', icon: 'none' });
+		return;
+	}
 	try {
 		const res = await proxy.apiUrl({
 			url: '/api/tcm/confirmDiagnosis',
 			method: 'POST',
 			data: {
-				id: params.id,
-				user_id: params.user_id || 0,
-				share_user: params.share_user || 0
+				id: diagnosisId,
+				user_id: userID || 0,
+				share_user: share_user_id || 0
 			}
 		}, false);