闭环

pages/mypage/mypage.vue

@@ -7,7 +7,7 @@
 						<view>
 							您好,{{ userData.name }}
 						</view>
-						<view>{{userData.currentHospital.hosName}}</view>
+						<view v-if="userData.currentHospital">{{userData.currentHospital.hosName}}</view>
 						</view>
 			  <!--  <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">
 			      切换院区
@@ -284,7 +284,7 @@
           type: "off",
           customWorking: "off",
           classId: uni.getStorageSync("setDeptConfg").classesId,
-        }).then((res) => {
+        }).then(async (res) => {
           uni.hideLoading();
           if (res.status == 200) {
             let obj = uni.getStorageSync("userData");
@@ -299,7 +299,7 @@
               uni.removeStorageSync("manager"); //清空选择的分组组长,初始化
             }
             uni.setStorageSync("userData", obj);
-            this.getCurrentUser();
+            await this.getCurrentUser();
             this.getTabData();
           } else {
             uni.showToast({
@@ -333,7 +333,7 @@
                 post("/auth/onOrOffLine", {
                   type: "off",
                   classId: uni.getStorageSync("setDeptConfg").classesId,
-                }).then((res) => {
+                }).then(async (res) => {
                   uni.hideLoading();
                   if (res.status == 200) {
                     if (uni.getStorageSync("setDeptConfg")) {
@@ -348,7 +348,7 @@
                     let obj = uni.getStorageSync("userData");
                     obj.user.online = false;
                     uni.setStorageSync("userData", obj);
-                    this.getCurrentUser();
+                    await this.getCurrentUser();
                     this.getTabData();
                   } else {
                     uni.showToast({
@@ -504,16 +504,22 @@
         this.getTabData();
       },
       // 获取当前用户信息
-      getCurrentUser() {
-        if (uni.getStorageSync("userData")) {
-          this.userData = uni.getStorageSync("userData").user;
-        } else {
-          this.userData = {};
+      async getCurrentUser() {
+        let res = await get("/user/data/getCurrentUser");
+        if (res.status == 200) {
+          let obj = uni.getStorageSync("userData");
+          this.userData = obj.user = res.data || {};
+          uni.setStorageSync("userData", obj);
+        }else{
+          uni.showToast({
+            icon: "none",
+            title: res.msg || "接口获取数据失败！",
+          });
         }
       },
     },
-    onLoad(options) {
-      this.getCurrentUser();
+    async onLoad(options) {
+      await this.getCurrentUser();
       //#ifdef H5
       if (options.login == 1) {
         uni.redirectTo({

pages/patientInspectLog/patientInspectLogDetail.vue

@@ -120,8 +120,8 @@
       </template>
     </scroll-view>
     <view class="foot_common_btns">
-      <button @click="toList()" type="default" class="primaryButton btn gray">返回</button>
-      <button v-if="dataInfo.patientInspectLogData.state && dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
+      <button @click="goBack()" type="default" class="primaryButton btn gray">返回</button>
+      <button v-if="dataInfo.from == 'patientInpectLogList' && dataInfo.patientInspectLogData.state && dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
     </view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
@@ -149,6 +149,7 @@
           patientInspectLogData: {},//闭环对象
           valueList: [],//检查信息
           logList: [],//流程图
+          from: '',//跳转来源
          }
       }
     },
@@ -286,6 +287,10 @@
          }
        })
       },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
       // 返回列表
       toList(){
        uni.reLaunch({
@@ -294,6 +299,7 @@
       }
     },
     onLoad(options){
+      this.dataInfo.from = options.from;
       this.dataInfo.patientInspectLogId = options.patientInspectLogId;
       this.getDetail();
     }

pages/patientInspectLog/patientInspectLogList.vue

@@ -150,7 +150,7 @@
               let patientInspectLog = undefined;
               patientInspectLog = list[0];
               uni.navigateTo({
-                url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${patientInspectLog.id}`
+                url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${patientInspectLog.id}&from=patientInpectLogList`
               })
             }else{
               uni.showToast({
@@ -251,7 +251,7 @@
       // 详情
       toDetail(data){
         uni.navigateTo({
-          url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${data.id}`
+          url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${data.id}&from=patientInpectLogList`
         })
       },
       // 标记回科

pages/stationaryPatient/stationaryPatient.vue

@@ -29,7 +29,7 @@
 
         <view class="body_item_foot" v-if="stationaryTransfer || stationaryReturn">
           <view class="btns pt0">
-            <button @click.stop="stationaryTransferFun(data)" type="default" class="primaryButton btn" v-if="stationaryTransfer">转派</button>
+            <button @click.stop="stationaryTransferFun(data)" type="default" class="primaryButton btn" v-if="stationaryTransfer && data.reAssign == 1">转派</button>
             <button @click.stop="stationaryReturnFun(data)" type="default" class="primaryButton btn" v-if="stationaryReturn">发起回科</button>
           </view>
         </view>
@@ -118,6 +118,7 @@
               "hosId": this.hosId,
               "cascadeSignDept": +this.options.dutyDeptId,
               "patientKey": this.keyword || undefined,
+              "reAssign": 1, //是否可以转派
             }
         }
         
@@ -149,7 +150,7 @@
       // 转派
       stationaryTransferFun(data){
         uni.navigateTo({
-          url: "/pages/transferWorkOrder/transferWorkOrderUser?selectPatientList=1",
+          url: `/pages/transferWorkOrder/transferWorkOrderUser?selectPatientId=${data.patientId}`,
         });
       },
       // 发起回科

pages/transferWorkOrder/transferWorkOrderPatient.vue

@@ -146,8 +146,12 @@
           uni.hideLoading();
           if (result.status == 200) {
             let list = result.list || [];
-            if(isInit && this.options.selectPatientList == 1){
-              list.forEach(v => (v.checked = true))
+            if(isInit && this.options.selectPatientId){
+              list.forEach(v => {
+                if(v.id == this.options.selectPatientId){
+                  v.checked = true;
+                }
+              })
             }
             this.list = list;
           } else {

pages/transferWorkOrder/transferWorkOrderUser.vue

@@ -85,7 +85,7 @@
             if (result.state == 200 || result.state == 201) {
               if(Object.prototype.toString.call(userHandoverCode) === '[object Object]' && userHandoverCode.name){
                 uni.redirectTo({
-                  url: `/pages/transferWorkOrder/transferWorkOrderPatient?userId=${userHandoverCode.id}&userName=${userHandoverCode.name}&userAccount=${userHandoverCode.account}&selectPatientList=${this.options.selectPatientList}`,
+                  url: `/pages/transferWorkOrder/transferWorkOrderPatient?userId=${userHandoverCode.id}&userName=${userHandoverCode.name}&userAccount=${userHandoverCode.account}&selectPatientId=${this.options.selectPatientId}`,
                 });
               }else{
                 uni.showToast({
@@ -112,7 +112,7 @@
         // uni.setStorageSync('transferWorkOrderUserList', userList);
         
         uni.redirectTo({
-          url: `/pages/transferWorkOrder/transferWorkOrderPatient?userId=${user.id}&userName=${user.name}&userAccount=${user.account}&selectPatientList=${this.options.selectPatientList}`,
+          url: `/pages/transferWorkOrder/transferWorkOrderPatient?userId=${user.id}&userName=${user.name}&userAccount=${user.account}&selectPatientId=${this.options.selectPatientId}`,
         });
       },
       handleSearch: debounce(function(keyword) {