From 2953e68b4da8e7860e457d46cb48616e316ffa60 Mon Sep 17 00:00:00 2001
From: kola-web <l15567540858@gmail.com>
Date: Tue, 5 Nov 2024 17:25:21 +0800
Subject: [PATCH] update

---
 project.private.config.json                   |   7 ---
 src/components/customAudioBar/index.ts        |   7 +++
 src/components/popupDoctorDetail/index.scss   |   2 +-
 src/images/defaultAvatar.png                  | Bin 0 -> 5556 bytes
 src/module1/pages/casesDetail/index.scss      |  62 ++++++++++++++++++--------
 src/module1/pages/casesDetail/index.ts        |  15 +++++++
 src/module1/pages/casesDetail/index.wxml      |  33 +++++++++++---
 src/module1/pages/casesFeedback/index.ts      |  48 +++++++++++++++-----
 src/module1/pages/casesFeedback/index.wxml    |  12 ++---
 src/module1/pages/chatRoom/index.ts           |  14 +++---
 src/module1/pages/chatRoomInfo/index.ts       |   2 +-
 src/module1/pages/entryCases/index.ts         |   9 +++-
 src/module1/pages/entryCases/index.wxml       |   2 +-
 src/module1/pages/entryCasesResult/index.json |   2 +-
 src/module1/pages/entryCasesResult/index.scss |   6 +++
 src/module1/pages/entryCasesResult/index.ts   |   6 ++-
 src/module1/pages/entryCasesResult/index.wxml |   3 +-
 src/module1/pages/login/index.ts              |   5 +--
 src/module1/pages/login/index.wxml            |   2 +-
 src/module1/pages/setCaseDoctor/index.ts      |   4 +-
 src/module1/pages/setChatDoctor/index.ts      |   1 +
 src/module1/pages/setInfo/index.scss          |  35 +++++++--------
 src/module1/pages/setInfo/index.ts            |   7 +++
 src/module1/pages/setInfo/index.wxml          |  14 +++---
 src/pages/cases/index.scss                    |   9 ++--
 src/pages/cases/index.ts                      |  21 ++++++++-
 src/pages/cases/index.wxml                    |  27 ++++++++---
 src/pages/chatRoomList/index.scss             |   3 +-
 src/pages/chatRoomList/index.ts               |  11 ++++-
 src/pages/chatRoomList/index.wxml             |   4 +-
 30 files changed, 261 insertions(+), 112 deletions(-)
 create mode 100644 src/images/defaultAvatar.png

diff --git a/project.private.config.json b/project.private.config.json
index c11fcf9..e50f12a 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -16,13 +16,6 @@
           "scene": null
         },
         {
-          "name": "module1/pages/setChatDoctor/index",
-          "pathName": "module1/pages/setChatDoctor/index",
-          "query": "cid=39&create=1",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
           "name": "病历详情",
           "pathName": "module1/pages/casesDetail/index",
           "query": "id=25",
diff --git a/src/components/customAudioBar/index.ts b/src/components/customAudioBar/index.ts
index b53b352..bb0fe4c 100644
--- a/src/components/customAudioBar/index.ts
+++ b/src/components/customAudioBar/index.ts
@@ -31,6 +31,13 @@ Component({
         innerAudioContext: wx.createInnerAudioContext(),
       });
     },
