录入病例自定义返回

src/module1/pages/casesDetail/index.ts

@@ -24,6 +24,7 @@ Page({
     labelIds: [] as any,
 
     id: "",
+    rid: "",
     auth: {},
     userInfo: {},
     dealDoctorInfo: {},
@@ -49,6 +50,7 @@ Page({
   onLoad(options) {
     this.setData({
       id: options.id,
+      rid: options.rid,
       beforeClose1: (e: any) => {
         if (e === "confirm") {
           if (!this.data.remark) {
@@ -355,6 +357,7 @@ Page({
       success: (res) => {
         res.eventChannel.emit("acceptDataFromOpenerPage", {
           caseId: this.data.id,
+          rid: this.data.rid,
           detailInvite: true,
         });
       },
@@ -362,7 +365,7 @@ Page({
   },
   handleFeedBack() {
     wx.navigateTo({
-      url: `/module1/pages/casesFeedback/index?id=${this.data.id}`,
+      url: `/module1/pages/casesFeedback/index?id=${this.data.id}&rid=${this.data.rid}`,
     });
   },
   handleToggleMore() {

src/module1/pages/casesFeedback/index.ts

@@ -2,6 +2,7 @@ const app = getApp<IAppOption>();
 
 Page({
   data: {
+    rid: "",
     show1: false,
     isOpen: 2,
 
@@ -20,6 +21,7 @@ Page({
   onLoad(options) {
     this.setData({
       caseId: options.id,
+      rid: options.rid,
     });
     app.waitLogin().then(() => {
       this.getCache();
@@ -264,7 +266,7 @@ Page({
     wx.navigateBack();
   },
   handleSubmit() {
-    const { caseId, isOpen } = this.data;
+    const { caseId, isOpen, rid } = this.data;
     const params = this.formatParams();
     wx.ajax({
       method: "POST",
@@ -276,12 +278,12 @@ Page({
       },
     }).then((res) => {
       wx.reLaunch({
-        url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
+        url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}&rid=${rid}`,
       });
     });
   },
   handleInvite() {
-    const { caseId, isOpen } = this.data;
+    const { caseId, isOpen, rid } = this.data;
     const params = this.formatParams();
     wx.navigateTo({
       url: `/module1/pages/setCaseDoctor/index`,
@@ -292,6 +294,7 @@ Page({
             isOpen,
           },
           caseId,
+          rid,
           feedBackInvite: true,
         });
       },

src/module1/pages/chatRoom/index.ts

@@ -154,7 +154,7 @@ Page({
   },
   handleCaseDetail() {
     wx.navigateTo({
-      url: `/module1/pages/casesDetail/index?id=${this.data.case.caseId}`,
+      url: `/module1/pages/casesDetail/index?id=${this.data.case.caseId}&rid=${this.data.id}`,
     });
   },
 

src/module1/pages/entryCasesResult/index.scss

@@ -22,7 +22,7 @@
     text-align: center;
   }
   .block-code {
-    height: 400rpx;
+    height: 180rpx;
   }
   .code {
     margin: 90rpx auto 0;

src/module1/pages/entryCasesResult/index.ts

@@ -1,21 +1,16 @@
-import { getCurrentPage } from "@/miniprogram_npm/@vant/weapp/common/utils";
-
 const _app = getApp<IAppOption>();
 
 // 返回逻辑
-// 1、一级医生和二级医生录入病历、提交反馈后，提交成功页面
-// 按钮： 查看病历详情  返回病历列表
-//
-// 2、二级医生在病历详情页，选择邀请上级后，成功页面：查看病历详情  返回病历列表
-//
-// 从学习窗：
+// 1、一级医生和二级医生录入病历、提交反馈后，提交成功页面 按钮： 查看病历详情  返回病历列表
+// 2、二级医生在病历详情页，选择邀请上级后，成功页面：查看病历详情  返回病历列表 从学习窗：
 // 3、学习窗顶部进入病历详情：选择邀请上级后，成功页面，按钮：返回学习窗；
-//
 // 4、学习窗顶部进入病历详情：提交反馈后，按钮：返回学习窗
 
 Page({
   data: {
     caseId: "",
+    rid: "",
+
     codeUrl: "",
     isFollow: "",
 
@@ -25,6 +20,7 @@ Page({
     this.setData({
       caseId: options.cid,
       isFollow: options.isf,
+      rid: options.rid && options.rid !== "undefined" ? options.rid : "",
     });
     if (options.wxi) {
       this.setData({
@@ -38,21 +34,26 @@ Page({
     });
   },
   handleDetail() {
-    // console.log(getCurrentPage());
-    wx.reLaunch({
-      url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
-    });
     // wx.reLaunch({
-    //   url: "/pages/cases/index",
-    //   success: () => {
-    //     wx.navigateTo({
-    //       url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
-    //       fail(err){
-    //         console.log(err)
-    //       }
-    //     });
-    //   },
+    //   url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
     // });
+    wx.reLaunch({
+      url: "/pages/cases/index",
+      success: () => {
+        wx.navigateTo({
+          url: `/module1/pages/casesDetail/index?id=${this.data.caseId}`,
+        });
+      },
+    });
+  },
+  handleBackRoom() {
+    wx.reLaunch({
+      url: "/pages/chatRoomList/index",
+      success: () => {
+        wx.navigateTo({
+          url: `/module1/pages/chatRoom/index?id=${this.data.rid}`,
+        });
+      },
+    });
   },
-  handleBackRoom() {},
 });

src/module1/pages/entryCasesResult/index.wxml

@@ -6,19 +6,12 @@
   <image wx:if="{{codeUrl}}" class="code" src="{{codeUrl}}" mode="scaleToFill" show-menu-by-longpress></image>
   <view wx:if="{{codeUrl}}" class="tip">关注公众号接收病历反馈消息</view>
   <view class="wrap-btns">
-    <block wx:if="{{btnType==='1'}}">
-      <view class="btn2" bind:tap="handleDetail">查看病历详情</view>
-      <view class="btn1" bind:tap="handleBackCase">返回病历列表</view>
+    <block wx:if="{{rid}}">
+      <view class="btn1" bind:tap="handleBackRoom">返回学习窗</view>
     </block>
-    <block wx:if="{{btnType==='2'}}">
+    <block wx:else>
       <view class="btn2" bind:tap="handleDetail">查看病历详情</view>
       <view class="btn1" bind:tap="handleBackCase">返回病历列表</view>
     </block>
-    <block wx:if="{{btnType==='3'}}">
-      <view class="btn1" bind:tap="handleBackRoom">返回学习窗</view>
-    </block>
-    <block wx:if="{{btnType==='4'}}">
-      <view class="btn1" bind:tap="handleBackRoom">返回学习窗</view>
-    </block>
   </view>
 </view>

src/module1/pages/setCaseDoctor/index.ts

@@ -12,6 +12,7 @@ Page({
     area: [],
 
     id: "",
+    rid: "",
 
     DoctorTitleType: {},
     hospitalClassification: {},
@@ -57,6 +58,7 @@ Page({
       this.setData({
         params: data.params,
         caseId: data.caseId,
+        rid: data.rid,
         detailInvite: data.detailInvite,
         feedBackInvite: data.feedBackInvite,
       });
@@ -244,7 +246,7 @@ Page({
     });
   },
   handleSubmit() {
-    const { feedBackInvite, caseId, DoctorId, params, detailInvite } = this.data;
+    const { feedBackInvite, caseId, DoctorId, params, detailInvite, rid } = this.data;
     if (!DoctorId) {
       wx.showToast({
         title: "请选择医生",
@@ -263,7 +265,7 @@ Page({
         },
       }).then((res) => {
         wx.reLaunch({
-          url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
+          url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}&rid=${rid}`,
         });
       });
       return;
@@ -273,7 +275,7 @@ Page({
       wx.ajax({ method: "POST", url: "?r=takeda/case/invite-doctor", data: { caseId, dealDoctorId: DoctorId } }).then(
         (res) => {
           wx.reLaunch({
-            url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
+            url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}&rid=${rid}`,
           });
         },
       );
@@ -291,7 +293,7 @@ Page({
       },
     }).then((res) => {
       wx.reLaunch({
-        url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
+        url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}&rid=${rid}`,
       });
     });
   },