bug处理

src/app.ts

@@ -33,6 +33,8 @@ App<IAppOption>({
     doctorId: null,
 
     scene: null,
+
+    needDeal: "",
   },
   onLaunch() {
     Page = page as WechatMiniprogram.Page.Constructor;

src/components/doctorAvatar/index.ts

@@ -5,7 +5,7 @@ Component({
   /**
    * 组件的属性列表
    */
-  externalClasses: true,
+  externalClasses: [],
   properties: {
     src: {
       type: String,

src/components/popupDoctorDetail/index.scss

@@ -17,6 +17,7 @@
     font-weight: bold;
   }
   .user {
+    padding-top: 36rpx;
     display: flex;
     gap: 24rpx;
     .avatar {

src/components/uploadFile/index.ts

@@ -160,6 +160,7 @@ Component({
               duration: 0,
               fileType: this.data.fileTypeList[suffix] || 99,
               videoUrl: "",
+              hash: "",
             };
             if (item.fileType === "image") {
               expandJson.imgUrl = data.data.Url;

src/echart/components/homeLevel1/index.ts

@@ -87,6 +87,16 @@ Component({
         this.getHeight();
       });
     },
+    handleCaseUpdate() {
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleChat() {
+      wx.switchTab({
+        url: "/pages/chatRoomList/index",
+      });
+    },
     handleQuestion(e) {
       const { index } = e.currentTarget.dataset;
       const message = {

src/echart/components/homeLevel1/index.wxml

@@ -20,12 +20,12 @@
     <view class="title">待处理事项</view>
     <view class="bg">
       <view class="b-container" wx:if="{{take.notReadFeedBackCount>0 || take.notReadChatRoomCount>0}}">
-        <view class="item">
+        <view class="item" bind:tap="handleCaseUpdate">
           <view class="name">病历更新</view>
           <view class="num">{{take.notReadFeedBackCount}}</view>
         </view>
         <view class="line"></view>
-        <view class="item">
+        <view class="item" bind:tap="handleChat">
           <view class="name">聊天室新消息</view>
           <view class="num">{{take.notReadChatRoomCount}}</view>
         </view>

src/echart/components/homeLevel2/index.ts

@@ -122,6 +122,27 @@ Component({
         url: "/module1/pages/entryCases/index",
       });
     },
+    handlePendCase() {
+      app.globalData.needDeal = "1";
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleCaseUpdate() {
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleChat() {
+      wx.switchTab({
+        url: "/pages/chatRoomList/index",
+      });
+    },
+    handleAudit() {
+      wx.navigateTo({
+        url: "/module1/pages/auditDoctorList/index",
+      });
+    },
   },
 });
 

src/echart/components/homeLevel2/index.wxml

@@ -34,19 +34,19 @@
         class="b-container"
         wx:if="{{take.dealCaseCount>0 || take.notReadFeedBackCount>0 || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}"
       >
-        <view class="item">
+        <view class="item" bind:tap="handlePendCase">
           <view class="name">待处理病历</view>
           <view class="num">{{take.dealCaseCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleCaseUpdate">
           <view class="name">病历更新</view>
           <view class="num">{{take.notReadFeedBackCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleChat">
           <view class="name">聊天室消息</view>
           <view class="num">{{take.notReadChatRoomCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleAudit">
           <view class="name">医生待审核</view>
           <view class="num">{{take.toAuditDoctorCount}}</view>
         </view>

src/echart/components/homeLevel3/index.ts

@@ -80,6 +80,28 @@ Component({
         url: "/module1/pages/entryCases/index",
       });
     },
+
+    handlePendCase() {
+      app.globalData.needDeal = "1";
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleCaseUpdate() {
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleChat() {
+      wx.switchTab({
+        url: "/pages/chatRoomList/index",
+      });
+    },
+    handleAudit() {
+      wx.navigateTo({
+        url: "/module1/pages/auditDoctorList/index",
+      });
+    },
   },
 });
 

src/echart/components/homeLevel3/index.wxml

@@ -34,19 +34,19 @@
         class="b-container"
         wx:if="{{take.dealCaseCount>0 || take.notReadFeedBackCount>0 || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}"
       >
-        <view class="item">
+        <view class="item" bind:tap="handlePendCase">
           <view class="name">待处理病历</view>
           <view class="num">{{take.dealCaseCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleCaseUpdate">
           <view class="name">病历更新</view>
           <view class="num">{{take.notReadFeedBackCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleChat">
           <view class="name">聊天室消息</view>
           <view class="num">{{take.notReadChatRoomCount}}</view>
         </view>
-        <view class="item">
+        <view class="item" bind:tap="handleAudit">
           <view class="name">医生待审核</view>
           <view class="num">{{take.toAuditDoctorCount}}</view>
         </view>

src/echart/components/homeLevel4/index.ts

@@ -655,6 +655,23 @@ Component({
         url: "/module1/pages/org4/index",
       });
     },
+
+    handlePendCase() {
+      app.globalData.needDeal = "1";
+      wx.switchTab({
+        url: "/pages/cases/index",
+      });
+    },
+    handleChat() {
+      wx.switchTab({
+        url: "/pages/chatRoomList/index",
+      });
+    },
+    handleAudit() {
+      wx.navigateTo({
+        url: "/module1/pages/auditDoctorList/index",
+      });
+    },
   },
 });
 

src/echart/components/homeLevel4/index.wxml

@@ -34,17 +34,15 @@
         class="b-container"
         wx:if="{{take.dealCaseCount>0  || take.notReadChatRoomCount>0 || take.toAuditDoctorCount>0}}"
       >
-        <view class="item">
+        <view class="item" bind:tap="handlePendCase">
           <view class="name">待处理病历</view>
           <view class="num">{{take.dealCaseCount}}</view>
         </view>
-        <view class="line"></view>
+        <view class="item" bind:tap="handleChat">
-        <view class="item">
+          <view class="name">聊天室消息</view>
-          <view class="name">聊天室新消息</view>
           <view class="num">{{take.notReadChatRoomCount}}</view>
         </view>
-        <view class="line"></view>
+        <view class="item" bind:tap="handleAudit">
-        <view class="item">
           <view class="name">医生待审核</view>
           <view class="num">{{take.toAuditDoctorCount}}</view>
         </view>

src/module1/pages/casesFeedback/index.ts

@@ -49,6 +49,7 @@ Page({
           name: detail.name,
           url: detail.fileUrl,
           isRepeat: 2,
+          hash: "",
         },
       ],
     });

src/module1/pages/entryCases/index.ts

@@ -119,6 +119,7 @@ Page({
           name: detail.name,
           url: detail.fileUrl,
           isRepeat: 2,
+          hash: "",
         },
       ],
     });

src/module1/pages/invite/index.wxml

@@ -18,7 +18,7 @@
       </view>
       <view class="hostipal">
         {{userInfo.HospitalName}}
-        <view class="tag">{{userInfo.HospitalClassificationName}}{{userInfo.HospitalName}}</view>
+        <view class="tag">{{userInfo.HospitalClassificationName}}{{userInfo.HospitalLevelName}}</view>
       </view>
       <view class="code">
         <image class="c-img" src="{{codeUrl}}" show-menu-by-longpress></image>

src/module1/pages/setCaseDoctor/index.ts

@@ -271,7 +271,7 @@ Page({
     if (detailInvite) {
       wx.ajax({ method: "POST", url: "?r=takeda/case/invite-doctor", data: { caseId, dealDoctorId: DoctorId } }).then(
         (res) => {
-          wx.navigateTo({
+          wx.reLaunch({
             url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
           });
         },

src/module1/pages/setChatDoctor/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "指派医生",
+  "navigationBarTitleText": "选择医生",
   "navigationStyle": "default",
   "usingComponents": {
     "popupDoctorDetail": "/components/popupDoctorDetail/index",

src/module1/pages/setChatDoctor/index.wxml

@@ -79,7 +79,7 @@
   </view>
   <view class="footer">
     <view class="cancel" bind:tap="handleBack">返回</view>
-    <view class="submit" bind:tap="handleSubmit">确认提交</view>
+    <view class="submit" bind:tap="handleSubmit">确认邀请</view>
   </view>
 </view>
 

src/module1/pages/userInfo/index.wxml

@@ -81,7 +81,7 @@
         {{item.label}}
       </view>
     </view>
-    <view class="submit" bind:tap="handleSubmit">确定</view>
+    <view class="submit" bind:tap="handleSubmit">保存</view>
   </view>
 </van-popup>
 

src/pages/cases/index.scss

@@ -14,9 +14,10 @@ page {
         padding: 20rpx;
         flex: 1;
         text-align: center;
-        font-size: 32rpx;
+        font-size: 28rpx;
         color: rgba(133, 133, 133, 1);
         line-height: 44rpx;
+        white-space: nowrap;
         &.active {
           position: relative;
           color: rgba(0, 180, 197, 1);

src/pages/cases/index.ts

@@ -73,6 +73,10 @@ Page({
     });
   },
   onShow() {
+    this.setData({
+      needDeal: app.globalData.needDeal,
+    });
+    app.globalData.needDeal = "";
     app.waitLogin().then(() => {
       this.getBaseInfo();
       this.getList();
@@ -184,15 +188,16 @@ Page({
     if (caseStatus.includes(value)) {
       this.setData({
         caseStatus: caseStatus.filter((item) => item !== value),
-        caseStatusName: caseStatus
+        caseStatusName:
+          caseStatus
             .filter((item) => item !== value)
             .map((item) => caseStatusList[item])
-          .join(","),
+            .join(",") || "全部",
       });
     } else {
       this.setData({
         caseStatus: [...caseStatus, value],
-        caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(","),
+        caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(",") || "全部",
       });
     }
   },
@@ -436,7 +441,8 @@ Page({
     const { index } = e.currentTarget.dataset;
     const message = {
       1: "属于您所在科室的公开的病历",
-      2: "平台所有优质的病历",
+      2: "属于您所在科室的优质的病历 ",
+      3: "???",
     }[index];
     wx.showModal({
       confirmColor: "#00B4C5",

src/pages/cases/index.wxml

@@ -3,14 +3,17 @@
   <view class="header">
     <view class="navbar">
       <view class="nav {{nav==='0' && 'active'}}" bind:tap="handleNav" data-nav="0">我的病历</view>
-      <view class="nav {{nav==='3' && 'active'}}" bind:tap="handleNav" data-nav="0">全部病历</view>
+      <view class="nav {{nav==='3' && 'active'}}" bind:tap="handleNav" data-nav="3">
-      <view class="nav {{nav==='1' && 'active'}}" bind:tap="handleNav" data-nav="1">
+        全部病历
+        <van-icon name="question" size="12" catch:tap="handleQuestion" data-index="3" color="rgba(224, 224, 224, 1)" />
+      </view>
+      <view wx:if="{{userInfo.DoctorLevel===3 && userInfo.IsSuper===1}}" class="nav {{nav==='1' && 'active'}}" bind:tap="handleNav" data-nav="1">
         公开病历
-        <van-icon name="question" catch:tap="handleQuestion" data-index="1" color="rgba(224, 224, 224, 1)" />
+        <van-icon name="question" size="12" catch:tap="handleQuestion" data-index="1" color="rgba(224, 224, 224, 1)" />
       </view>
       <view class="nav {{nav==='2' && 'active'}}" bind:tap="handleNav" data-nav="2">
         优质病历
-        <van-icon name="question" catch:tap="handleQuestion" data-index="2" color="rgba(224, 224, 224, 1)" />
+        <van-icon name="question" size="12" catch:tap="handleQuestion" data-index="2" color="rgba(224, 224, 224, 1)" />
       </view>
     </view>
     <view class="search">
@@ -115,7 +118,7 @@
     </view>
     <view class="station">
       <view class="wrap">
-        <view class="item" wx:if="{{nav==='0'}}">
+        <view class="item" wx:if="{{nav==='0' || nav==='3'}}">
           <radio
             class="radio"
             color="#00B4C5"
@@ -162,7 +165,7 @@
       </view>
     </view>
     <radio
-      wx:if="{{userInfo.DoctorLevel>1 && nav==='0'}}"
+      wx:if="{{userInfo.DoctorLevel>1 && (nav==='0' || nav==='3')}}"
       class="feedback"
       color="rgba(0, 180, 197, 1)"
       checked="{{needDeal==='1'}}"

src/pages/chatRoomList/index.ts

@@ -177,15 +177,16 @@ Page({
     if (caseStatus.includes(value)) {
       this.setData({
         caseStatus: caseStatus.filter((item) => item !== value),
-        caseStatusName: caseStatus
+        caseStatusName:
+          caseStatus
             .filter((item) => item !== value)
             .map((item) => caseStatusList[item])
-          .join(","),
+            .join(",") || "全部",
       });
     } else {
       this.setData({
         caseStatus: [...caseStatus, value],
-        caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(","),
+        caseStatusName: [...caseStatus, value].map((item) => caseStatusList[item]).join(",") || "全部",
       });
     }
   },

src/pages/my/index.wxml

@@ -18,7 +18,7 @@
       </view>
       <view class="w-container">
         <view class="hostipal">{{userInfo.HospitalName}}</view>
-        <view class="tag">{{userInfo.HospitalClassificationName}}{{userInfo.HospitalName}}</view>
+        <view class="tag">{{userInfo.HospitalClassificationName}}{{userInfo.HospitalLevelName}}</view>
         <view class="site" wx:if="{{userInfo.CityName}}">
           {{userInfo.CityName}}{{userInfo.CountyName?'/':''}}{{userInfo.CountyName}}
         </view>

typings/index.d.ts

@@ -8,6 +8,8 @@ interface IAppOption {
     isLogin: number;
     doctorId: null | number;
     scene: null | { [key: string]: any };
+
+    needDeal: "" | "1";
   };
   userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback;
   waitLogin: (waitLoginState?: boolean) => Promise<any>;