+    detached() {
+      if (this.data.innerAudioContext) {
+        this.data.innerAudioContext?.stop();
+        this.data.innerAudioContext.destroy()
+
+      }
+    },
   },
 
   /**
diff --git a/src/components/popupDoctorDetail/index.scss b/src/components/popupDoctorDetail/index.scss
index 7dcf05c..349b31f 100644
--- a/src/components/popupDoctorDetail/index.scss
+++ b/src/components/popupDoctorDetail/index.scss
@@ -1,7 +1,6 @@
 .doctor-detail {
   padding: 48rpx 32rpx;
   width: 662rpx;
-  height: 874rpx;
   background: #ffffff;
   box-sizing: border-box;
   border-radius: 16rpx 16rpx 16rpx 16rpx;
@@ -54,6 +53,7 @@
     display: flex;
     border-bottom: 1px solid rgba(224, 224, 224, 0.5);
     line-height: 32rpx;
+    align-items: baseline;
     .label {
       padding-right: 1em;
       flex-shrink: 0;
diff --git a/src/images/defaultAvatar.png b/src/images/defaultAvatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..43535fc2e24c4c9b755c9ee9d0ebc684733395d3
GIT binary patch
literal 5556
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
Cqr9#F

literal 0
HcmV?d00001

diff --git a/src/module1/pages/casesDetail/index.scss b/src/module1/pages/casesDetail/index.scss
index da722ed..daf00bc 100644
--- a/src/module1/pages/casesDetail/index.scss
+++ b/src/module1/pages/casesDetail/index.scss
@@ -124,6 +124,7 @@ page {
       gap: 24rpx;
       align-items: center;
       .avatar {
+        flex-shrink: 0;
         width: 112rpx;
         height: 112rpx;
       }
@@ -239,12 +240,15 @@ page {
         }
         .r-content {
           margin-top: 24rpx;
-          padding: 32rpx;
+          border: 32rpx solid #fff;
           font-size: 28rpx;
           color: rgba(133, 133, 133, 1);
           line-height: 50rpx;
           border-radius: 16rpx;
           background-color: #fff;
+          white-space: pre-line;
+          max-height: 400rpx;
+          overflow-y: auto;
         }
       }
       .audio-list {
@@ -453,8 +457,8 @@ page {
       padding: 16rpx 32rpx;
       display: flex;
       gap: 24rpx;
-      align-items: center;
       .avatar {
+        flex-shrink: 0;
         width: 112rpx;
         height: 112rpx;
       }
@@ -498,6 +502,25 @@ page {
             border-radius: 4rpx;
             background-color: rgba(250, 229, 206, 1);
           }
+          .specialty{
+            margin-top: 14rpx;
+            display: flex;
+            gap: 12rpx;
+            flex-wrap: wrap;
+            .wf-label {
+              flex-shrink: 0;
+              width: 48rpx;
+              height: 32rpx;
+            }
+            .wf-tag {
+              flex-shrink: 0;
+              padding: 0 8rpx;
+              font-size: 22rpx;
+              color: rgba(0, 180, 197, 1);
+              line-height: 32rpx;
+              border: 1px solid rgba(191, 239, 244, 1);
+            }
+          }
         }
       }
     }
@@ -535,12 +558,15 @@ page {
         }
         .r-content {
           margin-top: 24rpx;
-          padding: 32rpx;
+          border: 32rpx solid #fff;
           font-size: 28rpx;
           color: rgba(133, 133, 133, 1);
           line-height: 50rpx;
           border-radius: 16rpx;
           background-color: #fff;
+          white-space: pre-line;
+          max-height: 400rpx;
+          overflow-y: auto;
         }
       }
       .audio-list {
@@ -760,11 +786,11 @@ page {
         .name {
           font-size: 24rpx;
           color: rgba(153, 153, 153, 1);
+          white-space: nowrap;
         }
         .tip {
-          position: absolute;
-          top: -25rpx;
-          transform: translate(-50%, -100%);
+          position: fixed;
+          transform: translate(-50%, -110%);
           left: 50%;
           border-radius: 12rpx;
           width: 686rpx;
@@ -788,18 +814,18 @@ page {
             color: rgba(255, 125, 0, 1);
             text-align: left;
           }
-          &::after {
-            position: absolute;
-            bottom: -12rpx;
-            left: 50%;
-            transform: translateX(-50%);
-            content: "";
-            width: 0;
-            height: 0;
-            border-style: solid;
-            border-width: 27rpx 27rpx 0 27rpx;
-            border-color: rgba(255, 247, 232, 1) transparent transparent transparent;
-          }
+          // &::after {
+          //   position: absolute;
+          //   bottom: -12rpx;
+          //   left: 50%;
+          //   transform: translateX(-50%);
+          //   content: "";
+          //   width: 0;
+          //   height: 0;
+          //   border-style: solid;
+          //   border-width: 27rpx 27rpx 0 27rpx;
+          //   border-color: rgba(255, 247, 232, 1) transparent transparent transparent;
+          // }
         }
         .more {
           position: absolute;
diff --git a/src/module1/pages/casesDetail/index.ts b/src/module1/pages/casesDetail/index.ts
index 4e1804c..eb19a16 100644
--- a/src/module1/pages/casesDetail/index.ts
+++ b/src/module1/pages/casesDetail/index.ts
@@ -45,6 +45,12 @@ Page({
     fold: false,
   },
   onLoad(options) {
+    if (options.feedback === "1") {
+      wx.showToast({
+        icon: "none",
+        title: "病历反馈成功!",
+      });
+    }
     this.setData({
       id: options.id,
       beforeClose1: (e: any) => {
@@ -103,6 +109,8 @@ Page({
         detail: res,
         dealDoctorInfo: res.dealCaseInfo.dealDoctorInfo,
         dealInfo: res.dealCaseInfo.dealInfo,
+        deptId: res.caseDeptId[0],
+        labelIds: res.caseLabels.map((item) => item.labelId),
       });
       this.readFeedback();
     });
@@ -198,6 +206,13 @@ Page({
   },
 
   handleShowLable() {
+    const { deptId, deptList } = this.data;
+    if (deptId) {
+      const params = deptList.find((item) => item.value === deptId);
+      this.setData({
+        labelList: params.options,
+      });
+    }
     this.setData({
       show7: true,
     });
diff --git a/src/module1/pages/casesDetail/index.wxml b/src/module1/pages/casesDetail/index.wxml
index 6045096..841e924 100644
--- a/src/module1/pages/casesDetail/index.wxml
+++ b/src/module1/pages/casesDetail/index.wxml
@@ -105,7 +105,7 @@
     </view>
   </view>
   <view class="feedback-card" wx:for="{{detail.feedbackList}}" wx:key="index">
-    <view class="li-options">
+    <view class="li-options" wx:if="{{item.isSelf===1}}">
       <image
         wx:if="{{item.isSelf===1}}"
         class="quality"
@@ -123,7 +123,7 @@
       </view>
     </view>
     <view class="li-row">
-      <view class="label">提交时间</view>
+      <view class="label">反馈时间</view>
       <view class="content">{{item.createTime}}</view>
       <view class="fold" bind:tap="handleFeedBackFold" data-index="{{index}}">
         {{item.fold ? '展开' : '收起'}}
@@ -142,13 +142,24 @@
           <view class="desc">{{item.createDoctorInfo.doctorTitleName || item.createDoctorInfo.doctorOtherTitle}}</view>
         </view>
         <view class="w-footer">
-          <view class="hostipal">{{item.hospitalName}}</view>
+          <view class="hostipal">{{item.createDoctorInfo.hospitalName}}</view>
           <view class="tag">
             {{item.createDoctorInfo.hospitalClassificationName}}{{item.createDoctorInfo.hospitalLevelName}}
           </view>
           <view class="site" wx:if="{{item.createDoctorInfo.cityName}}">
             {{item.createDoctorInfo.cityName}}{{item.createDoctorInfo.countyName?'/':''}}{{item.createDoctorInfo.countyName}}
           </view>
+          <view class="specialty">
+            <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
+            <view
+              class="wf-tag"
+              wx:for="{{item.createDoctorInfo.doctorSpecialty}}"
+              wx:for-item="spec"
+              wx:key="SpecialtyId"
+            >
+              {{spec.SpecialtyName}}
+            </view>
+          </view>
         </view>
       </view>
     </view>
@@ -227,7 +238,9 @@
         <view class="w-container">
           <text class="hostipal">{{dealDoctorInfo.hospitalName}}</text>
           <view class="tag">{{dealDoctorInfo.hospitalClassificationName}}{{dealDoctorInfo.hospitalLevelName}}</view>
-          <view class="site" wx:if="{{dealDoctorInfo.cityName}}">{{dealDoctorInfo.cityName}}{{dealDoctorInfo.countyName?'/':''}}{{dealDoctorInfo.countyName}}</view>
+          <view class="site" wx:if="{{dealDoctorInfo.cityName}}">
+            {{dealDoctorInfo.cityName}}{{dealDoctorInfo.countyName?'/':''}}{{dealDoctorInfo.countyName}}
+          </view>
         </view>
         <view class="w-footer">
           <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
@@ -244,7 +257,11 @@
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon3.png?t={{Timestamp}}"></image>
         <view class="name">更多操作</view>
         <view class="more" wx:if="{{moreShow}}">
-          <view class="m-item" wx:if="{{auth.canCreateChatRoom && foldAuth.canCreateChatRoom}}" bind:tap="handleCreateRoomShow">
+          <view
+            class="m-item"
+            wx:if="{{auth.canCreateChatRoom && foldAuth.canCreateChatRoom}}"
+            bind:tap="handleCreateRoomShow"
+          >
             <image class="icon" src="{{imageUrl}}case-detail-footer-icon2.png?t={{Timestamp}}"></image>
             <view class="name">创建聊天室</view>
           </view>
@@ -305,7 +322,11 @@
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon1.png?t={{Timestamp}}"></image>
         <view class="name">驳回原因</view>
       </view>
-      <view class="w-item" wx:if="{{auth.canCreateChatRoom && !foldAuth.canCreateChatRoom}}" bind:tap="handleCreateRoomShow">
+      <view
+        class="w-item"
+        wx:if="{{auth.canCreateChatRoom && !foldAuth.canCreateChatRoom}}"
+        bind:tap="handleCreateRoomShow"
+      >
         <image class="icon" src="{{imageUrl}}case-detail-footer-icon2.png?t={{Timestamp}}"></image>
         <view class="name">创建聊天室</view>
       </view>
diff --git a/src/module1/pages/casesFeedback/index.ts b/src/module1/pages/casesFeedback/index.ts
index e84ebdc..7c73c1c 100644
--- a/src/module1/pages/casesFeedback/index.ts
+++ b/src/module1/pages/casesFeedback/index.ts
@@ -12,6 +12,8 @@ Page({
     files: [] as any,
 
     DoctorLevel: 1,
+
+    auth: {} as any,
   },
   onLoad(options) {
     this.setData({
@@ -71,9 +73,18 @@ Page({
     });
   },
   handleDelAudio(e) {
-    const { index } = e.currentTarget.dataset;
-    this.setData({
-      audios: this.data.audios.filter((_, i) => i !== Number(index)),
+    wx.showModal({
+      title: "确认删除?",
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      success: (res) => {
+        if (res.confirm) {
+          const { index } = e.currentTarget.dataset;
+          this.setData({
+            audios: this.data.audios.filter((_, i) => i !== Number(index)),
+          });
+        }
+      },
     });
   },
   handleFile(e) {
@@ -93,9 +104,18 @@ Page({
     });
   },
   handleDelFile(e) {
-    const { index } = e.currentTarget.dataset;
-    this.setData({
-      files: this.data.files.filter((_, i) => i !== Number(index)),
+    wx.showModal({
+      title: "确认删除?",
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      success: (res) => {
+        if (res.confirm) {
+          const { index } = e.currentTarget.dataset;
+          this.setData({
+            files: this.data.files.filter((_, i) => i !== Number(index)),
+          });
+        }
+      },
     });
   },
   handlePreviewFile(e) {
@@ -162,7 +182,7 @@ Page({
     });
   },
   handleSave() {
-    const { images, audios, files, info } = this.data;
+    const { images, audios, files, info, auth } = this.data;
     if (images.length === 0 && audios.length === 0 && files.length === 0 && !info) {
       wx.showToast({
         title: "请填写或上传反馈信息",
@@ -170,9 +190,13 @@ Page({
       });
       return;
     }
-    this.setData({
-      show1: true,
-    });
+    if (!auth.canFeedbackInvite && !auth.canFeedbackOpen) {
+      this.handleSubmit();
+    } else {
+      this.setData({
+        show1: true,
+      });
+    }
   },
   handleBack() {
     wx.navigateBack();
@@ -190,7 +214,9 @@ Page({
         isOpen,
       },
     }).then(() => {
-      wx.navigateBack();
+      wx.redirectTo({
+        url: `/module1/pages/casesDetail/index?id=${caseId}&feedback=1`,
+      });
     });
   },
   handleInvite() {
diff --git a/src/module1/pages/casesFeedback/index.wxml b/src/module1/pages/casesFeedback/index.wxml
index 04698d2..445b1f0 100644
--- a/src/module1/pages/casesFeedback/index.wxml
+++ b/src/module1/pages/casesFeedback/index.wxml
@@ -34,7 +34,7 @@
   <view class="card">
     <view class="card-title">
       上传图片建议
-      <text class="limit">(0/9)</text>
+      <text class="limit">({{images.length}}/9)</text>
     </view>
     <view class="image-files">
       <view class="photo" wx:for="{{images}}" wx:key="index">
@@ -80,12 +80,6 @@
             data-index="{{index}}"
             src="{{imageUrl}}icon-eye.png?t={{Timestamp}}"
           ></image>
-          <image
-            bind:tap="handleDownloadFile"
-            data-index="{{index}}"
-            class="icon"
-            src="{{imageUrl}}icon-download.png?t={{Timestamp}}"
-          ></image>
         </view>
       </view>
     </view>
@@ -104,8 +98,8 @@
   <view class="popup1">
     <view class="title">确认提交您的反馈信息</view>
     <view class="btn1" bind:tap="handleSubmit">直接提交我的反馈信息</view>
-    <view class="btn2" bind:tap="handleInvite" wx:if="{{res.canFeedbackInvite}}">提交并邀约质控医生</view>
-    <view class="public">
+    <view class="btn2" bind:tap="handleInvite" wx:if="{{auth.canFeedbackInvite}}">提交并邀约质控医生</view>
+    <view class="public" wx:if="{{auth.canFeedbackOpen}}">
       <radio class="radio" checked="{{isOpen===1}}" bind:tap="handleTogleOpen">
         病历公开（选择公开后，本科室医生均查看病历）
       </radio>
diff --git a/src/module1/pages/chatRoom/index.ts b/src/module1/pages/chatRoom/index.ts
index 24a3a7b..05178b0 100644
--- a/src/module1/pages/chatRoom/index.ts
+++ b/src/module1/pages/chatRoom/index.ts
@@ -131,9 +131,12 @@ Page({
   },
 
   handleView(index = -1) {
-    this.setData({
-      scrollIntoView: index > -1 ? `view${index}` : `place`,
-    });
+    const time = setTimeout(() => {
+      this.setData({
+        scrollIntoView: index > -1 ? `view${index}` : `place`,
+      });
+      clearTimeout(time);
+    }, 300);
   },
   getMessageList() {
     if (this.data.isLoad || this.data.isFinish) return;
@@ -289,6 +292,7 @@ Page({
       msg: message.content,
       to: chatGroupInfo.ChatGroupId,
       chatType: "groupChat",
+      deliverOnlineOnly: "true",
       ext: {
         ...message,
       },
@@ -381,9 +385,7 @@ Page({
       fold: !this.data.fold,
     });
     if (!this.data.fold) {
-      setTimeout(() => {
-        this.handleView();
-      }, 300);
+      this.handleView();
     }
   },
   handleAudio(e) {
diff --git a/src/module1/pages/chatRoomInfo/index.ts b/src/module1/pages/chatRoomInfo/index.ts
index ffb3ea2..c1c4bf1 100644
--- a/src/module1/pages/chatRoomInfo/index.ts
+++ b/src/module1/pages/chatRoomInfo/index.ts
@@ -23,7 +23,7 @@ Page({
   },
   handleDoctor() {
     wx.navigateTo({
-      url: `/module1/pages/setChatDoctor/index?id=${this.data.id}&cid=${this.data.caseId}`,
+      url: `/module1/pages/setChatDoctor/index?rid=${this.data.id}&cid=${this.data.caseId}`,
     });
   },
 });
diff --git a/src/module1/pages/entryCases/index.ts b/src/module1/pages/entryCases/index.ts
index 93612e2..a1cadbe 100644
--- a/src/module1/pages/entryCases/index.ts
+++ b/src/module1/pages/entryCases/index.ts
@@ -295,7 +295,7 @@ Page({
   },
   handleInvite() {
     const params = this.formatParams();
-    const images = this.data.images;
+    const { deptId, labelIds, images } = this.data;
     if (images.length === 0) {
       wx.showToast({
         title: "请上传病历图片",
@@ -303,6 +303,13 @@ Page({
       });
       return;
     }
+    if (deptId && !labelIds.length) {
+      wx.showToast({
+        title: "请选择标签",
+        icon: "none",
+      });
+      return;
+    }
     wx.navigateTo({
       url: `/module1/pages/setCaseDoctor/index`,
       success: (res) => {
diff --git a/src/module1/pages/entryCases/index.wxml b/src/module1/pages/entryCases/index.wxml
index e948bb3..b006bca 100644
--- a/src/module1/pages/entryCases/index.wxml
+++ b/src/module1/pages/entryCases/index.wxml
@@ -6,7 +6,7 @@
   <view class="card">
     <view class="card-title required">
       上传病历图片
-      <text class="limit">(0/9)</text>
+      <text class="limit">({{images.length}}/9)</text>
     </view>
     <view class="image-files">
       <view class="photo" wx:for="{{images}}" wx:key="index">
diff --git a/src/module1/pages/entryCasesResult/index.json b/src/module1/pages/entryCasesResult/index.json
index 9a998df..a2cf610 100644
--- a/src/module1/pages/entryCasesResult/index.json
+++ b/src/module1/pages/entryCasesResult/index.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "录入新病历",
+  "navigationBarTitleText": "提交成功",
   "navigationStyle": "default",
   "usingComponents": {}
 }
diff --git a/src/module1/pages/entryCasesResult/index.scss b/src/module1/pages/entryCasesResult/index.scss
index 0a99a95..2a6a8b5 100644
--- a/src/module1/pages/entryCasesResult/index.scss
+++ b/src/module1/pages/entryCasesResult/index.scss
@@ -6,6 +6,12 @@
     width: 200rpx;
     height: 200rpx;
   }
+  .title{
+    font-size: 48rpx;
+    text-align: center;
+    font-weight: bold;
+    color: #141515;
+  }
   .desc {
     margin-top: 16rpx;
     font-size: 32rpx;
diff --git a/src/module1/pages/entryCasesResult/index.ts b/src/module1/pages/entryCasesResult/index.ts
index bb79539..3c55e8d 100644
--- a/src/module1/pages/entryCasesResult/index.ts
+++ b/src/module1/pages/entryCasesResult/index.ts
@@ -9,9 +9,13 @@ Page({
   onLoad(options) {
     this.setData({
       caseId: options.cid,
-      codeUrl: options.wxi,
       isFollow: options.isf,
     });
+    if (options.wxi) {
+      this.setData({
+        codeUrl: decodeURIComponent(options.wxi),
+      });
+    }
   },
   handleBackCase() {
     wx.reLaunch({
diff --git a/src/module1/pages/entryCasesResult/index.wxml b/src/module1/pages/entryCasesResult/index.wxml
index 207052d..a31a867 100644
--- a/src/module1/pages/entryCasesResult/index.wxml
+++ b/src/module1/pages/entryCasesResult/index.wxml
@@ -1,7 +1,8 @@
 <view class="page">
   <image class="badge" src="{{imageUrl}}icon-resolve.png?t={{Timestamp}}" mode="scaleToFill"></image>
+  <view class="title">提交成功</view>
   <view class="desc">病历提交后医生将收到消息提醒</view>
-  <view class="btn1" bind:tap="handleDetail">查看我提交的病历</view>
+  <view class="btn1" bind:tap="handleDetail">查看病历详情</view>
   <view class="btn2" bind:tap="handleBackCase">返回病历列表</view>
   <image class="code" src="{{codeUrl}}" mode="scaleToFill" show-menu-by-longpress></image>
   <view class="tip">关注公众号接收病历反馈消息</view>
diff --git a/src/module1/pages/login/index.ts b/src/module1/pages/login/index.ts
index 1144f26..71620a9 100644
--- a/src/module1/pages/login/index.ts
+++ b/src/module1/pages/login/index.ts
@@ -58,10 +58,7 @@ Page({
   handleSubmit() {
     const { mobile, code, protool } = this.data;
     if (!protool) {
-      wx.showToast({
-        title: "请先勾选协议",
-        icon: "none",
-      });
+      this.handleNavProtool()
       return;
     }
     if (!mobile) {
diff --git a/src/module1/pages/login/index.wxml b/src/module1/pages/login/index.wxml
index 746eb42..89000e6 100644
--- a/src/module1/pages/login/index.wxml
+++ b/src/module1/pages/login/index.wxml
@@ -11,7 +11,7 @@
           model:value="{{mobile}}"
           class="input"
           placeholder-class="place-input"
-          type="tel"
+          type="number"
           placeholder="请输入手机号"
         />
       </view>
diff --git a/src/module1/pages/setCaseDoctor/index.ts b/src/module1/pages/setCaseDoctor/index.ts
index c21df52..0488116 100644
--- a/src/module1/pages/setCaseDoctor/index.ts
+++ b/src/module1/pages/setCaseDoctor/index.ts
@@ -262,7 +262,7 @@ Page({
         },
       }).then(() => {
         wx.redirectTo({
-          url: `/module1/pages/casesDetail/index?id=${caseId}`,
+          url: `/module1/pages/casesDetail/index?id=${caseId}&feedback=1`,
         });
       });
       return;
@@ -272,7 +272,7 @@ Page({
       wx.ajax({ method: "POST", url: "?r=takeda/case/invite-doctor", data: { caseId, dealDoctorId: DoctorId } }).then(
         (res) => {
           wx.navigateTo({
-            url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId}`,
+            url: `/module1/pages/entryCasesResult/index?isf=${res.isSubscribe}&wxi=${encodeURIComponent(res.wxImg)}&cid=${res.caseId || caseId}`,
           });
         },
       );
diff --git a/src/module1/pages/setChatDoctor/index.ts b/src/module1/pages/setChatDoctor/index.ts
index fa871b1..afe6e24 100644
--- a/src/module1/pages/setChatDoctor/index.ts
+++ b/src/module1/pages/setChatDoctor/index.ts
@@ -260,6 +260,7 @@ Page({
         caseId,
         roomId,
         inviteDoctorId: DoctorId,
+        doctorId: DoctorId,
       },
     }).then((res) => {
       wx.reLaunch({
diff --git a/src/module1/pages/setInfo/index.scss b/src/module1/pages/setInfo/index.scss
index f15e79c..00940e1 100644
--- a/src/module1/pages/setInfo/index.scss
+++ b/src/module1/pages/setInfo/index.scss
@@ -1,22 +1,21 @@
+.reject {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 20rpx 32rpx;
+  background-color: #ffedea;
+  font-size: 28rpx;
+  color: #ed4f39;
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+  .icon {
+    flex-shrink: 0;
+    width: 32rpx;
+    height: 32rpx;
+  }
+}
 .page {
   overflow: hidden;
-  .reject {
-    position: fixed;
-    top: 0;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 20rpx 32rpx;
-    background-color: #ffedea;
-    font-size: 28rpx;
-    color: #ed4f39;
-    display: flex;
-    align-items: center;
-    gap: 16rpx;
-    .icon {
-      width: 32rpx;
-      height: 32rpx;
-    }
-  }
   .container {
     margin-top: 244rpx;
     padding: 32rpx 32rpx 250rpx;
@@ -40,7 +39,7 @@
         align-items: top;
         border-bottom: 1px solid rgba(224, 224, 224, 0.5);
         line-height: 1;
-        &.row-center{
+        &.row-center {
           align-items: center;
         }
         .label {
diff --git a/src/module1/pages/setInfo/index.ts b/src/module1/pages/setInfo/index.ts
index ddd6d91..cb66d4f 100644
--- a/src/module1/pages/setInfo/index.ts
+++ b/src/module1/pages/setInfo/index.ts
@@ -79,6 +79,12 @@ Page({
       this.setData({
         applyHostipalInfo: Array.isArray(res) ? null : res,
       });
+      if (res.AuditStatus === 1) {
+        this.setData({
+          HospitalName: res.Name,
+          HospitalId: res.HospitalId,
+        });
+      }
     });
   },
   getDoctorDict() {
@@ -182,6 +188,7 @@ Page({
     if (!PositionImg) {
       wx.showToast({
         title: "请上传任职证书",
+        icon: "none",
       });
       return;
     }
diff --git a/src/module1/pages/setInfo/index.wxml b/src/module1/pages/setInfo/index.wxml
index 22d2abc..b66250a 100644
--- a/src/module1/pages/setInfo/index.wxml
+++ b/src/module1/pages/setInfo/index.wxml
@@ -1,11 +1,11 @@
+<view class="reject" wx:if="{{RejectReason}}">
+  <image class="icon" src="{{imageUrl}}icon-error.png?t={{Timestamp}}"></image>
+  审核不通过原因：{{RejectReason}}
+</view>
 <view
   class="page"
   style="background: url({{imageUrl}}set-info-bg.png?r={{Timestamp}}) no-repeat top center/100% 356rpx;"
 >
-  <view class="reject" wx:if="{{RejectReason}}">
-    <image class="icon" src="{{imageUrl}}icon-error.png?t={{Timestamp}}"></image>
-    审核不通过原因：{{RejectReason}}
-  </view>
   <view class="container">
     <view class="invite" wx:if="{{inviteName}}">{{inviteName}}医生为您的邀约医生</view>
     <view class="invite" wx:else>您没有邀约医生，可能会影响您的审核</view>
@@ -78,15 +78,15 @@
           </view>
           <view class="files">
             <uploadFile class="upload" bind:file="handleFile" data-key="RegisterImg">
-              <image wx:if="{{RegisterImg}}" class="u-img" src="{{RegisterImg}}"></image>
+              <image wx:if="{{RegisterImg}}" mode="aspectFill" class="u-img" src="{{RegisterImg}}"></image>
               <image wx:else class="u-img" src="{{imageUrl}}credentials1.png?t={{Timestamp}}"></image>
             </uploadFile>
             <uploadFile class="upload" bind:file="handleFile" data-key="QualificationImg">
-              <image wx:if="{{QualificationImg}}" class="u-img" src="{{QualificationImg}}"></image>
+              <image wx:if="{{QualificationImg}}"  mode="aspectFill" class="u-img" src="{{QualificationImg}}"></image>
               <image wx:else class="u-img" src="{{imageUrl}}credentials2.png?t={{Timestamp}}"></image>
             </uploadFile>
             <uploadFile class="upload" bind:file="handleFile" data-key="PositionImg">
-              <image wx:if="{{PositionImg}}" class="u-img" src="{{PositionImg}}"></image>
+              <image wx:if="{{PositionImg}}"  mode="aspectFill" class="u-img" src="{{PositionImg}}"></image>
               <image wx:else class="u-img" src="{{imageUrl}}credentials3.png?t={{Timestamp}}"></image>
             </uploadFile>
           </view>
diff --git a/src/pages/cases/index.scss b/src/pages/cases/index.scss
index 9de3143..f755ad9 100644
--- a/src/pages/cases/index.scss
+++ b/src/pages/cases/index.scss
@@ -56,7 +56,7 @@ page {
       }
     }
     .form {
-      margin: 32rpx 32rpx;
+      margin: 32rpx 32rpx 0;
       display: grid;
       grid-template-columns: repeat(2, 1fr);
       gap: 18rpx 28rpx;
@@ -287,10 +287,11 @@ page {
           font-size: 28rpx;
           color: rgba(20, 21, 21, 1);
           .line {
+            margin: 0 6rpx;
             color: rgba(205, 205, 205, 1);
           }
           .new {
-            margin-right: 12rpx;
+            margin-left: 12rpx;
             display: inline-block;
             padding: 0 8rpx;
             font-size: 24rpx;
@@ -299,6 +300,7 @@ page {
             border-radius: 0rpx 8rpx 0rpx 8rpx;
           }
           .reject {
+            margin-left: 12rpx;
             padding: 0 8rpx;
             display: inline-block;
             font-size: 24rpx;
@@ -450,7 +452,8 @@ page {
           color: rgba(20, 21, 21, 1);
           line-height: 44rpx;
           .tag {
-            vertical-align: 4rpx;
+            margin-left: 12rpx;
+            vertical-align: 2rpx;
             display: inline-block;
             padding: 0 8rpx;
             font-size: 24rpx;
diff --git a/src/pages/cases/index.ts b/src/pages/cases/index.ts
index 1077b94..339f8ad 100644
--- a/src/pages/cases/index.ts
+++ b/src/pages/cases/index.ts
@@ -40,6 +40,7 @@ Page({
     caseStatusName: "全部",
     hospitalName: "全部",
     deptName: "全部",
+    labelName: "全部",
     provinceName: "",
     cityName: "",
     countyName: "",
@@ -60,7 +61,7 @@ Page({
     isHighQuality: "",
     isOpen: "",
     needDeal: "",
-    orderType: "",
+    orderType: "feedbackTime",
 
     myCaseCount: 0,
 
@@ -338,15 +339,31 @@ Page({
   },
   handleLabel(e) {
     const { params } = e.currentTarget.dataset;
-    const labelId = this.data.labelId;
+    const { labelId, labelList } = this.data;
     const newLabelId = labelId.includes(params.value)
       ? labelId.filter((item) => item !== params.value)
       : [...labelId, params.value];
+    let labelName = "";
+    labelList.forEach((item) => {
+      if (newLabelId.includes(item.value)) {
+        labelName = `${labelName}${labelName ? "," : ""}${item.label}`;
+      }
+    });
+
     this.setData({
       labelId: newLabelId,
+      labelName: labelName || "全部",
     });
   },
   handleTagSubmit() {
+    const { deptId, labelId } = this.data;
+    if (deptId.length && !labelId.length) {
+      wx.showToast({
+        title: "请选择标签",
+        icon: "none",
+      });
+      return;
+    }
     this.setData({
       show3: false,
     });
diff --git a/src/pages/cases/index.wxml b/src/pages/cases/index.wxml
index b4feb52..1f33a82 100644
--- a/src/pages/cases/index.wxml
+++ b/src/pages/cases/index.wxml
@@ -100,27 +100,34 @@
       <view class="row">
         <view class="label">标签</view>
         <view class="picker-content" bind:tap="handleTagShow">
-          <view class="content">{{deptName}}</view>
+          <view class="content">{{labelName}}</view>
           <van-icon name="arrow-down" />
         </view>
       </view>
       <view class="row">
         <view class="label">地区</view>
         <view class="picker-content" bind:tap="handleArea">
-          <view class="content">{{cityName + countyName || '地区'}}</view>
+          <view class="content">{{cityName + countyName || '全部'}}</view>
           <van-icon name="arrow-down" />
         </view>
       </view>
     </view>
     <view class="station">
       <view class="wrap">
-        <view class="item">
-          <radio class="radio" checked="{{isReject==='1'}}" bind:tap="handleRadio" data-key="isReject"></radio>
+        <view class="item" wx:if="{{nav==='0'}}">
+          <radio
+            class="radio"
+            color="#00B4C5"
+            checked="{{isReject==='1'}}"
+            bind:tap="handleRadio"
+            data-key="isReject"
+          ></radio>
           驳回
         </view>
         <view class="item" wx:if="{{nav!=='2'}}">
           <radio
             class="radio"
+            color="#00B4C5"
             checked="{{isHighQuality==='1'}}"
             bind:tap="handleRadio"
             data-key="isHighQuality"
@@ -128,7 +135,13 @@
           优质
         </view>
         <view class="item" wx:if="{{nav!=='1'}}">
-          <radio class="radio" checked="{{isOpen==='1'}}" bind:tap="handleRadio" data-key="isOpen"></radio>
+          <radio
+            class="radio"
+            color="#00B4C5"
+            checked="{{isOpen==='1'}}"
+            bind:tap="handleRadio"
+            data-key="isOpen"
+          ></radio>
           公开
         </view>
       </view>
@@ -148,7 +161,7 @@
       </view>
     </view>
     <radio
-      wx:if="{{userInfo.DoctorLevel>1}}"
+      wx:if="{{userInfo.DoctorLevel>1 && nav==='0'}}"
       class="feedback"
       color="rgba(0, 180, 197, 1)"
       checked="{{needDeal==='1'}}"
@@ -341,7 +354,7 @@
         {{item.label}}
       </view>
     </view>
-    <view class="submit" bind:tap="handleTagSubmit">保存</view>
+    <view class="submit" bind:tap="handleTagSubmit">确定</view>
   </view>
 </van-popup>
 
diff --git a/src/pages/chatRoomList/index.scss b/src/pages/chatRoomList/index.scss
index 6daf030..5f66d95 100644
--- a/src/pages/chatRoomList/index.scss
+++ b/src/pages/chatRoomList/index.scss
@@ -341,7 +341,8 @@ page {
           color: rgba(20, 21, 21, 1);
           line-height: 44rpx;
           .tag {
-            vertical-align: 4rpx;
+            margin-left: 12rpx;
+            vertical-align: 2rpx;
             display: inline-block;
             padding: 0 8rpx;
             font-size: 24rpx;
diff --git a/src/pages/chatRoomList/index.ts b/src/pages/chatRoomList/index.ts
index d45c44c..f5d6124 100644
--- a/src/pages/chatRoomList/index.ts
+++ b/src/pages/chatRoomList/index.ts
@@ -39,6 +39,7 @@ Page({
     caseStatusName: "全部",
     hospitalName: "全部",
     deptName: "全部",
+    labelName: "全部",
     provinceName: "",
     cityName: "",
     countyName: "",
@@ -360,12 +361,20 @@ Page({
   },
   handleLabel(e) {
     const { params } = e.currentTarget.dataset;
-    const labelId = this.data.labelId;
+    const { labelId, labelList } = this.data;
     const newLabelId = labelId.includes(params.value)
       ? labelId.filter((item) => item !== params.value)
       : [...labelId, params.value];
+    let labelName = "";
+    labelList.forEach((item) => {
+      if (newLabelId.includes(item.value)) {
+        labelName = `${labelName}${labelName ? "," : ""}${item.label}`;
+      }
+    });
+
     this.setData({
       labelId: newLabelId,
+      labelName: labelName || "全部",
     });
   },
   handleTagSubmit() {
diff --git a/src/pages/chatRoomList/index.wxml b/src/pages/chatRoomList/index.wxml
index 962f0ab..f8c51d6 100644
--- a/src/pages/chatRoomList/index.wxml
+++ b/src/pages/chatRoomList/index.wxml
@@ -93,7 +93,7 @@
       <view class="row">
         <view class="label">标签</view>
         <view class="picker-content" bind:tap="handleTagShow">
-          <view class="content">{{deptName}}</view>
+          <view class="content">{{labelName}}</view>
           <van-icon name="arrow-down" />
         </view>
       </view>
@@ -107,7 +107,7 @@
       <view class="row">
         <view class="label">地区</view>
         <view class="picker-content" bind:tap="handleArea">
-          <view class="content">{{cityName + countyName || '地区'}}</view>
+          <view class="content">{{cityName + countyName || '全部'}}</view>
           <van-icon name="arrow-down" />
         </view>
       </view>