diff --git a/project.private.config.json b/project.private.config.json
index 64cb977..a89a168 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -23,16 +23,23 @@
     "miniprogram": {
       "list": [
         {
-          "name": "patient/pages/liveDetail/index",
-          "pathName": "patient/pages/liveDetail/index",
-          "query": "id=35",
+          "name": "医生-患者量表",
+          "pathName": "pages/d_qolDetail/index",
+          "query": "id=178",
           "scene": null,
           "launchMode": "default"
         },
         {
+          "name": "医生-患者详情",
+          "pathName": "pages/d_patientDetail/index",
+          "query": "id=178",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "医保-详情",
           "pathName": "patient/pages/medicalDetail/index",
-          "query": "",
+          "query": "id=3",
           "launchMode": "default",
           "scene": null
         },
diff --git a/src/app.json b/src/app.json
index 1933a37..37b37b3 100644
--- a/src/app.json
+++ b/src/app.json
@@ -15,7 +15,8 @@
     "pages/d_userInfo/index",
     "pages/d_invite/index",
     "pages/d_patient/index",
-    "pages/d_patientHormones/index"
+    "pages/d_patientHormones/index",
+    "pages/d_qolDetail/index"
   ],
   "subPackages": [
     {
diff --git a/src/app.ts b/src/app.ts
index 7526be7..0e3c7b3 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -14,6 +14,7 @@ dayjs.extend(relativeTime)
 
 App<IAppOption>({
   globalData: {
+    version: '2.0', // 在数据请求里面发送给后端的版本号[X-MP-Version]
     // 测试号 wx2b0bb13edf717c1d
     // dev
     // appid:wxf9ce8010f1ad24aa
@@ -111,7 +112,7 @@ App<IAppOption>({
     Page = page as WechatMiniprogram.Page.Constructor
     Component = component as WechatMiniprogram.Component.Constructor
 
-    wx.ajax = licia.curry(request)({ gUrl: this.globalData.url })
+    wx.ajax = licia.curry(request)({ gUrl: this.globalData.url, version: this.globalData.version })
 
     this.startLogin()
 
diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss
index a95a6cc..091038d 100644
--- a/src/components/popup/index.scss
+++ b/src/components/popup/index.scss
@@ -155,19 +155,19 @@
   }
   .contaienr {
     margin-top: -80rpx;
-    padding: 96rpx 0 0;
+    padding: 122rpx 0 0;
     width: 540rpx;
     border-radius: 24rpx;
     box-sizing: border-box;
     background: linear-gradient(353deg, #ffffff 0%, #f5eeff 100%);
     box-shadow: inset 0rpx -1rpx 0rpx 0rpx #e5e6eb;
     .content {
-      font-size: 28rpx;
+      font-size: 36rpx;
       color: #adacb2;
       text-align: center;
     }
     .footer {
-      margin-top: 40rpx;
+      margin-top: 66rpx;
       border-top: 1px solid #e5e6eb;
       display: flex;
       .sure,
@@ -439,6 +439,46 @@
   }
 }
 
+.popup14 {
+  .badge {
+    position: relative;
+    z-index: 1;
+    display: block;
+    width: 198rpx;
+    height: 198rpx;
+    margin: 0 auto -110rpx;
+    text-align: center;
+  }
+  .popup-container {
+    width: 670rpx;
+    box-sizing: border-box;
+    padding: 130rpx 58rpx 56rpx;
+    border-radius: 32rpx;
+    background: linear-gradient(180deg, #f1e6ff 0%, #ffffff 29.75%, #ffffff 100%);
+    .title {
+      font-size: 40rpx;
+      color: #211d2e;
+      font-weight: bold;
+    }
+    .content {
+      margin-top: 28rpx;
+      font-size: 36rpx;
+      color: #69686e;
+      line-height: 48rpx;
+    }
+    .btn {
+      margin-top: 56rpx;
+      height: 88rpx;
+      line-height: 88rpx;
+      text-align: center;
+      font-size: 36rpx;
+      color: #ffffff;
+      background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+      border-radius: 100rpx;
+    }
+  }
+}
+
 .close {
   margin: 48rpx auto 0;
   display: block;
diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml
index 2d215d1..49bb444 100644
--- a/src/components/popup/index.wxml
+++ b/src/components/popup/index.wxml
@@ -106,13 +106,16 @@
     </view>
   </view>
   <view class="popup12" wx:if="{{type==='popup12'}}">
-    <view class="popup-container" style="background: url('/images/bg29.png') no-repeat top center/100%">
+    <view
+      class="popup-container"
+      style="background: url('{{imageUrl}}bg29.png?t={{Timestamp}}') no-repeat top center/100%"
+    >
       <view class="container">
         <view class="c-header">
-          <image class="avatar" src="/images/bg1.png"></image>
+          <image class="avatar" src="{{params.imgs}}"></image>
           <view class="name">客服小张</view>
         </view>
-        <image class="code" src="/images/bg1.png"></image>
+        <image class="code" mode="aspectFill" src="{{params.consultImg}}" show-menu-by-longpress></image>
         <view class="tip">
           长按识别二维码
           <view></view>
@@ -192,6 +195,14 @@
       <view class="btn" bind:tap="handleOk">了解更多详情</view>
     </view>
   </view>
+  <view class="popup14" wx:if="{{type==='popup14'}}">
+    <image class="badge" src="{{imageUrl}}icon131.png?t={{Timestamp}}"></image>
+    <view class="popup-container">
+      <view class="title">访问直播活动页需切换至患者端</view>
+      <view class="content">请问是否继续</view>
+      <view class="btn" bind:tap="handleOk">继续</view>
+    </view>
+  </view>
 
   <image
     wx:if="{{params.close}}"
diff --git a/src/components/toast/index.scss b/src/components/toast/index.scss
index 51d2ee6..ce8ca91 100644
--- a/src/components/toast/index.scss
+++ b/src/components/toast/index.scss
@@ -4,6 +4,14 @@
   justify-content: center;
 }
 
+.popup-close {
+  margin: 40rpx auto;
+  display: block;
+  font-size: 80rpx;
+  color: #fff;
+  text-align: center;
+}
+
 .popup {
   position: relative;
   z-index: 9999999999;
@@ -2620,7 +2628,7 @@
         width: 364rpx;
         height: 84rpx;
         font-size: 36rpx;
-        color: #FFFFFF;
+        color: #ffffff;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -2631,3 +2639,109 @@
     }
   }
 }
+
+.popup-medical-guide {
+  .popup-container {
+    .container {
+      padding: 424rpx 0 0;
+      width: 750rpx;
+      height: 800rpx;
+      box-sizing: border-box;
+      .tip {
+        font-size: 40rpx;
+        color: #b982ff;
+        text-align: center;
+      }
+      .btn {
+        margin: 42rpx auto 0;
+        width: 526rpx;
+        height: 88rpx;
+        font-size: 40rpx;
+        color: #ffffff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+        border-radius: 100rpx;
+      }
+    }
+  }
+}
+
+.popup-question-toast {
+  .popup-container {
+    padding: 48rpx 0 68rpx;
+    background: linear-gradient(180deg, #f1e6ff 0%, #ffffff 12.03%, #ffffff 100%);
+    border-radius: 32rpx 32rpx 32rpx 32rpx;
+    border: 2rpx solid #ffffff;
+    width: 670rpx;
+    box-sizing: border-box;
+    .title {
+      font-size: 44rpx;
+      color: #b982ff;
+      line-height: 48rpx;
+      text-align: center;
+    }
+    .scroll {
+      margin-top: 32rpx;
+      padding: 0 50rpx;
+      font-size: 36rpx;
+      color: #211d2e;
+      line-height: 60rpx;
+      height: 716rpx;
+      overflow-y: auto;
+    }
+  }
+}
+
+.popup-enter-info {
+  .badge {
+    position: relative;
+    z-index: 1;
+    display: block;
+    width: 200rpx;
+    height: 224rpx;
+    margin: 0 auto -140rpx;
+    text-align: center;
+  }
+  .popup-container {
+    width: 670rpx;
+    position: relative;
+    box-sizing: border-box;
+    padding: 148rpx 24rpx 56rpx;
+    border-radius: 32rpx;
+    background: linear-gradient(180deg, #f1e6ff 0%, #ffffff 29.75%, #ffffff 100%);
+    text-align: center;
+    .p-close {
+      position: absolute;
+      right: 22rpx;
+      top: 22rpx;
+      font-size: 38rpx;
+      color: #adacb2;
+    }
+    .title {
+      font-size: 40rpx;
+      color: #211d2e;
+      font-weight: bold;
+    }
+    .content {
+      margin-top: 28rpx;
+      font-size: 32rpx;
+      color: #adacb2;
+      line-height: 48rpx;
+      .high {
+        color: #b982ff;
+      }
+    }
+    .btn {
+      margin-top: 32rpx;
+      height: 88rpx;
+      line-height: 88rpx;
+      text-align: center;
+      font-size: 36rpx;
+      color: #ffffff;
+      background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+      border-radius: 100rpx;
+    }
+  }
+}
diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml
index eb7db11..4e82058 100644
--- a/src/components/toast/index.wxml
+++ b/src/components/toast/index.wxml
@@ -790,4 +790,36 @@
       </view>
     </view>
   </view>
+  <view class="popup-medical-guide" wx:if="{{type == 'medical-guide'}}">
+    <view class="popup-container">
+      <view class="container" style="background: url('{{imageUrl}}bg43.png?t={{Timestamp}}') no-repeat top center/100%">
+        <view class="tip">医保政策轻松查询</view>
+        <view class="btn" bind:tap="handleOk">立即查询</view>
+      </view>
+    </view>
+  </view>
+  <view class="popup-question-toast" wx:if="{{type == 'question-toast'}}">
+    <view class="popup-container">
+      <view class="title">生活质量自评</view>
+      <view class="scroll">{{params.content}}</view>
+    </view>
+  </view>
+  <view class="popup-enter-info" wx:if="{{type==='guideEnterInfo'}}">
+    <image class="badge" src="{{imageUrl}}icon131.png?t={{Timestamp}}"></image>
+    <view class="popup-container">
+      <view class="title">访问直播活动页需切换至患者端</view>
+      <view class="content">请问是否继续</view>
+      <view class="btn" bind:tap="handleOk">继续</view>
+    </view>
+  </view>
+  <view class="popup-enter-info" wx:if="{{type==='guideEnterInfoJump'}}">
+    <image class="badge" src="{{imageUrl}}icon131.png?t={{Timestamp}}"></image>
+    <view class="popup-container">
+      <view class="title">访问直播活动页需切换至患者端</view>
+      <view class="content">请问是否继续</view>
+      <view class="btn" bind:tap="handleOk">继续</view>
+    </view>
+  </view>
+
+  <van-icon wx:if="{{params.close}}" class="popup-close" bind:tap="handleCancel" name="close" />
 </van-popup>
diff --git a/src/images/icon64.png b/src/images/icon64.png
index 09cb576..8f2ffc0 100644
Binary files a/src/images/icon64.png and b/src/images/icon64.png differ
diff --git a/src/images/icon65.png b/src/images/icon65.png
index 3dfce2f..d3acdda 100644
Binary files a/src/images/icon65.png and b/src/images/icon65.png differ
diff --git a/src/pages/d_patientDetail/index.scss b/src/pages/d_patientDetail/index.scss
index 233b6c0..03eea70 100644
--- a/src/pages/d_patientDetail/index.scss
+++ b/src/pages/d_patientDetail/index.scss
@@ -7,430 +7,343 @@ page {
   min-height: 100vh;
   padding-bottom: 220rpx;
   .banner {
-    margin: 40rpx 30rpx 0;
-    padding: 0 20rpx;
-    background: linear-gradient(53deg, #ffffff 0%, rgba(255, 255, 255, 0.46) 100%);
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
-    border: 2rpx solid #ffffff;
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
     position: relative;
-    .watermark {
+    margin: 0 30rpx;
+    padding: 32rpx;
+    background: linear-gradient(180deg, #f3e9ff 0%, #ffffff 27.75%, #ffffff 100%);
+    border: 2rpx solid #ffffff;
+    border-radius: 86rpx 24rpx 24rpx 24rpx;
+    &::before {
       position: absolute;
-      top: 80rpx;
-      z-index: 2;
-      font-size: 36rpx;
-      line-height: 58rpx;
-      color: rgba(0, 0, 0, 0.05);
-      transform: rotate(-12deg);
-      text-align: center;
-      .p {
-        white-space: wrap;
-      }
+      top: 24rpx;
+      right: 24rpx;
+      content: '';
+      width: 32rpx;
+      height: 32rpx;
+      border-radius: 50%;
+      background: #eadef9;
     }
-    .banner-container {
-      position: relative;
-      z-index: 3;
-      padding: 120rpx 0 38rpx;
+    .user {
+      display: flex;
+      gap: 24rpx;
       .avatar {
-        position: absolute;
-        left: 50%;
-        top: 0;
-        transform: translate(-50%, -50%);
-        .avatar-img {
-          width: 174rpx;
-          height: 174rpx;
+        position: relative;
+        width: 124rpx;
+        height: 124rpx;
+        .a-img {
+          width: 100%;
+          height: 100%;
           border-radius: 50%;
         }
         .icon {
           position: absolute;
-          bottom: 10rpx;
-          right: 10rpx;
-          width: 40rpx;
-          height: 40rpx;
+          bottom: 0;
+          right: 0;
+          width: 32rpx;
+          height: 32rpx;
         }
       }
-      .w-header {
-        text-align: center;
+      .wrap {
+        flex: 1;
+        padding-top: 14rpx;
         .name {
-          font-size: 48rpx;
-          color: rgba(33, 29, 46, 1);
+          font-size: 40rpx;
+          color: #211d2e;
           font-weight: bold;
+        }
+        .content {
+          margin-top: 12rpx;
+          line-height: 36rpx;
           .age {
-            margin-left: 10rpx;
-            display: inline;
-            color: rgba(173, 172, 178, 1);
-            font-weight: normal;
+            margin-right: 16rpx;
+            padding-right: 16rpx;
+            display: inline-block;
             font-size: 28rpx;
+            color: #211d2e;
+            border-right: 1px solid rgba(173, 172, 178, 0.35);
+          }
+          .tel {
+            margin-right: 20rpx;
+            display: inline-block;
+            font-size: 28rpx;
+            color: #211d2e;
+          }
+          .tel-icon {
+            width: 36rpx;
+            height: 36rpx;
           }
         }
-        .tel {
-          margin-top: 28rpx;
+        .reg-date {
+          margin-top: 20rpx;
           font-size: 28rpx;
-          color: rgba(33, 29, 46, 1);
+          color: #211d2e;
+        }
+        .options {
+          margin-top: 24rpx;
           display: flex;
           align-items: center;
-          justify-content: center;
-          .tel-icon {
-            margin-left: 10rpx;
-            width: 40rpx;
-            height: 40rpx;
+          gap: 18rpx;
+          .o-item {
+            text-align: center;
+            flex: 1;
+            padding: 2rpx 0;
+            font-size: 32rpx;
+            color: #b982ff;
+            line-height: 48rpx;
+            background: #ffffff;
+            border-radius: 48rpx 48rpx 48rpx 48rpx;
+            border: 2rpx solid rgba(185, 130, 255, 0.23);
           }
         }
-        .date {
-          margin-top: 28rpx;
-          font-size: 28rpx;
-          color: rgba(105, 104, 110, 1);
+      }
+    }
+    .b-container {
+      padding: 0 32rpx;
+      margin-top: 48rpx;
+      background: #f6f8f9;
+      border-radius: 24rpx;
+      .row {
+        padding: 32rpx;
+        display: flex;
+        font-size: 32rpx;
+        color: #211d2e;
+        border-bottom: 1px solid rgba(173, 172, 178, 0.1);
+        &:last-of-type {
+          border: none;
         }
-        .send {
-          margin-left: 32rpx;
-          width: 92rpx;
-          height: 32rpx;
-          font-size: 22rpx;
-          color: rgba(103, 186, 202, 1);
-          text-align: center;
-          border: 1px solid #67baca;
-          border-radius: 58rpx 58rpx 58rpx 58rpx;
+        .label {
+          flex-shrink: 0;
+          width: 340rpx;
+        }
+        .c-item:not(:last-of-type)::after {
+          display: inline;
+          content: '，';
         }
       }
-      .user {
-        .wrap {
-          padding-left: 20rpx;
-          .w-tags {
-            margin-top: 28rpx;
-            display: flex;
-            flex-wrap: wrap;
-            align-items: center;
-            gap: 12rpx;
-            .label {
-              width: 164rpx;
-              height: 40rpx;
-            }
-            .tag {
-              padding: 6rpx 16rpx;
-              font-size: 24rpx;
-              line-height: 28rpx;
-              color: rgba(103, 113, 114, 1);
-              background-color: rgba(242, 244, 245, 1);
-              border-radius: 8rpx;
-            }
+    }
+  }
+  .edc-card {
+    margin: 24rpx 30rpx 0;
+    padding: 30rpx 32rpx;
+    display: flex;
+    align-items: center;
+    gap: 24rpx;
+    background-color: #fff;
+    border-radius: 24rpx;
+    .icon {
+      width: 48rpx;
+      height: 48rpx;
+    }
+    .content {
+      font-size: 32rpx;
+      color: rgba(33, 29, 46, 1);
+      font-weight: bold;
+    }
+  }
+  .kkd {
+    margin: 48rpx 30rpx 0;
+    .k-title {
+      display: flex;
+      align-items: center;
+      gap: 12rpx;
+      font-size: 36rpx;
+      color: #211d2e;
+      font-weight: bold;
+      &::before {
+        content: '';
+        width: 8rpx;
+        height: 36rpx;
+        background: #b982ff;
+        border-radius: 2rpx;
+      }
+      .sub {
+        align-self: flex-end;
+        font-size: 32rpx;
+        color: #adacb2;
+        font-weight: normal;
+      }
+    }
+    .k-container {
+      margin-top: 24rpx;
+      display: flex;
+      gap: 30rpx;
+      .k-qol {
+        flex: 1;
+        padding: 32rpx 24rpx 24rpx;
+        background: linear-gradient(
+          180deg,
+          rgba(239, 226, 255, 0.52) 0%,
+          rgba(255, 255, 255, 0.96) 26.03%,
+          #ffffff 100%
+        );
+        border-radius: 32rpx 32rpx 32rpx 32rpx;
+        border: 2rpx solid #ffffff;
+        .title {
+          font-size: 32rpx;
+          color: #211d2e;
+          line-height: 40rpx;
+          font-weight: bold;
+          .k-question {
+            width: 24rpx;
+            height: 24rpx;
           }
         }
-      }
-      .adl {
-        margin-top: 32rpx;
-        background: #ffffff;
-        box-shadow: 0rpx 8rpx 32rpx 0rpx rgba(40, 48, 49, 0.04);
-        border-radius: 24rpx 24rpx 24rpx 24rpx;
-        border: 2rpx solid #f8f9f9;
-        .a-header {
+        .content {
+          margin-top: 18rpx;
           display: flex;
-          align-items: flex-start;
-          flex-direction: column;
-          .content {
-            position: relative;
-            .sub-content1 {
-              position: relative;
-              z-index: 1;
-              border-radius: 24rpx 0 24rpx 0;
-              padding: 14rpx 28rpx;
-              font-size: 28rpx;
-              color: rgba(98, 190, 208, 1);
-              background-color: rgba(242, 248, 249, 1);
-            }
-            .sub-content2 {
-              position: absolute;
-              right: 20rpx;
-              top: 0;
-              transform: translateX(100%);
-              border-radius: 0 0 24rpx 0;
-              padding: 14rpx 28rpx 14rpx 40rpx;
+          align-self: baseline;
+          justify-content: space-between;
+          .num {
+            white-space: nowrap;
+            font-size: 64rpx;
+            color: #ffa300;
+            font-weight: bold;
+            .sub {
+              margin-left: -10rpx;
               font-size: 28rpx;
-              color: #e59a29;
-              background-color: #fff5df;
+              color: #69686e;
+              font-weight: normal;
             }
           }
-          .box {
-            width: 40rpx;
-            height: 40rpx;
-            background-color: rgba(242, 248, 249, 1);
+          .icon {
+            width: 92rpx;
+            height: 92rpx;
           }
         }
-        .a-content {
-          position: relative;
-          z-index: 1;
-          margin-top: -40rpx;
-          padding: 32rpx 30rpx;
-          background-color: #fff;
-          border-radius: 24rpx;
-          .row {
+        .row {
+          margin-top: 24rpx;
+          padding: 16rpx 24rpx;
+          background-color: #f6f8f9;
+          border-radius: 16rpx;
+          .col {
             display: flex;
             align-items: center;
-            gap: 20rpx;
-            &:first-of-type {
-              margin-bottom: 24rpx;
-            }
+            gap: 10rpx;
+            line-height: 48rpx;
             .label {
-              flex-shrink: 0;
               font-size: 28rpx;
-              color: rgba(154, 161, 162, 1);
-              width: 6em;
+              color: #211d2e;
             }
             .num {
-              min-width: 3em;
               font-size: 28rpx;
-              color: rgba(40, 48, 49, 1);
-            }
-            .tag {
-              display: flex;
-              align-items: center;
-              background-color: rgba(232, 245, 248, 1);
-              border-radius: 12rpx;
-              .t-label {
-                padding: 8rpx 12rpx;
-                font-size: 24rpx;
-                color: rgba(255, 255, 255, 1);
-                background-color: rgba(103, 186, 202, 1);
-                border-radius: 12rpx;
-                display: flex;
-                align-items: center;
-                gap: 8rpx;
-                flex-shrink: 0;
-                .icon {
-                  width: 24rpx;
-                  height: 24rpx;
-                }
-              }
-              .t-content {
-                padding: 0 16rpx 0 8rpx;
-                display: flex;
-                align-items: center;
-                font-size: 28rpx;
-                color: rgba(103, 186, 202, 1);
-                display: flex;
-                align-items: center;
-                gap: 4rpx;
-                flex-shrink: 0;
-                .icon {
-                  width: 24rpx;
-                  height: 28rpx;
-                }
-              }
-              &.tag-warn {
-                background-color: rgba(227, 220, 64, 0.1);
-                .t-label {
-                  background-color: rgba(225, 217, 45, 1);
-                }
-                .t-content {
-                  color: rgba(225, 217, 45, 1);
-                }
-              }
-              &.tag-error {
-                background-color: rgba(248, 234, 234, 1);
-                .t-label {
-                  background-color: rgba(215, 108, 108, 1);
-                }
-                .t-content {
-                  color: rgba(215, 108, 108, 1);
-                }
-              }
+              color: #1ec580;
             }
           }
-          .d-row {
-            margin-top: 22rpx;
-            display: flex;
-            gap: 20rpx;
-            .label {
-              flex-shrink: 0;
-              width: 6em;
-              font-size: 28rpx;
-              color: rgba(154, 161, 162, 1);
-            }
-            .content {
-              min-width: 3em;
-              font-size: 28rpx;
-              color: rgba(40, 48, 49, 1);
-            }
+        }
+        .k-footer {
+          margin-top: 34rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .date {
+            font-size: 32rpx;
+            color: #69686e;
+          }
+          .add {
+            flex-shrink: 0;
+            width: 76rpx;
+            height: 76rpx;
           }
         }
+        .none {
+          margin: 80rpx -32rpx 0;
+          width: 318rpx;
+          height: 170rpx;
+          display: block;
+        }
       }
-      .info-card {
+      .k-hormones {
         position: relative;
-        margin-top: 16rpx;
-        padding: 32rpx 30rpx;
-        border-radius: 24rpx;
-        box-shadow: 0rpx 8rpx 32rpx 0rpx rgba(40, 48, 49, 0.04);
-        border: 2rpx solid #f8f9f9;
-        background-color: #fff;
-        display: grid;
-        gap: 32rpx 22rpx;
-        grid-template-columns: repeat(auto-fit, minmax(40%, 1fr));
-        .ic-item {
+        flex: 1;
+        padding: 32rpx 24rpx 24rpx;
+        background: linear-gradient(
+          180deg,
+          rgba(239, 226, 255, 0.52) 0%,
+          rgba(255, 255, 255, 0.96) 26.03%,
+          #ffffff 100%
+        );
+        border-radius: 32rpx 32rpx 32rpx 32rpx;
+        border: 2rpx solid #ffffff;
+        .title {
+          position: relative;
+          z-index: 1;
+          font-size: 32rpx;
+          color: #211d2e;
+          line-height: 40rpx;
+          font-weight: bold;
+        }
+        .content {
+          margin-top: 18rpx;
           display: flex;
-          .label {
-            font-size: 28rpx;
-            color: #9aa1a2;
+          align-self: baseline;
+          justify-content: space-between;
+          .num {
             white-space: nowrap;
+            font-size: 64rpx;
+            color: #b982ff;
+            font-weight: bold;
+            .sub {
+              font-size: 28rpx;
+              color: #69686e;
+              font-weight: normal;
+            }
           }
-          .content {
+        }
+        .row {
+          margin-top: 24rpx;
+          padding: 16rpx 24rpx;
+          background-color: #f6f8f9;
+          border-radius: 16rpx;
+          line-height: 48rpx;
+          .col1 {
             font-size: 28rpx;
-            color: #283031;
-            white-space: nowrap;
+            color: #211d2e;
           }
-        }
-        .edit {
-          position: absolute;
-          bottom: 0;
-          right: 0;
-          padding: 6rpx 18rpx;
-          display: flex;
-          align-items: center;
-          font-size: 28rpx;
-          color: #fff;
-          border-radius: 32rpx 0 24rpx 0;
-          background-color: #67baca;
-          .icon {
-            width: 32rpx;
-            height: 32rpx;
+          .col2 {
+            font-size: 28rpx;
+            color: #b982ff;
           }
         }
-      }
-      .b-footer {
-        margin: 32rpx auto 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        .send {
-          margin: 0 42rpx;
-          width: 200rpx;
-          height: 60rpx;
-          font-size: 32rpx;
-          color: rgba(98, 190, 208, 1);
+        .k-footer {
+          margin-top: 34rpx;
           display: flex;
           align-items: center;
-          justify-content: center;
-          background: #ffffff;
-          border-radius: 64rpx 64rpx 64rpx 64rpx;
-          border: 2rpx solid #62bed0;
+          justify-content: space-between;
+          .date {
+            font-size: 32rpx;
+            color: #69686e;
+          }
+          .add {
+            flex-shrink: 0;
+            width: 76rpx;
+            height: 76rpx;
+          }
         }
-        .remark {
-          width: 200rpx;
-          height: 60rpx;
-          font-size: 32rpx;
-          color: rgba(98, 190, 208, 1);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background: #ffffff;
-          border-radius: 64rpx 64rpx 64rpx 64rpx;
-          border: 2rpx solid #62bed0;
+        .none {
+          margin: 80rpx -32rpx 0;
+          width: 318rpx;
+          height: 170rpx;
+          display: block;
         }
       }
     }
   }
-  .info-card {
-    margin: 24rpx 30rpx 0;
-    padding: 0 32rpx;
-    background: linear-gradient(53deg, #ffffff 0%, rgba(255, 255, 255, 0.87) 100%);
-    border-radius: 24rpx 24rpx 24rpx 24rpx;
-    border: 2rpx solid #ffffff;
-    .row {
-      padding: 32rpx;
-      display: flex;
-      align-items: center;
-      border-bottom: 1px solid rgba(173, 172, 178, 0.1);
-      &:last-of-type {
-        border: none;
-      }
-      .label {
-        width: 11em;
-        font-size: 32rpx;
-        color: rgba(173, 172, 178, 1);
-      }
-      .content {
-        font-size: 32rpx;
-        color: rgba(33, 29, 46, 1);
-        white-space: pre-line;
-      }
-    }
-  }
-  .edc-card {
-    margin: 24rpx 30rpx 0;
-    padding: 30rpx 32rpx;
-    display: flex;
-    align-items: center;
-    gap: 24rpx;
-    background-color: #fff;
-    border-radius: 24rpx;
-    .icon {
-      width: 48rpx;
-      height: 48rpx;
-    }
-    .content {
-      font-size: 32rpx;
-      color: rgba(33, 29, 46, 1);
-      font-weight: bold;
-    }
-  }
-  .footer {
-    margin: 60rpx 30rpx 0;
-    display: flex;
-    align-items: center;
-    gap: 26rpx;
-    .btn {
-      flex: 1;
-      height: 88rpx;
-      background: #ffffff;
-      font-size: 32rpx;
-      color: rgba(185, 130, 255, 1);
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 48rpx 48rpx 48rpx 48rpx;
-      border: 2rpx solid #b982ff;
-    }
-  }
   .chart-list {
-    padding: 48rpx 40rpx 0;
+    padding: 48rpx 30rpx 0;
     .chart-title {
+      margin-bottom: 32rpx;
       font-size: 36rpx;
       color: #211d2e;
       font-weight: bold;
-    }
-    .chart-filter {
-      margin-bottom: 24rpx;
-      position: relative;
-      z-index: 3;
-      margin-top: 32rpx;
       display: flex;
-      gap: 16rpx;
       align-items: center;
-      border-radius: 80rpx 80rpx 80rpx 80rpx;
-      .type {
-        padding: 10rpx 32rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 32rpx;
-        color: #69686e;
-        background-color: #ffffff;
-        border-radius: 34rpx;
-        .icon {
-          width: 24rpx;
-          height: 24rpx;
-        }
-      }
-      .range {
-        padding: 10rpx 32rpx;
-        display: flex;
-        align-items: center;
-        font-size: 32rpx;
-        color: #69686e;
-        border-radius: 34rpx;
-        background-color: #ffffff;
-        .icon {
-          width: 24rpx;
-          height: 24rpx;
-        }
+      &::before {
+        content: '';
+        margin-right: 12rpx;
+        width: 8rpx;
+        height: 36rpx;
+        background: #b982ff;
+        border-radius: 2rpx 2rpx 2rpx 2rpx;
       }
     }
     .chart-card {
@@ -443,6 +356,60 @@ page {
           padding-top: 40rpx;
         }
       }
+      .chart-card-title {
+        margin-bottom: 24rpx;
+        margin-left: -32rpx;
+        font-size: 36rpx;
+        color: #211d2e;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        &::before {
+          content: '';
+          margin-right: 12rpx;
+          width: 8rpx;
+          height: 36rpx;
+          background: rgba(185, 130, 255, 0.45);
+          border-radius: 2rpx 2rpx 2rpx 2rpx;
+        }
+      }
+      .chart-filter {
+        margin-bottom: 48rpx;
+        position: relative;
+        z-index: 3;
+        margin-top: 32rpx;
+        display: flex;
+        gap: 16rpx;
+        align-items: center;
+        border-radius: 80rpx 80rpx 80rpx 80rpx;
+        .type {
+          padding: 10rpx 32rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 32rpx;
+          color: #69686e;
+          background-color: #f6f8f9;
+          border-radius: 34rpx;
+          .icon {
+            width: 24rpx;
+            height: 24rpx;
+          }
+        }
+        .range {
+          padding: 10rpx 32rpx;
+          display: flex;
+          align-items: center;
+          font-size: 32rpx;
+          color: #69686e;
+          border-radius: 34rpx;
+          background-color: #f6f8f9;
+          .icon {
+            width: 24rpx;
+            height: 24rpx;
+          }
+        }
+      }
       .title {
         font-size: 32rpx;
         color: #211d2e;
@@ -487,15 +454,31 @@ page {
   padding: 20rpx 40rpx calc(env(safe-area-inset-bottom) + 20rpx);
   box-sizing: border-box;
   background-color: #fff;
-  .pf-btn {
+  display: flex;
+  align-items: center;
+  gap: 26rpx;
+  .btn1 {
+    flex: 1;
+    font-size: 32rpx;
+    color: #b982ff;
+    border: 1px solid #b982ff;
     height: 88rpx;
+    box-sizing: border-box;
     display: flex;
     align-items: center;
     justify-content: center;
+    border-radius: 48rpx 48rpx 48rpx 48rpx;
+  }
+  .btn2 {
+    flex: 1;
+    height: 88rpx;
     font-size: 32rpx;
-    color: #ffffff;
-    background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
-    border-radius: 100rpx 100rpx 100rpx 100rpx;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+    border-radius: 48rpx 48rpx 48rpx 48rpx;
   }
 }
 
diff --git a/src/pages/d_patientDetail/index.ts b/src/pages/d_patientDetail/index.ts
index 9e65e33..3f750be 100644
--- a/src/pages/d_patientDetail/index.ts
+++ b/src/pages/d_patientDetail/index.ts
@@ -9,6 +9,8 @@ Page({
 
     doctor: {},
     hospital: {},
+    qolDetail: {},
+    hormoneDetail: {},
 
     id: '',
     remark: '',
@@ -17,7 +19,6 @@ Page({
       lazyLoad: true,
     },
     fields: {
-      1: 'day',
       2: 'month',
       3: 'year',
     },
@@ -26,10 +27,6 @@ Page({
     EndDate: '',
     typeRange: [
       {
-        id: '1',
-        value: '按天',
-      },
-      {
         id: '2',
         value: '按月',
       },
@@ -38,8 +35,15 @@ Page({
         value: '按年',
       },
     ],
-    type: '3',
-    typeName: '按年',
+    type: '2',
+    typeName: '按月',
+
+    // 激素图表的独立日期范围选择器
+    hormoneStartDate: '',
+    hormoneEndDate: '',
+    hormoneType: '2',
+    hormoneTypeName: '按月',
+
     userInfo: {},
 
     popupRemarkShow: false,
@@ -183,11 +187,17 @@ Page({
     this.setData({
       id: option.id,
     })
+    if (option.anchor) {
+      this.handleAnchor(option.anchor)
+    }
 
     app.waitLogin({ type: [2] }).then(async (_res) => {
       app.mpBehavior({ doctor: true, PageName: 'PG_DoctorPatientDetail' })
       this.getDoctorDetail()
       this.handleTypeChange()
+      this.handleHormoneTypeChange()
+      this.getQolDetail()
+      this.getHormoneDetail()
       await this.getDetail()
       app.getUserInfo(2).then((userInfo) => {
         this.setData({
@@ -196,6 +206,46 @@ Page({
       })
     })
   },
+  handleAnchor(anchor) {
+    if (anchor == 'qol') {
+      wx.pageScrollTo({ scrollTop: 700 })
+    }
+    if (anchor == 'hormone') {
+      wx.pageScrollTo({ scrollTop: 1550 })
+    }
+  },
+  getQolDetail() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/doctor/qol/get-last-record',
+      data: {
+        patientId: this.data.id,
+      },
+    }).then((res) => {
+      this.setData({
+        qolDetail: {
+          ...res,
+          CreateTime: dayjs(res.CreateTime).format('YYYY-MM-DD'),
+        },
+      })
+    })
+  },
+  getHormoneDetail() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/doctor/hormone-dosage/get-last-record',
+      data: {
+        patientId: this.data.id,
+      },
+    }).then((res) => {
+      this.setData({
+        hormoneDetail: {
+          ...res,
+          createTime: dayjs(res.createTime).format('YYYY-MM-DD'),
+        },
+      })
+    })
+  },
   getDoctorDetail() {
     wx.ajax({
       method: 'GET',
@@ -236,6 +286,8 @@ Page({
   },
   handleChange() {
     this.getGraph()
+  },
+  handleHormoneChange() {
     this.getHormoneData()
   },
   handleTypeChange(e = '') {
@@ -248,11 +300,7 @@ Page({
     const typeName = typeRange[index].value
     let EndDate = ''
     let StartDate = ''
-    if (type === '1') {
-      EndDate = dayjs().format('YYYY-MM-DD')
-      StartDate = dayjs().subtract(6, 'd').format('YYYY-MM-DD')
-    }
-    else if (type === '2') {
+    if (type === '2') {
       EndDate = dayjs().format('YYYY-MM')
       StartDate = dayjs().subtract(1, 'M').format('YYYY-MM')
     }
@@ -267,6 +315,31 @@ Page({
       StartDate,
     })
     this.getGraph()
+  },
+  handleHormoneTypeChange(e = '') {
+    let index = 0
+    if (e) {
+      index = (e as any).detail.value
+    }
+    const { typeRange } = this.data
+    const hormoneType = typeRange[index].id
+    const hormoneTypeName = typeRange[index].value
+    let hormoneEndDate = ''
+    let hormoneStartDate = ''
+    if (hormoneType === '2') {
+      hormoneEndDate = dayjs().format('YYYY-MM')
+      hormoneStartDate = dayjs().subtract(1, 'M').format('YYYY-MM')
+    }
+    else if (hormoneType === '3') {
+      hormoneEndDate = dayjs().format('YYYY')
+      hormoneStartDate = dayjs().subtract(1, 'y').format('YYYY')
+    }
+    this.setData({
+      hormoneType,
+      hormoneTypeName,
+      hormoneEndDate,
+      hormoneStartDate,
+    })
     this.getHormoneData()
   },
   getGraph() {
@@ -306,14 +379,14 @@ Page({
     })
   },
   getHormoneData() {
-    const { type, StartDate, EndDate } = this.data
+    const { hormoneType, hormoneStartDate, hormoneEndDate } = this.data
     wx.ajax({
       method: 'GET',
       url: '?r=xd/doctor/hormone-dosage/graph',
       data: {
-        DateType: type,
-        StartDate,
-        EndDate,
+        DateType: hormoneType,
+        StartDate: hormoneStartDate,
+        EndDate: hormoneEndDate,
         PatientId: this.data.id,
         count: 0,
       },
@@ -806,4 +879,9 @@ Page({
       url: `/pages/d_patientHormones/index?id=${this.data.detail.PatientId}&name=${this.data.detail.Name}`,
     })
   },
+  hadnleQolDetail() {
+    wx.navigateTo({
+      url: `/pages/d_qolDetail/index?id=${this.data.detail.PatientId}`,
+    })
+  },
 })
diff --git a/src/pages/d_patientDetail/index.wxml b/src/pages/d_patientDetail/index.wxml
index 425e1c0..de94919 100644
--- a/src/pages/d_patientDetail/index.wxml
+++ b/src/pages/d_patientDetail/index.wxml
@@ -4,51 +4,59 @@
 
 <view
   class="page"
-  style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop+70}}px;"
+  style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop+20}}px;"
 >
   <view class="banner">
-    <view class="watermark">
-      <view class="p">本页面内容涉及患者个人信息</view>
-      <view class="p">仅用于{{hospital.Name}}{{doctor.Name}}医生进行患者随访管理</view>
-      <view class="p">不可用于其他用途</view>
-    </view>
-    <view class="banner-container">
+    <view class="user">
       <view class="avatar">
-        <image class="avatar-img" src="{{detail.UserImg}}"></image>
+        <image class="a-img" src="{{detail.UserImg}}"></image>
         <image wx:if="{{detail.Gender==='1'}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
         <image wx:if="{{detail.Gender==='2'}}" class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
       </view>
-      <view class="w-header">
-        <view class="name">
-          {{showTel ? detail.Name : detail.hideName}}
+      <view class="wrap">
+        <view class="name">{{showTel ? detail.Name : detail.hideName}}</view>
+        <view class="content">
           <view class="age">{{detail.AgeRangeName}}</view>
+          <view class="tel" bind:tap="handleToggleTel">{{showTel ? detail.Telephone : '***********'}}</view>
+          <image
+            bind:tap="handleToggleTel"
+            wx:if="{{showTel}}"
+            class="tel-icon"
+            src="{{imageUrl}}icon63.png?t={{Timestamp}}"
+          ></image>
+          <image
+            bind:tap="handleToggleTel"
+            wx:else
+            class="tel-icon"
+            src="{{imageUrl}}icon62.png?t={{Timestamp}}"
+          ></image>
         </view>
-        <view class="tel" bind:tap="handleToggleTel">
-          {{showTel ? detail.Telephone : '***********'}}
-          <image wx:if="{{showTel}}" class="tel-icon" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
-          <image wx:else class="tel-icon" src="{{imageUrl}}icon62.png?t={{Timestamp}}"></image>
+        <view class="reg-date">注册时间:{{detail.BecomePatientTime}}</view>
+        <view class="options">
+          <view class="o-item" bind:tap="handleRemark">备注</view>
+          <view class="o-item" bind:tap="handleSend">发消息</view>
         </view>
-        <view class="date">注册时间:{{detail.BecomePatientTime}}</view>
       </view>
     </view>
-  </view>
-
-  <view class="info-card">
-    <view class="row">
-      <view class="label">Graves病病史</view>
-      <view class="content">{{detail.IsGravesName}}</view>
-    </view>
-    <view class="row">
-      <view class="label">
-        TED（甲状腺眼突）
-        <view></view>
-        及其相关眼部手术史
+    <view class="b-container">
+      <view class="row">
+        <view class="label">Graves病病史</view>
+        <view class="col">{{detail.IsGravesName}}</view>
+      </view>
+      <view class="row">
+        <view class="label">TED相关眼部手术史</view>
+        <view class="col">{{detail.HasTedSurgeryName}}</view>
+      </view>
+      <view class="row" wx:if="{{detail.tituyoList.length}}">
+        <view class="label">替妥尤单抗使用情况</view>
+        <view class="col">
+          <text class="c-item" wx:for="{{detail.tituyoList}}" wx:key="index">{{item.tituyoName}}</text>
+        </view>
+      </view>
+      <view class="row" wx:if="{{detail.DoctorRemark}}">
+        <view class="label">备注</view>
+        <view class="col">{{detail.DoctorRemark}}</view>
       </view>
-      <view class="content">{{detail.HasTedSurgeryName}}</view>
-    </view>
-    <view class="row" wx:if="{{detail.DoctorRemark}}">
-      <view class="label">备注</view>
-      <view class="content">{{detail.DoctorRemark}}</view>
     </view>
   </view>
   <view class="edc-card" bind:tap="handleEDC" wx:if="{{userInfo.IsEDC==='1'}}">
@@ -56,62 +64,156 @@
     <image wx:else class="icon" src="{{imageUrl}}icon66.png?t={{Timestamp}}"></image>
     <view class="content">标识为EDC患者</view>
   </view>
-  <view class="footer">
-    <view class="btn" bind:tap="handleSend">发消息</view>
-    <view class="btn" bind:tap="handleRemark">备注</view>
+  <view class="kkd">
+    <view class="k-title">
+      患者健康图表
+      <view class="sub">最近数值</view>
+    </view>
+    <view class="k-container">
+      <view class="k-qol" bind:tap="hadnleQolDetail">
+        <view class="title">生活质量自评</view>
+        <block wx:if="{{qolDetail.TotalScore}}">
+          <view class="content">
+            <view class="num">
+              {{qolDetail.TotalScore}}
+              <text class="sub">分</text>
+            </view>
+            <image
+              wx:if="{{qolDetail.TotalScore>=80}}"
+              class="icon"
+              src="{{imageUrl}}icon123.png?t={{Timestamp}}"
+            ></image>
+            <image
+              wx:elif="{{qolDetail.TotalScore>=40}}"
+              class="icon"
+              src="{{imageUrl}}icon121.png?t={{Timestamp}}"
+            ></image>
+            <image wx:else class="icon" src="{{imageUrl}}icon122.png?t={{Timestamp}}"></image>
+          </view>
+          <view class="row">
+            <view class="col">
+              <view class="label">视觉功能</view>
+              <view class="num">{{qolDetail.VisionScore}}分</view>
+            </view>
+            <view class="col">
+              <view class="label">外观影响</view>
+              <view class="num">{{qolDetail.AppearanceScore}}分</view>
+            </view>
+          </view>
+          <view class="k-footer">
+            <view class="date">{{qolDetail.CreateTime}}</view>
+          </view>
+        </block>
+        <image class="none" wx:else src="{{imageUrl}}bg44.png?t={{Timestamp}}"></image>
+      </view>
+      <view class="k-hormones" bind:tap="handleHormones">
+        <view class="title">激素记录</view>
+        <block wx:if="{{hormoneDetail.dosage}}">
+          <view class="content">
+            <view class="num">
+              {{hormoneDetail.dosage}}
+              <text class="sub">mg/周</text>
+            </view>
+          </view>
+          <view class="row">
+            <view class="col1">最近一周用药方式</view>
+            <view class="col2" wx:if="{{hormoneDetail.medicationMethod==1}}">口服</view>
+            <view class="col2" wx:elif="{{hormoneDetail.medicationMethod==2}}">冲击治疗</view>
+            <view class="col2" wx:elif="{{hormoneDetail.medicationMethod==3}}">局部注射</view>
+          </view>
+          <view class="k-footer">
+            <view class="date">{{hormoneDetail.createTime}}</view>
+          </view>
+        </block>
+        <image class="none" wx:else src="{{imageUrl}}bg45.png?t={{Timestamp}}"></image>
+      </view>
+    </view>
   </view>
   <view class="chart-list">
-    <view class="chart-title">GO-QOL生活质量评估报告</view>
-    <view class="chart-filter">
-      <picker class="type" mode="selector" range="{{typeRange}}" range-key="value" bind:change="handleTypeChange">
-        {{typeName}}
-        <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
-      </picker>
-      <view class="range">
-        <picker
-          mode="date"
-          end="{{EndDate}}"
-          fields="{{fields[type]}}"
-          mode="date"
-          model:value="{{StartDate}}"
-          bindchange="handleChange"
-        >
-          {{StartDate}}
-        </picker>
-        ~
-        <picker
-          mode="date"
-          start="{{StartDate}}"
-          fields="{{fields[type]}}"
-          mode="date"
-          model:value="{{EndDate}}"
-          bindchange="handleChange"
-        >
-          {{EndDate}}
+    <view class="chart-title">指标趋势</view>
+    <view class="chart-card">
+      <view class="chart-card-title">生活质量评分</view>
+      <view class="chart-filter">
+        <picker class="type" mode="selector" range="{{typeRange}}" range-key="value" bind:change="handleTypeChange">
+          {{typeName}}
+          <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
         </picker>
-        <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
+        <view class="range">
+          <picker
+            mode="date"
+            end="{{EndDate}}"
+            fields="{{fields[type]}}"
+            mode="date"
+            model:value="{{StartDate}}"
+            bindchange="handleChange"
+          >
+            {{StartDate}}
+          </picker>
+          ~
+          <picker
+            mode="date"
+            start="{{StartDate}}"
+            fields="{{fields[type]}}"
+            mode="date"
+            model:value="{{EndDate}}"
+            bindchange="handleChange"
+          >
+            {{EndDate}}
+          </picker>
+          <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
+        </view>
       </view>
-    </view>
-    <view class="chart-card">
       <view class="title">GO-QOL整体记录曲线</view>
       <view class="chart">
         <ec-canvas id="chart1" ec="{{ ec }}"></ec-canvas>
       </view>
-    </view>
-    <view class="chart-card">
       <view class="title">GO-QOL视觉功能影响记录曲线</view>
       <view class="chart">
         <ec-canvas id="chart2" ec="{{ ec }}"></ec-canvas>
       </view>
-    </view>
-    <view class="chart-card">
       <view class="title">GO-QOL外观影响记录曲线</view>
       <view class="chart">
         <ec-canvas id="chart3" ec="{{ ec }}"></ec-canvas>
       </view>
     </view>
     <view class="chart-card chart-card-legend" wx:if="{{list4Show || list5Show || list6Show}}">
-      <view class="title">我的激素周用量记录曲线</view>
+      <view class="chart-card-title">激素周用量记录曲线</view>
+      <view class="chart-filter">
+        <picker
+          class="type"
+          mode="selector"
+          range="{{typeRange}}"
+          range-key="value"
+          bind:change="handleHormoneTypeChange"
+        >
+          {{hormoneTypeName}}
+          <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
+        </picker>
+        <view class="range">
+          <picker
+            mode="date"
+            end="{{hormoneEndDate}}"
+            fields="{{fields[hormoneType]}}"
+            mode="date"
+            model:value="{{hormoneStartDate}}"
+            bindchange="handleHormoneChange"
+          >
+            {{hormoneStartDate}}
+          </picker>
+          ~
+          <picker
+            mode="date"
+            start="{{hormoneStartDate}}"
+            fields="{{fields[hormoneType]}}"
+            mode="date"
+            model:value="{{hormoneEndDate}}"
+            bindchange="handleHormoneChange"
+          >
+            {{hormoneEndDate}}
+          </picker>
+          <image class="icon" src="{{imageUrl}}za-images/doctor/triangle-down.png?t={{Timestamp}}"></image>
+        </view>
+      </view>
       <view class="chart" wx:if="{{list4Show}}">
         <view class="legend">
           <view class="dot dot4"></view>
@@ -136,8 +238,9 @@
     </view>
   </view>
 </view>
-<view class="page-footer" wx:if="{{detail.Name}}">
-  <view class="pf-btn" bind:tap="handleHormones">查看激素用药详情</view>
+<view class="page-footer">
+  <view class="btn1" bind:tap="handleRemark">备注</view>
+  <view class="btn2" bind:tap="handleSend">发消息</view>
 </view>
 
 <van-popup
diff --git a/src/pages/d_patientHormones/index.scss b/src/pages/d_patientHormones/index.scss
index e8d6c68..b44a98c 100644
--- a/src/pages/d_patientHormones/index.scss
+++ b/src/pages/d_patientHormones/index.scss
@@ -2,6 +2,7 @@ page {
   background-color: #f6f8f9;
 }
 .page {
+  padding-bottom: 220rpx;
   .list {
     margin: 28rpx 40rpx 0;
     .list-title {
@@ -57,7 +58,7 @@ page {
           .r-card-hormones {
             margin-top: 16rpx;
             padding: 26rpx 32rpx;
-            background: linear-gradient( 11deg, #FFFFFF 0%, #FFFFFF 49%, #F6EFFF 100%);
+            background: linear-gradient(11deg, #ffffff 0%, #ffffff 49%, #f6efff 100%);
             border-radius: 24rpx 24rpx 24rpx 24rpx;
             border: 2rpx solid #ffffff;
             .rch-row {
@@ -103,4 +104,24 @@ page {
       }
     }
   }
+  .page-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 10;
+    width: 100%;
+    padding: 20rpx 40rpx calc(env(safe-area-inset-bottom) + 20rpx);
+    box-sizing: border-box;
+    background-color: #fff;
+    .pf-btn {
+      height: 88rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32rpx;
+      color: #ffffff;
+      background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
+      border-radius: 100rpx 100rpx 100rpx 100rpx;
+    }
+  }
 }
diff --git a/src/pages/d_patientHormones/index.ts b/src/pages/d_patientHormones/index.ts
index b024db1..1e231df 100644
--- a/src/pages/d_patientHormones/index.ts
+++ b/src/pages/d_patientHormones/index.ts
@@ -46,6 +46,11 @@ Page({
       this.getList(page + 1)
     }
   },
+  handleBackScroll() {
+    wx.redirectTo({
+      url: `/pages/d_patientDetail/index?id=${this.data.id}&anchor=hormone`,
+    })
+  },
 })
 
 export {}
diff --git a/src/pages/d_patientHormones/index.wxml b/src/pages/d_patientHormones/index.wxml
index b033389..4c69912 100644
--- a/src/pages/d_patientHormones/index.wxml
+++ b/src/pages/d_patientHormones/index.wxml
@@ -49,4 +49,7 @@
       <pagination pagination="{{pagination}}"></pagination>
     </view>
   </view>
+  <view class="page-footer">
+    <view class="pf-btn" bind:tap="handleBackScroll">查看生活质量评分趋势</view>
+  </view>
 </view>
diff --git a/src/pages/d_qolDetail/index.json b/src/pages/d_qolDetail/index.json
new file mode 100644
index 0000000..c57524e
--- /dev/null
+++ b/src/pages/d_qolDetail/index.json
@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "生活质量评测详情",
+  "navigationStyle": "default",
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  }
+}
diff --git a/src/pages/d_qolDetail/index.scss b/src/pages/d_qolDetail/index.scss
new file mode 100644
index 0000000..3afe864
--- /dev/null
+++ b/src/pages/d_qolDetail/index.scss
@@ -0,0 +1,250 @@
+page {
+  background-color: #f6f8f9;
+}
+
+.page1 {
+  padding: 16rpx 30rpx 240rpx;
+  .tabs {
+    padding: 12rpx;
+    background-color: #fff;
+    border-radius: 58rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .tab-item {
+      flex: 1;
+      font-size: 28rpx;
+      color: #211d2e;
+      border-radius: 98rpx;
+      line-height: 64rpx;
+      text-align: center;
+      &.active {
+        color: #fff;
+        background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+      }
+    }
+  }
+  .container {
+    padding: 32rpx 0 0;
+    .title {
+      font-size: 32rpx;
+      color: #211d2e;
+    }
+    .table {
+      margin: 24rpx 0 0;
+      border-radius: 12rpx;
+      overflow: hidden;
+      .thead {
+        display: grid;
+        grid-template-columns: auto 240rpx 240rpx;
+        background-color: #f7f0ff;
+        text-align: center;
+        border-radius: 12rpx 12rpx 0 0;
+        .item {
+          padding: 20rpx;
+          border-right: 1px solid #eee4ff;
+          font-size: 28rpx;
+          color: #b982ff;
+          line-height: 36rpx;
+          &:last-of-type {
+            border: none;
+          }
+        }
+      }
+      .tbody {
+        .tr {
+          display: grid;
+          grid-template-columns: auto 240rpx 240rpx;
+          background-color: #ffffff;
+          text-align: center;
+          border-radius: 12rpx 12rpx 0 0;
+          border-bottom: 1px solid #eee4ff;
+          &:last-of-type {
+            border: none;
+          }
+          .td {
+            padding: 20rpx;
+            border-right: 1px solid #eee4ff;
+            font-size: 28rpx;
+            color: #211d2e;
+            line-height: 36rpx;
+            &:last-of-type {
+              border: none;
+            }
+          }
+        }
+      }
+    }
+    .table-none {
+      display: block;
+      margin: 30rpx auto;
+      width: 80%;
+    }
+  }
+}
+
+.page2 {
+  padding: 16rpx 30rpx 240rpx;
+  .title {
+    font-size: 32rpx;
+    color: #000;
+    margin-bottom: 24rpx;
+  }
+  .scroll {
+    position: relative;
+    overflow-x: auto;
+    display: flex;
+    flex-wrap: nowrap;
+    border-radius: 12rpx;
+    .table1 {
+      flex-shrink: 0;
+      position: sticky;
+      left: 0;
+      top: 0;
+      .thead {
+        display: grid;
+        grid-template-columns: 70rpx 220rpx;
+        text-align: center;
+        height: 160rpx;
+        .taside {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 30rpx;
+          color: #b982ff;
+          writing-mode: vertical-lr;
+          background-color: #f7f0ff;
+          border-right: 1px solid #eee4ff;
+        }
+        .tcontainer {
+          background-color: #f7f0ff;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 20rpx;
+          border-right: 1px solid transparent;
+          font-size: 28rpx;
+          color: #b982ff;
+          line-height: 36rpx;
+        }
+      }
+      .tbody {
+        display: grid;
+        grid-template-columns: 70rpx 220rpx;
+        .taside {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 30rpx;
+          color: #211d2e;
+          writing-mode: vertical-lr;
+          background-color: #fff;
+          border-right: 1px solid #eee4ff;
+        }
+        .tcontainer {
+          .tr {
+            background-color: #ffffff;
+            text-align: center;
+            border-bottom: 1px solid #eee4ff;
+            &:last-of-type {
+              border: none;
+            }
+            .td {
+              height: 100rpx;
+              box-sizing: border-box;
+              padding: 22rpx;
+              border-right: 1px solid #eee4ff;
+              font-size: 30rpx;
+              color: #211d2e;
+              line-height: 40rpx;
+              display: flex;
+              align-items: center;
+              text-align: left;
+              &:last-of-type {
+                border: none;
+              }
+            }
+            .mtd {
+              height: 300rpx;
+              overflow: hidden;
+            }
+          }
+        }
+      }
+    }
+    .table2 {
+      flex-shrink: 0;
+      .thead {
+        background-color: #f7f0ff;
+        text-align: center;
+        border-radius: 12rpx 12rpx 0 0;
+        height: 160rpx;
+        .col {
+          text-align: center;
+          width: 200rpx;
+          padding: 22rpx;
+          font-size: 30rpx;
+          color: #b982ff;
+          border-left: 1px solid #eee4ff;
+        }
+        .row {
+          border-top: 1px solid #eee4ff;
+          display: flex;
+        }
+        .col-sctck {
+          position: sticky;
+          left: 290rpx;
+          width: 400rpx;
+        }
+      }
+      .tbody {
+        .tr {
+          height: 100rpx;
+          display: flex;
+          background-color: #ffffff;
+          text-align: center;
+          border-bottom: 1px solid #eee4ff;
+          &:last-of-type {
+            border: none;
+          }
+          .td {
+            padding: 22rpx;
+            width: 200rpx;
+            border-left: 1px solid #eee4ff;
+            font-size: 30rpx;
+            color: #211d2e;
+            line-height: 40rpx;
+            display: flex;
+            align-items: center;
+            text-align: left;
+          }
+        }
+        .mtr {
+          overflow: hidden;
+          height: 300rpx;
+        }
+      }
+    }
+  }
+}
+
+.page-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  width: 100%;
+  padding: 20rpx 40rpx calc(env(safe-area-inset-bottom) + 20rpx);
+  box-sizing: border-box;
+  background-color: #fff;
+  .pf-btn {
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #ffffff;
+    background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
+    border-radius: 100rpx 100rpx 100rpx 100rpx;
+  }
+}
diff --git a/src/pages/d_qolDetail/index.ts b/src/pages/d_qolDetail/index.ts
new file mode 100644
index 0000000..13d5b60
--- /dev/null
+++ b/src/pages/d_qolDetail/index.ts
@@ -0,0 +1,237 @@
+const app = getApp<IAppOption>()
+
+Page({
+  data: {
+    active: 0,
+    tab: 0,
+    id: '',
+
+    list1: [],
+    list2: [],
+    qolList: [
+      {
+        title: '1. 骑自行车或电动车',
+        answer: '',
+        answerList: {
+          4: '没学过',
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '2. 开车',
+        answer: '',
+        answerList: {
+          4: '没学过',
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '3. 室内走动',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '4. 室外走动',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '5. 看书看报',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '6. 看电视',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '7. 兴趣爱好及平时娱乐',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '8. 过去的1周内，您是否觉得甲状腺相关眼病会阻碍您去做您想做的事',
+        answer: '',
+        answerList: {
+          3: '无影响',
+          2: '有点影响',
+          1: '严重影响',
+        },
+      },
+      {
+        title: '9. 您是否感觉到甲状腺相关眼病改变您的外表？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '10. 您是否感觉到甲状腺相关眼病使您受到了别人的注视？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '11. 您是否感觉到别人因为甲状腺相关眼病对您不友善？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '12. 您是否感觉到甲状腺相关眼病影响您的自信心？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '13. 您是否感觉到甲状腺相关眼病影响您结交新朋友？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '14. 您是否感觉到甲状腺相关眼病使您收到了社会孤立？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '15. 您是否感觉到甲状腺相关眼病使您拍照的次数减少了？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+      {
+        title: '16. 您是否会试图掩饰甲状腺相关眼病给您带来的外貌变化？',
+        answer: '',
+        answerList: {
+          3: '不,没有',
+          2: '是的,有点',
+          1: '是的,严重',
+        },
+      },
+    ],
+  },
+  onLoad(options) {
+    this.setData({
+      id: options.id,
+    })
+    app.waitLogin({ type: [2] }).then(() => {
+      this.getDetail()
+      this.getList()
+    })
+  },
+  getDetail() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=zd/doctor/patient/info',
+      data: { patientId: this.data.id },
+    }).then((res) => {
+      this.setData({
+        detail: {
+          ...res,
+        },
+      })
+    })
+  },
+  onChange(e) {
+    this.setData({
+      active: e.detail.index,
+    })
+    this.getList()
+  },
+  getList() {
+    if (this.data.active == 0) {
+      this.getList1()
+    }
+    if (this.data.active == 1) {
+      this.getList2()
+    }
+  },
+  handleTab(e) {
+    const { index } = e.currentTarget.dataset
+    this.setData({
+      tab: index,
+    })
+  },
+  getList1() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/doctor/qol/list',
+      data: {
+        patientId: this.data.id,
+        type: 1,
+      },
+    }).then((res) => {
+      this.setData({
+        list1: res,
+      })
+    })
+  },
+  getList2() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/doctor/qol/list',
+      data: {
+        patientId: this.data.id,
+        type: 2,
+      },
+    }).then((res) => {
+      this.setData({
+        list2: res,
+      })
+    })
+  },
+  handleBackScroll() {
+    wx.redirectTo({
+      url: `/pages/d_patientDetail/index?id=${this.data.id}&anchor=qol`,
+    })
+  },
+})
+
+export {}
diff --git a/src/pages/d_qolDetail/index.wxml b/src/pages/d_qolDetail/index.wxml
new file mode 100644
index 0000000..21534cb
--- /dev/null
+++ b/src/pages/d_qolDetail/index.wxml
@@ -0,0 +1,178 @@
+<van-tabs
+  active="{{ active }}"
+  color="#B982FF"
+  title-active-color="#B982FF"
+  title-inactive-color="#211D2E"
+  bind:change="onChange"
+>
+  <van-tab title="按总分">
+    <view class="page1">
+      <view class="tabs">
+        <view class="tab-item {{tab==0&&'active'}}" bind:tap="handleTab" data-index="0">总分</view>
+        <view class="tab-item {{tab==1&&'active'}}" bind:tap="handleTab" data-index="1">视觉功能</view>
+        <view class="tab-item {{tab==2&&'active'}}" bind:tap="handleTab" data-index="2">外观影响</view>
+      </view>
+      <view class="container">
+        <view class="c-title">{{detail.Name}}的GO-QOL生活质量评测详情</view>
+        <view class="table" wx:if="{{list1.length}}">
+          <view class="thead">
+            <view class="item">日期</view>
+            <view class="item">得分</view>
+            <view class="item">与上次变化</view>
+          </view>
+          <view class="tbody">
+            <view class="tr" wx:for="{{list1}}" wx:key="index">
+              <view class="td">{{item.CreateDate}}</view>
+              <block wx:if="{{tab==0}}">
+                <view class="td">{{item.TotalScore}}</view>
+                <view class="td">{{item.changeTotalScore}}</view>
+              </block>
+              <block wx:elif="{{tab==1}}">
+                <view class="td">{{item.AppearanceScore}}</view>
+                <view class="td">{{item.changeAppearanceScore}}</view>
+              </block>
+              <block wx:elif="{{tab==2}}">
+                <view class="td">{{item.AppearanceScore}}</view>
+                <view class="td">{{item.changeAppearanceScore}}</view>
+              </block>
+            </view>
+          </view>
+        </view>
+        <image wx:else class="table-none" src="{{imageUrl}}none.png?t={{Timestamp}}"></image>
+      </view>
+    </view>
+  </van-tab>
+  <van-tab title="按答题选项">
+    <view class="page2">
+      <view class="title">xxx的GO-QOL生活质量评测详情</view>
+      <view class="scroll">
+        <view class="table1">
+          <view class="thead">
+            <view class="taside">类型</view>
+            <view class="tcontainer">问题</view>
+          </view>
+          <view class="tbody">
+            <view class="taside">视 觉</view>
+            <view class="tcontainer">
+              <view class="tr">
+                <view class="td">1.骑自行车或电动车</view>
+              </view>
+              <view class="tr">
+                <view class="td">2.开车</view>
+              </view>
+              <view class="tr">
+                <view class="td">3.室内走动</view>
+              </view>
+              <view class="tr">
+                <view class="td">4.室外走动</view>
+              </view>
+              <view class="tr">
+                <view class="td">5.看书看报</view>
+              </view>
+              <view class="tr">
+                <view class="td">6.看电视</view>
+              </view>
+              <view class="tr">
+                <view class="td">7.兴趣爱好及平时娱乐</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">8. 过去的1周内，您是否觉得甲状腺相关眼病会阻碍您去做您想做的事</view>
+              </view>
+            </view>
+          </view>
+          <view class="tbody">
+            <view class="taside" style="border-top: 1px solid #eee4ff">外 观</view>
+            <view class="tcontainer">
+              <view class="tr" style="border-top: 1px solid #eee4ff">
+                <view class="td mtd">9. 您是否感觉到甲状腺相关眼病改变您的外表？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">10. 您是否感觉到甲状腺相关眼病使您受到了别人的注视？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">11. 您是否感觉到别人因为甲状腺相关眼病对您不友善？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">12. 您是否感觉到甲状腺相关眼病影响您的自信心？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">13. 您是否感觉到甲状腺相关眼病影响您结交新朋友？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">14. 您是否感觉到甲状腺相关眼病使您收到了社会孤立？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">15. 您是否感觉到甲状腺相关眼病使您拍照的次数减少了？</view>
+              </view>
+              <view class="tr">
+                <view class="td mtd">16. 您是否会试图掩饰甲状腺相关眼病给您带来的外貌变化？</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="table2">
+          <view class="thead">
+            <view class="col col-sctck">答案</view>
+            <view class="row">
+              <view class="col" wx:for="{{list2}}" wx:key="index">{{item.CreateDate}}</view>
+            </view>
+          </view>
+          <view class="tbody">
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[0].answerList[item.Question1]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[1].answerList[item.Question2]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[2].answerList[item.Question3]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[3].answerList[item.Question4]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[4].answerList[item.Question5]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[5].answerList[item.Question6]}}</view>
+            </view>
+            <view class="tr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[6].answerList[item.Question7]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[7].answerList[item.Question8]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[8].answerList[item.Question9]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[9].answerList[item.Question10]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[10].answerList[item.Question11]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[11].answerList[item.Question12]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[12].answerList[item.Question13]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[13].answerList[item.Question14]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[14].answerList[item.Question15]}}</view>
+            </view>
+            <view class="tr mtr">
+              <view class="td" wx:for="{{list2}}" wx:key="index">{{qolList[15].answerList[item.Question16]}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </van-tab>
+</van-tabs>
+
+<view class="page-footer">
+  <view class="pf-btn" bind:tap="handleBackScroll">查看生活质量评分趋势</view>
+</view>
diff --git a/src/patient/pages/certReslove/index.ts b/src/patient/pages/certReslove/index.ts
index c7f1d91..4fa5f87 100644
--- a/src/patient/pages/certReslove/index.ts
+++ b/src/patient/pages/certReslove/index.ts
@@ -1,45 +1,51 @@
-const app = getApp<IAppOption>();
-let timer = null as null | number;
+const app = getApp<IAppOption>()
+let timer = null as null | number
 
 Page({
   data: {
-    message: "3秒后自动进入",
+    message: '3秒后自动进入',
     drug: false,
+    jump: 0,
   },
   onLoad(options) {
     this.setData({
       drug: Boolean(options.drug),
-    });
+      jump: options.jump,
+    })
   },
   onReady() {
     setTimeout(() => {
-      let time = 3;
+      let time = 3
       timer = setInterval(() => {
-        time--;
+        time--
         this.setData({
-          message: time + "秒后自动进入",
-        });
+          message: `${time}秒后自动进入`,
+        })
         if (time === 0) {
-          clearInterval(timer as number);
-          timer = null;
-          this.handleSubmit();
+          clearInterval(timer as number)
+          timer = null
+          this.handleSubmit()
         }
-      }, 1000);
-    }, 1000);
+      }, 1000)
+    }, 1000)
   },
   handleSubmit() {
-    if (this.data.message != "0秒后自动进入") return;
+    if (this.data.message != '0秒后自动进入')
+      return
     if (app.globalData.backPage) {
       wx.reLaunch({
         url: app.globalData.backPage,
-      });
-      app.globalData.backPage = null;
-      return;
+      })
+      app.globalData.backPage = null
+      return
     }
-    const backPage = app.globalData.backPage;
-    app.globalData.backPage = "";
+    let backPage = app.globalData.backPage
+    if (backPage) {
+      backPage = backPage.includes('?') ? `${backPage}&jump=${this.data.jump}` : `${backPage}?jump=${this.data.jump}`
+    }
+    app.globalData.backPage = ''
     wx.reLaunch({
-      url: backPage || "/patient/pages/index/index",
-    });
+      url: backPage || `/patient/pages/index/index?jump=${this.data.jump}`,
+    })
   },
-});
+})
diff --git a/src/patient/pages/doctor/index.scss b/src/patient/pages/doctor/index.scss
index 1384a97..b441c9b 100644
--- a/src/patient/pages/doctor/index.scss
+++ b/src/patient/pages/doctor/index.scss
@@ -140,8 +140,8 @@ page {
             font-size: 22rpx;
             line-height: 1;
             color: #ffffff;
-            background: #ffa300;
-            border-radius: 8rpx;
+            background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
+            border-radius: 6rpx;
           }
         }
         .content {
@@ -168,16 +168,32 @@ page {
             }
           }
           .tag {
-            margin-top: 16rpx;
             margin-right: 22rpx;
             display: inline-block;
             padding: 4rpx 16rpx 4rpx 16rpx;
             line-height: 1;
-            font-size: 22rpx;
+            font-size: 24rpx;
             color: #b982ff;
-            border-radius: 8rpx;
+            border-radius: 6rpx;
             border: 1rpx solid #b982ff;
           }
+          .medical {
+            margin-right: 22rpx;
+            vertical-align: bottom;
+            padding: 4rpx 8rpx;
+            line-height: 1;
+            font-size: 24rpx;
+            color: #ffffff;
+            border-radius: 6rpx;
+            display: inline-flex;
+            align-items: center;
+            gap: 2rpx;
+            background: linear-gradient(210deg, #1ec580 0%, #4feaaa 100%);
+            .m-icon {
+              width: 28rpx;
+              height: 28rpx;
+            }
+          }
           .drug {
             vertical-align: middle;
             padding-right: 8rpx;
diff --git a/src/patient/pages/doctor/index.wxml b/src/patient/pages/doctor/index.wxml
index 1af3897..f6db1b7 100644
--- a/src/patient/pages/doctor/index.wxml
+++ b/src/patient/pages/doctor/index.wxml
@@ -85,6 +85,10 @@
             ></image>
           </view>
           <view class="tag" wx:if="{{item.DoctorNum>0}}">{{item.DoctorNum}}名医生</view>
+          <view class="medical" wx:if="{{item.isReimbursement==1}}">
+            <image class="m-icon" src="{{imageUrl}}icon132.png?t={{Timestamp}}"></image>
+            医保
+          </view>
           <view class="drug" wx:if="{{item.IsHaveDrug==1}}">
             <image class="drug-icon" src="{{imageUrl}}za-images//nrdl/drug.png"></image>
             院内有药
diff --git a/src/patient/pages/enterInfo/index.scss b/src/patient/pages/enterInfo/index.scss
index bf77967..eae3a6f 100644
--- a/src/patient/pages/enterInfo/index.scss
+++ b/src/patient/pages/enterInfo/index.scss
@@ -1,8 +1,10 @@
+page {
+  background-color: #f6f8f9;
+}
 .page {
   min-height: 100vh;
   position: relative;
   box-sizing: border-box;
-  background-color: rgba(255, 255, 255, 1);
   .bg {
     width: 100%;
     height: 512rpx;
@@ -15,234 +17,204 @@
     left: 0;
     display: flex;
     flex-direction: column;
-    .content {
-      padding: 40rpx 40rpx 0;
-      box-sizing: border-box;
-      border-radius: 24rpx;
-      .switch {
-        margin-bottom: 50rpx;
+    .container {
+      margin: 0 30rpx;
+      padding: 32rpx 32rpx 0;
+      background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 8.04%, #ffffff 100%);
+      box-shadow: 0rpx 4rpx 24rpx 0rpx rgba(70, 67, 81, 0.04);
+      border-radius: 24rpx 24rpx 24rpx 24rpx;
+      border: 2rpx solid #ffffff;
+      .step {
         display: flex;
-        gap: 22rpx;
-        justify-content: center;
-        gap: 86rpx;
-        .item {
-          .icon-wrap {
-            background: rgba(255, 255, 255, 1);
-            border-radius: 24rpx 24rpx 24rpx 24rpx;
-            border: 1px solid rgba(255, 255, 255, 1);
-            text-align: center;
-            .icon {
-              display: block;
-              margin-bottom: -2px;
-              width: 186rpx;
-              height: 164rpx;
-            }
-          }
-          .name {
-            margin-top: 24rpx;
-            font-size: 32rpx;
-            color: rgba(173, 172, 178, 1);
-            text-align: center;
-          }
+        align-items: center;
+        gap: 6rpx;
+        .s-item {
+          flex: 1;
+          height: 16rpx;
+          border-radius: 84rpx;
+          background-color: #fff;
           &.active {
-            .icon-wrap {
-              border-color: rgba(185, 130, 255, 1);
-            }
-            .name {
-              color: rgba(185, 130, 255, 1);
-            }
+            background-color: #b982ff;
           }
         }
       }
-      .row-title {
-        margin-top: 48rpx;
-        margin-bottom: 24rpx;
-        font-size: 32rpx;
-        font-weight: bold;
-        color: rgba(33, 29, 46, 1);
-        .sub {
-          font-size: 32rpx;
-          color: rgba(105, 104, 110, 1);
-          font-weight: normal;
-        }
-        .rt-content {
-          margin-top: 8rpx;
-          font-size: 28rpx;
-          color: #adacb2;
-          font-weight: normal;
-          line-height: 52rpx;
-        }
-      }
-      .row {
-        margin-bottom: 40rpx;
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        gap: 22rpx;
-        &.row-age {
-          display: grid;
-          grid-template-columns: repeat(3, 1fr);
-        }
-        .picker {
-          flex: 1;
-          padding: 24rpx 32rpx;
-          font-size: 28rpx;
-          color: #999999;
-          background: #f2f2f2;
-          border: 2rpx solid #cccccc;
-          border-radius: 24rpx;
-          .select {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .icons {
-              display: flex;
-              align-items: center;
-              .required {
-                width: 12rpx;
-                height: 12rpx;
-                border-radius: 50%;
-                background: #e04775;
-                margin-right: 20rpx;
+      .content {
+        padding: 40rpx 0 0;
+        box-sizing: border-box;
+        border-radius: 24rpx;
+        .switch {
+          margin-bottom: 50rpx;
+          display: flex;
+          gap: 22rpx;
+          justify-content: center;
+          gap: 86rpx;
+          .item {
+            .icon-wrap {
+              background: #f6f8f9;
+              border-radius: 24rpx 24rpx 24rpx 24rpx;
+              border: 1px solid transparent;
+              text-align: center;
+              .icon {
+                display: block;
+                margin-bottom: -2px;
+                width: 186rpx;
+                height: 164rpx;
               }
             }
-            .select-content {
+            .name {
+              margin-top: 24rpx;
+              font-size: 32rpx;
+              color: #211d2e;
+              text-align: center;
+            }
+            &.active {
+              .icon-wrap {
+                border-color: rgba(185, 130, 255, 1);
+                background-color: transparent;
+              }
+              .name {
+                color: rgba(185, 130, 255, 1);
+              }
             }
           }
         }
-        .input {
-          flex: 1;
-          padding: 24rpx 32rpx;
-          height: 40rpx;
+        .row-title {
+          margin-top: 48rpx;
+          margin-bottom: 24rpx;
           font-size: 32rpx;
-          color: #333;
-          background: #f6f8f9;
-          border-radius: 16rpx;
-        }
-        .input-place {
-          color: rgba(173, 172, 178, 1);
-        }
-        .input-required {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          &::after {
-            flex-shrink: 0;
-            margin-right: 60rpx;
-            content: '';
-            width: 12rpx;
-            height: 12rpx;
-            border-radius: 50%;
-            background: rgba(185, 130, 255, 1);
+          font-weight: bold;
+          color: rgba(33, 29, 46, 1);
+          .sub {
+            font-size: 32rpx;
+            color: rgba(105, 104, 110, 1);
+            font-weight: normal;
           }
-        }
-        .item {
-          flex: 1;
-          padding: 12rpx 62rpx;
-          opacity: 1;
-          border: 2rpx solid rgba(246, 248, 249, 1);
-          font-size: 32rpx;
-          color: rgba(173, 172, 178, 1);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          border-radius: 16rpx;
-          background: rgba(246, 248, 249, 1);
-          .icon {
-            width: 64rpx;
-            height: 64rpx;
+          .rt-content {
+            margin-top: 8rpx;
+            font-size: 28rpx;
+            color: #adacb2;
+            font-weight: normal;
+            line-height: 52rpx;
           }
-          &.active {
-            color: rgba(185, 130, 255, 1);
-            background: #faf6ff;
-            border-color: rgba(185, 130, 255, 1);
+          &.required::before {
+            content: '*';
+            font-size: 32rpx;
+            color: #ef3939;
+            vertical-align: top;
           }
         }
-        .age-item {
-          margin-bottom: 24rpx;
-          width: 208rpx;
-          height: 88rpx;
-          white-space: nowrap;
-          font-size: 32rpx;
-          color: #999999;
+        .row {
+          margin-bottom: 40rpx;
           display: flex;
-          align-items: center;
-          justify-content: center;
-          border-radius: 16rpx;
-          box-sizing: border-box;
-          border: 2rpx solid rgba(246, 248, 249, 1);
-          background-color: rgba(246, 248, 249, 1);
-          &.active {
-            color: rgba(185, 130, 255, 1);
-            border-color: rgba(185, 130, 255, 1);
-            background-color: #faf6ff;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          gap: 22rpx;
+          &.row-age {
+            display: grid;
+            grid-template-columns: repeat(3, 1fr);
           }
-        }
-      }
-      .upload {
-        margin-top: 24rpx;
-        width: 208rpx;
-        .upload-container {
-          position: relative;
-          width: 208rpx;
-          height: 208rpx;
-          border-radius: 16rpx;
-          background: #f6f8f9;
-          overflow: hidden;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex-direction: column;
-          .upload-img {
-            position: relative;
-            width: 100%;
-            height: 100%;
-            .del {
-              position: absolute;
-              top: 0;
-              right: 0;
-              width: 40rpx;
-              height: 40rpx;
-              border-radius: 0 16rpx 0 16rpx;
-              background: rgba(0, 0, 0, 0.3);
+          .picker {
+            flex: 1;
+            padding: 24rpx 32rpx;
+            font-size: 28rpx;
+            color: #999999;
+            background: #f2f2f2;
+            border: 2rpx solid #cccccc;
+            border-radius: 24rpx;
+            .select {
               display: flex;
+              justify-content: space-between;
               align-items: center;
-              justify-content: center;
-              .d-icon {
-                width: 26rpx;
-                height: 26rpx;
+              .icons {
+                display: flex;
+                align-items: center;
+                .required {
+                  width: 12rpx;
+                  height: 12rpx;
+                  border-radius: 50%;
+                  background: #e04775;
+                  margin-right: 20rpx;
+                }
+              }
+              .select-content {
               }
             }
-            .img {
-              display: block;
-              width: 100%;
-              height: 100%;
+          }
+          .input {
+            flex: 1;
+            padding: 24rpx 32rpx;
+            height: 40rpx;
+            font-size: 32rpx;
+            color: #333;
+            background: #f6f8f9;
+            border-radius: 16rpx;
+          }
+          .input-place {
+            color: rgba(173, 172, 178, 1);
+          }
+          .input-required {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            &::after {
+              flex-shrink: 0;
+              margin-right: 20rpx;
+              content: '';
+              width: 12rpx;
+              height: 12rpx;
+              border-radius: 50%;
+              background: rgba(185, 130, 255, 1);
             }
           }
-          .icon {
-            display: block;
-            width: 112rpx;
-            height: 80rpx;
+          .item {
+            flex: 1;
+            padding: 10rpx 62rpx;
+            opacity: 1;
+            font-size: 32rpx;
+            color: rgba(173, 172, 178, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 16rpx;
+            background: rgba(246, 248, 249, 1);
+            .icon {
+              width: 64rpx;
+              height: 64rpx;
+            }
+            &.active {
+              color: rgba(185, 130, 255, 1);
+              background: #faf6ff;
+            }
           }
-          .name {
-            margin-top: 28rpx;
-            font-size: 28rpx;
-            color: #adacb2;
-            text-align: center;
+          .age-item {
+            height: 84rpx;
+            white-space: nowrap;
+            font-size: 32rpx;
+            color: #999999;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 16rpx;
+            box-sizing: border-box;
+            background-color: rgba(246, 248, 249, 1);
+            &.active {
+              color: rgba(185, 130, 255, 1);
+              background-color: #faf6ff;
+            }
           }
         }
-      }
-      .row-sub {
-        margin-top: 8rpx;
-        font-size: 28rpx;
-        color: #adacb2;
-      }
-      .tip {
-        margin-top: -24rpx;
-        margin-left: 46rpx;
-        font-size: 28rpx;
-        line-height: 40rpx;
-        color: rgba(185, 130, 255, 1);
+        .row-sub {
+          margin-top: 8rpx;
+          font-size: 28rpx;
+          color: #adacb2;
+        }
+        .tip {
+          margin-top: -24rpx;
+          margin-left: 32rpx;
+          font-size: 28rpx;
+          line-height: 40rpx;
+          color: rgba(185, 130, 255, 1);
+        }
       }
     }
   }
@@ -275,27 +247,108 @@
   }
 }
 
-.popup {
-  .popup-title {
-    display: flex;
-    justify-content: space-between;
-    padding: 20rpx 40rpx;
+.popup-upload {
+  padding: 68rpx 36rpx 48rpx;
+  width: 670rpx;
+  box-sizing: border-box;
+  border-radius: 24rpx;
+  background: linear-gradient(180deg, #f1e6ff 0%, #ffffff 29.75%, #ffffff 100%);
+  .title {
+    font-size: 40rpx;
+    color: #211d2e;
+    font-weight: bold;
+    text-align: center;
+  }
+  .content {
+    margin-top: 16rpx;
     font-size: 32rpx;
-    .clsoe {
-      color: #7f7f7f;
-    }
-    .sure {
-      color: #22c065;
+    color: #211d2e;
+    .high {
+      color: #b982ff;
     }
   }
-  .popup-picker {
-    .picker-col {
-      padding: 10rpx 30rpx;
-      font-size: 28rpx;
-      line-height: 40rpx;
-      box-sizing: border-box;
+  .upload {
+    width: 606rpx;
+    height: 300rpx;
+    .upload-container {
+      margin-top: 28rpx;
+      position: relative;
+      width: 606rpx;
+      height: 300rpx;
+      border-radius: 16rpx;
+      background: #f6f8f9;
+      overflow: hidden;
       display: flex;
       align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      .upload-img {
+        position: relative;
+        width: 100%;
+        height: 100%;
+        .del {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 0 16rpx 0 16rpx;
+          background: rgba(0, 0, 0, 0.3);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .d-icon {
+            font-size: 28rpx;
+            color: #fff;
+          }
+        }
+        .img {
+          display: block;
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .icon {
+        display: block;
+        width: 112rpx;
+        height: 80rpx;
+      }
+      .tip {
+        margin-top: 10rpx;
+        font-size: 28rpx;
+        color: #adacb2;
+      }
+      .name {
+        margin-top: 28rpx;
+        font-size: 28rpx;
+        color: #adacb2;
+        text-align: center;
+      }
     }
   }
+  .btn1 {
+    margin-top: 32rpx;
+    width: 606rpx;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #ffffff;
+    line-height: 48rpx;
+    background: linear-gradient(344deg, #ffbcf9 0%, #b982ff 100%);
+    border-radius: 100rpx 100rpx 100rpx 100rpx;
+  }
+  .btn2 {
+    padding: 32rpx 0 0;
+    font-size: 32rpx;
+    color: #b982ff;
+    text-align: center;
+  }
+}
+.popup-upload-close {
+  margin: 48rpx auto 0;
+  display: block;
+  width: 64rpx;
+  height: 64rpx;
 }
diff --git a/src/patient/pages/enterInfo/index.ts b/src/patient/pages/enterInfo/index.ts
index 19b560d..650741e 100644
--- a/src/patient/pages/enterInfo/index.ts
+++ b/src/patient/pages/enterInfo/index.ts
@@ -4,6 +4,8 @@ const app = getApp<IAppOption>()
 
 Page({
   data: {
+    step: 0,
+
     relationType: '1',
     name: '',
     gender: '',
@@ -16,6 +18,9 @@ Page({
     isKnowTituyo: '',
     isUseTituyo: '',
     prescriptionImg: '',
+    diseaseStage: '',
+    diseasePeriod: '',
+    tituyo: {},
 
     diagnoseTypeShow: false,
     DiagnoseType: app.globalData.DiagnoseType,
@@ -29,14 +34,15 @@ Page({
     proces: '0',
 
     dict: {},
-    bolList: {
-      1: '是',
-      2: '否',
-    },
+
+    show: false,
 
     popupShow: false,
-    popupType: 'popup7',
+    // popupType: 'popup7',
+    popupType: 'popup15',
     popupParams: {} as any,
+
+    jump: 0,
   },
   onLoad(options) {
     this.setData({
@@ -52,6 +58,10 @@ Page({
           name: zdUserInfo.PatientName,
           gender: zdUserInfo.Gender,
           ageRange: zdUserInfo.AgeRange,
+          IsGraves: zdUserInfo.IsGraves,
+          diseaseStage: zdUserInfo.DiseaseStage,
+          diseasePeriod: zdUserInfo.DiseaseStage,
+          HasTedSurgery: zdUserInfo.HasTedSurgery,
         })
       })
     })
@@ -91,6 +101,18 @@ Page({
       IsGraves: id,
     })
   },
+  handleSelectDiseaseStage(e: WechatMiniprogram.CustomEvent) {
+    const { id } = e.currentTarget.dataset
+    this.setData({
+      diseaseStage: id,
+    })
+  },
+  handleSelectDiseasePeriod(e: WechatMiniprogram.CustomEvent) {
+    const { id } = e.currentTarget.dataset
+    this.setData({
+      diseasePeriod: id,
+    })
+  },
   handleSelectHasTedSurgery(e: WechatMiniprogram.CustomEvent) {
     const { id } = e.currentTarget.dataset
     this.setData({
@@ -99,8 +121,15 @@ Page({
   },
   handleSelectKnowTituyo(e) {
     const { id } = e.currentTarget.dataset
+    const { tituyo } = this.data
+    let show = false
+    tituyo[id] = !tituyo[id]
+    if (id == 4 && tituyo[id]) {
+      show = true
+    }
     this.setData({
-      isKnowTituyo: id,
+      tituyo,
+      show,
     })
   },
   handleSelectUseTituyo(e) {
@@ -112,35 +141,60 @@ Page({
       scrollTop: 10000,
     })
   },
+  handleNext() {
+    const { name, gender, ageRange, relationType } = this.data
+    if (!name || !gender || !ageRange || !relationType) {
+      wx.showToast({ title: '完善个人信息，可获得【医生】更多关注', icon: 'none' })
+      return
+    }
+    this.setData({
+      step: 1,
+    })
+  },
+  handlePopupSubmit() {
+    const { prescriptionImg } = this.data
+    if (!prescriptionImg) {
+      wx.showToast({
+        icon: 'none',
+        title: '请上传您的处方证明',
+      })
+      return
+    }
+    this.setData({
+      show: false,
+    })
+    this.handleSubmit()
+  },
+  handlePopupJump() {
+    this.setData({
+      show: false,
+      jump: 1,
+    })
+    this.handleSubmit()
+  },
   handleSubmit() {
     app.mpBehavior({ PageName: 'BTN_PatientInfoComfirm' })
     if (this.data.submiting)
       return
-
     const {
       name,
       gender,
       ageRange,
       relationType,
+
+      diseaseStage,
+      diseasePeriod,
       IsGraves,
       HasTedSurgery,
-      isKnowTituyo,
-      isUseTituyo,
+      tituyo,
       prescriptionImg,
+
+      jump,
     } = this.data
     const { registrationSource, registChannel, regBusinessId, WorkerId, IsAliQiWei } = app.globalData
     const { doctorId, inviteChan, proMethodId } = app.globalData.scene
-    let toast = ''
-    // if (!diagnosisTime) toast = "确诊时间不能为空";
-    // if (!birth) toast = "出生日期不能为空";
-    if (!gender)
-      toast = '请选择性别'
-    if (!ageRange)
-      toast = '请选择年龄范围'
-    if (!name)
-      toast = '姓名不能为空'
-    if (toast) {
-      wx.showToast({ title: toast, icon: 'none' })
+    if (!name || !gender || !ageRange || !relationType || !diseaseStage || !diseasePeriod) {
+      wx.showToast({ title: '完善个人信息，可获得【医生】更多关注', icon: 'none' })
       return
     }
 
@@ -167,9 +221,11 @@ Page({
         regBusinessId,
         IsGraves,
         HasTedSurgery,
-        isKnowTituyo,
-        isUseTituyo,
+        diseaseStage,
+        diseasePeriod,
         prescriptionImg,
+        tituyo: Object.keys(tituyo),
+
         WorkerId,
         inviteDoctorId: doctorId,
         inviteChannel: inviteChan,
@@ -180,7 +236,7 @@ Page({
       .then((_res) => {
         app.updateLoginInfo(() => {
           wx.reLaunch({
-            url: navUrl,
+            url: navUrl.includes('?') ? `${navUrl}&jump=${jump}` : `${navUrl}?jump=${jump}`,
           })
           this.setData({
             submiting: false,
@@ -248,6 +304,11 @@ Page({
       popupType: '',
     })
   },
+  handlePopupClose() {
+    this.setData({
+      show: false,
+    })
+  },
   handlePreview() {
     wx.previewImage({
       urls: [this.data.prescriptionImg],
diff --git a/src/patient/pages/enterInfo/index.wxml b/src/patient/pages/enterInfo/index.wxml
index 2a62753..0c9eb32 100644
--- a/src/patient/pages/enterInfo/index.wxml
+++ b/src/patient/pages/enterInfo/index.wxml
@@ -1,144 +1,171 @@
 <view class="page">
-  <navbar fixed title="注册信息" custom-style="background:{{background}}"></navbar>
+  <navbar fixed title="注册" custom-style="background:{{background}}"></navbar>
   <image class="bg" src="{{imageUrl}}bg10.png?t={{Timestamp}}"></image>
   <view class="page-container" style="padding-top:{{pageTop+24}}px;">
-    <view class="content">
-      <view class="switch">
-        <view class="item {{relationType==1 && 'active'}}" bind:tap="handleRelationType" data-id="1">
-          <view class="icon-wrap">
-            <image class="icon" src="{{imageUrl}}icon28.png?t={{Timestamp}}"></image>
+    <view class="container">
+      <view class="step">
+        <view class="s-item active"></view>
+        <view class="s-item {{step==1 && 'active'}}"></view>
+      </view>
+      <view class="content" wx:if="{{step==0}}">
+        <view class="switch">
+          <view class="item {{relationType==1 && 'active'}}" bind:tap="handleRelationType" data-id="1">
+            <view class="icon-wrap">
+              <image class="icon" src="{{imageUrl}}icon28.png?t={{Timestamp}}"></image>
+            </view>
+            <view class="name">我是本人</view>
           </view>
-          <view class="name">患者本人</view>
-        </view>
-        <view class="item {{relationType==2 && 'active'}}" bind:tap="handleRelationType" data-id="2">
-          <view class="icon-wrap">
-            <image class="icon" src="{{imageUrl}}icon29.png?t={{Timestamp}}"></image>
+          <view class="item {{relationType==2 && 'active'}}" bind:tap="handleRelationType" data-id="2">
+            <view class="icon-wrap">
+              <image class="icon" src="{{imageUrl}}icon29.png?t={{Timestamp}}"></image>
+            </view>
+            <view class="name">我是亲友</view>
           </view>
-          <view class="name">患者亲友</view>
         </view>
-      </view>
-      <view class="row">
-        <input
-          model:value="{{name}}"
-          class="input input-required"
-          placeholder-class="input-place"
-          focus
-          maxlength="{{8}}"
-          placeholder="怎么称呼{{relationType==1?'您':'患者'}}？"
-        />
-      </view>
-      <view class="tip">请您输入真实姓名，便于医生识别随访</view>
-      <view class="row-title">患者性别</view>
-      <view class="row">
-        <view class="item {{gender==2 && 'active'}}" bind:tap="handleGender" data-id="2">
-          <image class="icon" src="{{imageUrl}}{{gender==2 ? 'icon57' : 'icon55'}}.png?t={{Timestamp}}"></image>
-          女
+        <view class="row-title required">患者姓名</view>
+        <view class="row">
+          <input
+            model:value="{{name}}"
+            class="input input-required"
+            placeholder-class="input-place"
+            focus
+            maxlength="{{8}}"
+            placeholder="怎么称呼{{relationType==1?'您':'患者'}}？"
+          />
         </view>
-        <view class="item {{gender==1 && 'active'}}" bind:tap="handleGender" data-id="1">
-          <image class="icon" src="{{imageUrl}}{{gender==1 ? 'icon58' : 'icon56'}}.png?t={{Timestamp}}"></image>
-          男
+        <view class="tip">请您输入真实姓名，便于医生识别随访</view>
+        <view class="row-title required">患者性别</view>
+        <view class="row">
+          <view class="item {{gender==2 && 'active'}}" bind:tap="handleGender" data-id="2">
+            <image class="icon" src="{{imageUrl}}{{gender==2 ? 'icon57' : 'icon55'}}.png?t={{Timestamp}}"></image>
+            女
+          </view>
+          <view class="item {{gender==1 && 'active'}}" bind:tap="handleGender" data-id="1">
+            <image class="icon" src="{{imageUrl}}{{gender==1 ? 'icon58' : 'icon56'}}.png?t={{Timestamp}}"></image>
+            男
+          </view>
         </view>
-      </view>
-      <view class="row-title">患者年龄范围</view>
-      <view class="row row-age">
-        <view
-          class="age-item {{ageRange==index && 'active'}}"
-          data-id="{{index}}"
-          wx:for="{{dict.AgeRange}}"
-          wx:key="index"
-          bind:tap="handleSelectAge"
-        >
-          {{item}}
+        <view class="row-title required">患者年龄范围</view>
+        <view class="row row-age">
+          <view
+            class="age-item {{ageRange==index && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.AgeRange}}"
+            wx:key="index"
+            bind:tap="handleSelectAge"
+          >
+            {{item}}
+          </view>
         </view>
       </view>
-      <view class="row-title">
-        是否有Graves病病史
-        <text class="sub">（非必填）</text>
-      </view>
-      <view class="row row-age">
-        <view
-          class="age-item {{IsGraves==index && 'active'}}"
-          data-id="{{index}}"
-          wx:for="{{dict.IsGraves}}"
-          wx:key="index"
-          bind:tap="handleSelectIsGraves"
-        >
-          {{item}}
+      <view class="content" wx:elif="{{step==1}}">
+        <view class="row-title required">您的甲状腺眼病分级</view>
+        <view class="row row-age">
+          <view
+            class="age-item {{diseaseStage==index && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.StageText}}"
+            wx:key="index"
+            bind:tap="handleSelectDiseaseStage"
+          >
+            {{item}}
+          </view>
         </view>
-      </view>
-      <view class="row-title">
-        是否有TED（甲状腺眼突）及其相关眼部手术史
-        <text class="sub">（非必填）</text>
-      </view>
-      <view class="row row-age">
-        <view
-          class="age-item {{HasTedSurgery==index && 'active'}}"
-          data-id="{{index}}"
-          wx:for="{{dict.HasTedSurgery}}"
-          wx:key="index"
-          bind:tap="handleSelectHasTedSurgery"
-        >
-          {{item}}
+        <view class="row-title required">您的甲状腺眼病分期</view>
+        <view class="row row-age">
+          <view
+            class="age-item {{diseasePeriod==index && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.PeriodText}}"
+            wx:key="index"
+            bind:tap="handleSelectDiseasePeriod"
+          >
+            {{item}}
+          </view>
         </view>
-      </view>
-      <view class="row-title">
-        是否了解替妥尤单抗N01
-        <text class="sub">（非必填）</text>
-      </view>
-      <view class="row row-age">
-        <view
-          class="age-item {{isKnowTituyo==index && 'active'}}"
-          data-id="{{index}}"
-          wx:for="{{bolList}}"
-          wx:key="index"
-          bind:tap="handleSelectKnowTituyo"
-        >
-          {{item}}
+        <view class="row-title">是否有Graves病病史</view>
+        <view class="row row-age">
+          <view
+            class="age-item {{IsGraves==index && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.IsGraves}}"
+            wx:key="index"
+            bind:tap="handleSelectIsGraves"
+          >
+            {{item}}
+          </view>
         </view>
-      </view>
-      <view class="row-title">
-        是否有使用替妥尤单抗N01
-        <text class="sub">（非必填）</text>
-      </view>
-      <view class="row row-age">
-        <view
-          class="age-item {{isUseTituyo==index && 'active'}}"
-          data-id="{{index}}"
-          wx:for="{{bolList}}"
-          wx:key="index"
-          bind:tap="handleSelectUseTituyo"
-        >
-          {{item}}
+        <view class="row-title">是否有TED（甲状腺眼突) 及其相关眼部手术史</view>
+        <view class="row row-age">
+          <view
+            class="age-item {{HasTedSurgery==index && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.HasTedSurgery}}"
+            wx:key="index"
+            bind:tap="handleSelectHasTedSurgery"
+          >
+            {{item}}
+          </view>
         </view>
-      </view>
-      <block wx:if="{{isUseTituyo==1}}">
         <view class="row-title">
-          请上传您的处方证明
-          <view class="rt-content">处方证明审核通过后，即可享受平台全部服务</view>
+          如何看待新药替妥尤单抗
+          <text class="sub">（多选）</text>
         </view>
-        <uploadFile class="upload" accept="image" bind:file="handleSetData">
-          <view class="upload-container">
-            <view class="upload-img" wx:if="{{prescriptionImg}}">
-              <view class="del" catchtap="handleDelData">
-                <image class="d-icon" src="{{imageUrl}}icon77.png?t={{Timestamp}}"></image>
-              </view>
-              <image class="img" src="{{prescriptionImg}}" mode="aspectFill" catch:tap="handlePreview"></image>
-            </view>
-            <block wx:else>
-              <van-icon name="plus" style="font-size: 80rpx; color: rgba(173, 172, 178, 0.5)" />
-            </block>
+        <view class="row row-age">
+          <view
+            class="age-item {{tituyo[index] && 'active'}}"
+            data-id="{{index}}"
+            wx:for="{{dict.tituyoMap}}"
+            wx:key="index"
+            bind:tap="handleSelectKnowTituyo"
+          >
+            {{item}}
+          </view>
+        </view>
+        <block wx:if="{{isUseTituyo==1}}">
+          <view class="row-title">
+            请上传您的处方证明
+            <view class="rt-content">处方证明审核通过后，即可享受平台全部服务</view>
           </view>
-        </uploadFile>
-        <view class="row-sub">您可以上传您的诊断处方、住院小结等</view>
-      </block>
+          <view class="row-sub">您可以上传您的诊断处方、住院小结等</view>
+        </block>
+      </view>
     </view>
   </view>
   <view class="footer">
-    <view bind:tap="handleSubmit" class="next">立即进入</view>
-    <view bind:tap="handleVisitors" class="cancel">随便看看</view>
+    <view wx:if="{{step==0}}" bind:tap="handleNext" class="next">下一步</view>
+    <view wx:elif="{{step==1}}" bind:tap="handleSubmit" class="next">完成注册</view>
   </view>
 </view>
 
+<van-popup show="{{ show }}" round custom-style="background:transparent">
+  <view class="popup-upload">
+    <view class="title">请上传您的处方证明</view>
+    <view class="content">
+      完善个人信息，可获得
+      <text class="high">【医生】</text>
+      更多关注
+    </view>
+    <uploadFile class="upload" accept="image" bind:file="handleSetData">
+      <view class="upload-container">
+        <view class="upload-img" wx:if="{{prescriptionImg}}">
+          <view class="del" catchtap="handleDelData">
+            <van-icon class="d-icon" name="delete-o" />
+          </view>
+          <image class="img" src="{{prescriptionImg}}" mode="aspectFill" catch:tap="handlePreview"></image>
+        </view>
+        <block wx:else>
+          <van-icon name="plus" style="font-size: 80rpx; color: rgba(173, 172, 178, 0.5)" />
+          <view class="tip">您可以上传您的诊断处方、住院小结等</view>
+        </block>
+      </view>
+    </uploadFile>
+    <view class="btn1" bind:tap="handlePopupSubmit">完成注册</view>
+    <view class="btn2" bind:tap="handlePopupJump">跳过，并完成注册</view>
+  </view>
+  <image class="popup-upload-close" src="{{imageUrl}}icon11.png?t={{Timestamp}}" bind:tap="handlePopupClose"></image>
+</van-popup>
+
 <popup
   show="{{popupShow}}"
   type="{{popupType}}"
diff --git a/src/patient/pages/hospital/index.scss b/src/patient/pages/hospital/index.scss
index f83034a..a8ffb46 100644
--- a/src/patient/pages/hospital/index.scss
+++ b/src/patient/pages/hospital/index.scss
@@ -1,9 +1,13 @@
+page {
+  background-color: #f6f8f9;
+}
 .scroll-view {
   height: 100vh;
 }
 .page {
-  background-color: #fafafa;
+  background-color: #f6f8f9;
   min-height: 70vh;
+  padding-bottom: 240rpx;
   .banner {
     padding: 44rpx 30rpx 0;
     display: flex;
@@ -23,8 +27,6 @@
       margin-left: 24rpx;
       flex: 1;
       .title {
-        display: flex;
-        align-items: center;
         .name {
           font-size: 36rpx;
           color: #211d2e;
@@ -32,14 +34,31 @@
           font-weight: bold;
         }
         .tag {
-          flex-shrink: 0;
-          margin-left: 12rpx;
+          display: inline-block;
+          margin-right: 12rpx;
           padding: 6rpx 12rpx;
-          font-size: 22rpx;
+          font-size: 24rpx;
           line-height: 1;
           color: #ffffff;
-          background: #ffa300;
-          border-radius: 8rpx;
+          background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
+          border-radius: 6rpx;
+        }
+        .medical {
+          margin-right: 12rpx;
+          vertical-align: bottom;
+          padding: 4rpx 8rpx;
+          line-height: 1;
+          font-size: 24rpx;
+          color: #ffffff;
+          border-radius: 6rpx;
+          display: inline-flex;
+          align-items: center;
+          gap: 2rpx;
+          background: linear-gradient(210deg, #1ec580 0%, #4feaaa 100%);
+          .m-icon {
+            width: 28rpx;
+            height: 28rpx;
+          }
         }
       }
       .content {
@@ -49,7 +68,10 @@
             margin-bottom: 16rpx;
             font-size: 32rpx;
             color: #211d2e;
+            display: flex;
+            align-items: flex-start;
             .icon {
+              flex-shrink: 0;
               margin-right: 10rpx;
               width: 36rpx;
               height: 36rpx;
@@ -124,15 +146,20 @@
       box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05);
       border: 1rpx solid #ebecee;
       border-radius: 24rpx;
-      .m-title {
-        position: relative;
-        height: 88rpx;
-        .m-title-img {
-          position: absolute;
-          top: -20rpx;
-          left: 0;
-          width: 100%;
-          height: 108rpx;
+      .m-header {
+        padding: 38rpx 32rpx 0;
+        gap: 16rpx;
+        display: flex;
+        align-items: center;
+        font-size: 36rpx;
+        color: #211d2e;
+        font-weight: bold;
+        &::before {
+          content: '';
+          width: 8rpx;
+          height: 36rpx;
+          background: #b982ff;
+          border-radius: 2rpx 2rpx 2rpx 2rpx;
         }
       }
     }
@@ -226,4 +253,24 @@
       }
     }
   }
+  .page-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 10;
+    width: 100%;
+    padding: 20rpx 40rpx calc(env(safe-area-inset-bottom) + 20rpx);
+    box-sizing: border-box;
+    background-color: #fff;
+    .pf-btn {
+      height: 88rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32rpx;
+      color: #ffffff;
+      background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
+      border-radius: 100rpx 100rpx 100rpx 100rpx;
+    }
+  }
 }
diff --git a/src/patient/pages/hospital/index.ts b/src/patient/pages/hospital/index.ts
index a3ed72c..6023b34 100644
--- a/src/patient/pages/hospital/index.ts
+++ b/src/patient/pages/hospital/index.ts
@@ -20,7 +20,7 @@ Page({
     },
   },
   onLoad(options) {
-    app.zdWaitLogin().then((_res) => {
+    app.waitLogin({ type: [0, 1] }).then(() => {
       this.setData({
         id: options.id,
       })
@@ -193,6 +193,11 @@ Page({
       url,
     })
   },
+  handleMedical() {
+    wx.navigateTo({
+      url: `/patient/pages/medicalDetail/index?id=${this.data.detail.hospitalPolicyId}`,
+    })
+  },
   handleBack() {
     wx.navigateBack()
   },
diff --git a/src/patient/pages/hospital/index.wxml b/src/patient/pages/hospital/index.wxml
index 478727f..2588f9a 100644
--- a/src/patient/pages/hospital/index.wxml
+++ b/src/patient/pages/hospital/index.wxml
@@ -11,6 +11,10 @@
           <view class="tag" wx:if="{{detail.HospitalClassificationName ||detail.HospitalLevelName}}">
             {{detail.HospitalClassificationName}}{{detail.HospitalLevelName}}
           </view>
+          <view class="medical" wx:if="{{detail.isReimbursement==1}}">
+            <image class="m-icon" src="{{imageUrl}}icon132.png?t={{Timestamp}}"></image>
+            医保
+          </view>
         </view>
         <view class="content">
           <view class="inner">
@@ -38,9 +42,7 @@
     </view>
     <view class="module" wx:if="{{detail.doctors && detail.doctors.length}}">
       <view class="module-container">
-        <view class="m-title">
-          <image class="m-title-img" src="{{imageUrl}}title10.png?t={{Timestamp}}"></image>
-        </view>
+        <view class="m-header">就诊医生</view>
         <view
           class="new-card"
           wx:for="{{detail.doctors}}"
@@ -72,6 +74,9 @@
         <pagination wx:if="{{!detail.doctors.length}}" pagination="{{pagination}}"></pagination>
       </view>
     </view>
+    <view class="page-footer" wx:if="{{detail.hospitalPolicyId}}">
+      <view class="pf-btn" bind:tap="handleMedical">查看医保信息</view>
+    </view>
   </view>
 </scroll-view>
 
diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss
index ff41fb1..0c14faa 100644
--- a/src/patient/pages/index/index.scss
+++ b/src/patient/pages/index/index.scss
@@ -17,112 +17,266 @@ page {
     .doctor {
       margin: $page-margin $page-margin 0;
       padding: 32rpx;
-      border-radius: 24rpx;
-      background: linear-gradient(195deg, #ffe3fc 0%, #ecddff 100%);
-      .container {
-        display: flex;
-        justify-content: space-between;
-        border-radius: 21rpx;
-        .avatar {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 24rpx;
+      .avatar {
+        position: relative;
+        flex-shrink: 0;
+        width: 108rpx;
+        height: 108rpx;
+        .a-img {
+          display: block;
+          width: 100%;
+          height: 100%;
+          border-radius: 50%;
+        }
+        .a-icon {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 28rpx;
+          height: 28rpx;
+        }
+      }
+      .wrap {
+        flex: 1;
+        .w-header {
+          display: flex;
+          align-items: baseline;
+          .name {
+            margin-right: 8rpx;
+            font-size: 36rpx;
+            color: #211d2e;
+            font-weight: bold;
+            max-width: 6em;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+          .label {
+            width: 172rpx;
+            height: 36rpx;
+          }
+        }
+        .w-content {
+          margin-top: 18rpx;
+          font-size: 28rpx;
+          color: #211d2e;
+          line-height: 32rpx;
+        }
+        .hostipal {
+          margin-top: 16rpx;
+          font-size: 28rpx;
+          color: #adacb2;
+          line-height: 36rpx;
+          overflow: hidden;
+          .h-content {
+            margin-right: 16rpx;
+            display: inline-block;
+            max-width: 10em;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          .tag {
+            display: inline-block;
+            padding: 6rpx 12rpx 4rpx;
+            font-size: 24rpx;
+            line-height: 1;
+            color: #f8a61b;
+            background: #fff4d2;
+            line-height: 24rpx;
+            border-radius: 8rpx 8rpx 8rpx 8rpx;
+          }
+        }
+      }
+      .more {
+        width: 48rpx;
+        height: 48rpx;
+      }
+    }
+    .kkd1 {
+      margin: $page-margin;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 30rpx;
+      .k-qol {
+        padding: 48rpx 32rpx 22rpx;
+        background: linear-gradient(
+          180deg,
+          rgba(239, 226, 255, 0.52) 0%,
+          rgba(255, 255, 255, 0.96) 26.03%,
+          #ffffff 100%
+        );
+        border-radius: 32rpx 32rpx 32rpx 32rpx;
+        border: 2rpx solid #ffffff;
+        .title {
+          font-size: 36rpx;
+          color: #211d2e;
+          line-height: 48rpx;
+          display: flex;
+          align-items: flex-start;
+          gap: 8rpx;
+          font-weight: bold;
+          .k-question {
+            width: 24rpx;
+            height: 24rpx;
+          }
+        }
+        .none {
+          margin: 30rpx -32rpx -100rpx;
+          width: 318rpx;
+          height: 170rpx;
+          display: block;
+        }
+        .content {
+          margin-top: 12rpx;
+          display: flex;
+          align-self: baseline;
+          justify-content: space-between;
+          .num {
+            white-space: nowrap;
+            font-size: 62rpx;
+            color: #ffa300;
+            font-weight: bold;
+            .sub {
+              font-size: 28rpx;
+              color: #69686e;
+              font-weight: normal;
+            }
+          }
+          .icon {
+            width: 96rpx;
+            height: 96rpx;
+          }
+        }
+        .k-footer {
+          margin-top: 34rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .date {
+            font-size: 32rpx;
+            color: #69686e;
+          }
+          .no-tip {
+            font-size: 28rpx;
+            color: rgba(76, 66, 107, 0.51);
+          }
+          .add {
+            flex-shrink: 0;
+            width: 76rpx;
+            height: 76rpx;
+          }
+        }
+      }
+      .k-hormones {
+        position: relative;
+        padding: 48rpx 32rpx 22rpx;
+        background: linear-gradient(
+          180deg,
+          rgba(239, 226, 255, 0.52) 0%,
+          rgba(255, 255, 255, 0.96) 26.03%,
+          #ffffff 100%
+        );
+        border-radius: 32rpx 32rpx 32rpx 32rpx;
+        border: 2rpx solid #ffffff;
+        .status {
+          position: absolute;
+          top: 10rpx;
+          right: 10rpx;
           width: 104rpx;
           height: 104rpx;
-          .a-img {
-            width: 100%;
-            height: 100%;
-            border-radius: 50%;
-            border: 3rpx solid #fff;
-            box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(52, 44, 46, 0.17);
+        }
+        .title {
+          position: relative;
+          z-index: 1;
+          font-size: 36rpx;
+          color: #211d2e;
+          line-height: 48rpx;
+          display: flex;
+          align-items: flex-start;
+          gap: 8rpx;
+          font-weight: bold;
+          .k-question {
+            width: 24rpx;
+            height: 24rpx;
           }
         }
-        .wrap {
-          padding: 6rpx 16rpx 0;
-          flex: 1;
-          .name-wrap {
-            display: flex;
-            .name {
-              position: relative;
-              font-size: 36rpx;
-              color: rgba(51, 51, 51, 1);
-              font-weight: bold;
-              display: flex;
-              align-items: center;
-              line-height: 40rpx;
-              .n-content {
-                max-width: 8em;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-              }
-              .bubble {
-                margin-left: 8rpx;
-                padding: 0 14rpx;
-                height: 30rpx;
-                line-height: 30rpx;
-                box-sizing: border-box;
-                text-align: center;
-                font-size: 22rpx;
-                color: rgba(255, 255, 255, 1);
-                background: #ee951b;
-                border-radius: 32rpx;
-                position: relative;
-                &::after {
-                  position: absolute;
-                  left: 14rpx;
-                  bottom: -8rpx;
-                  content: '';
-                  width: 0;
-                  height: 0;
-                  border-style: solid;
-                  border-width: 13rpx 13rpx 0 0;
-                  border-color: #ee951b transparent transparent transparent;
-                }
-              }
+        .none {
+          margin: 30rpx -32rpx -100rpx;
+          width: 318rpx;
+          height: 170rpx;
+          display: block;
+        }
+        .content {
+          margin-top: 12rpx;
+          display: flex;
+          align-self: baseline;
+          justify-content: space-between;
+          .num {
+            white-space: nowrap;
+            font-size: 62rpx;
+            color: #b982ff;
+            font-weight: bold;
+            .sub {
+              font-size: 28rpx;
+              color: #69686e;
+              font-weight: normal;
+              letter-spacing: normal;
             }
           }
-          .content {
-            margin-top: 16rpx;
+        }
+        .k-footer {
+          margin-top: 34rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .date {
             font-size: 32rpx;
-            line-height: 38rpx;
-            color: #211d2e;
-            .icon {
-              vertical-align: -4rpx;
-              display: inline-block;
-              width: 36rpx;
-              height: 36rpx;
-            }
+            color: #69686e;
           }
-          .hostipal {
-            margin-top: 16rpx;
+          .no-tip {
             font-size: 28rpx;
-            color: #999999;
-            line-height: 36rpx;
-            overflow: hidden;
-            .h-content {
-              margin-right: 16rpx;
-              display: inline;
-            }
-            .tag {
-              display: inline-block;
-              padding: 6rpx 12rpx 4rpx;
-              font-size: 22rpx;
-              line-height: 1;
-              color: #ffffff;
-              background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%);
-              line-height: 24rpx;
-              border-radius: 8rpx 8rpx 8rpx 8rpx;
-            }
+            color: rgba(76, 66, 107, 0.51);
+          }
+          .add {
+            flex-shrink: 0;
+            width: 76rpx;
+            height: 76rpx;
           }
         }
       }
-      .btn {
-        margin-top: 32rpx;
-        height: 64rpx;
-        font-size: 28rpx;
-        color: #ffffff;
-        text-align: center;
-        line-height: 64rpx;
-        background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%);
-        border-radius: 64rpx 64rpx 64rpx 64rpx;
+    }
+    .kkd2 {
+      margin: $page-margin;
+      display: flex;
+      align-items: center;
+      gap: 30rpx;
+      .k-item {
+        flex: 1;
+        background: linear-gradient(0, #ffffff 0%, #f8f3ff 100%);
+        border-radius: 32rpx 32rpx 32rpx 32rpx;
+        border: 2rpx solid #ffffff;
+        .wrap {
+          padding: 28rpx 0 40rpx 26rpx;
+          .title {
+            font-size: 36rpx;
+            color: #b982ff;
+            font-weight: bold;
+          }
+          .content {
+            margin-top: 8rpx;
+            font-size: 28rpx;
+            color: rgba(76, 66, 107, 0.51);
+          }
+        }
+        .icon {
+          width: 122rpx;
+          height: 134rpx;
+        }
       }
     }
     .qol {
diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts
index c671d28..2c92e47 100644
--- a/src/patient/pages/index/index.ts
+++ b/src/patient/pages/index/index.ts
@@ -7,6 +7,10 @@ Page({
   data: {
     today: dayjs().format('YYYY年MM月DD日 dddd'),
 
+    qolShow: false,
+    hormoneShow: false,
+    medicalInsuranceShow: false,
+    hospitalMapShow: false,
     configList: [],
     infoList: [] as any,
     zdUserInfo: {} as any,
@@ -14,7 +18,7 @@ Page({
     regGuide: true,
     isLogin: 1,
 
-    qolDetail: {},
+    qolDetail: {} as any,
     hormoneDetail: { recordId: '' },
 
     adlList: [],
@@ -33,6 +37,10 @@ Page({
     // toastType:"dedicatedDoctor",
     // toastType: 'public-toast',
     // toastType: 'drug-guide',
+    // toastType: 'medical-guide',
+    // toastType: 'question-toast',
+    // toastType: 'guideEnterInfo',
+    // toastType: 'guideEnterInfoJump',
 
     toastShow: false,
     toastType: '',
@@ -60,6 +68,13 @@ Page({
       })
     })
 
+    if (options.jump == '1') {
+      this.setData({
+        toastShow: true,
+        toastType: 'guideEnterInfoJump',
+      })
+    }
+
     this.setData({
       sliderTop: systemInfo.screenHeight - 160,
       options,
@@ -97,6 +112,8 @@ Page({
     })
   },
   async getPopup() {
+    if (this.data.toastShow)
+      return
     const data1 = await wx.ajax({
       method: 'GET',
       url: '?r=zd/popup/info',
@@ -110,6 +127,7 @@ Page({
         toastType: 'dedicatedDoctor',
         toastParams: {},
       })
+      return
     }
 
     const data2 = await wx.ajax({
@@ -125,6 +143,37 @@ Page({
         toastType: 'drug-guide',
         toastParams: {},
       })
+      return
+    }
+
+    const data3 = await wx.ajax({
+      method: 'GET',
+      url: '?r=zd/popup/get-popup',
+      data: {
+        type: 3,
+      },
+    })
+    if (data3.showAlert) {
+      this.setData({
+        toastShow: data3.showAlert,
+        toastType: 'medical-guide',
+        toastParams: {},
+      })
+    }
+
+    const data4 = await wx.ajax({
+      method: 'GET',
+      url: '?r=zd/popup/get-need-popup',
+      data: {
+        type: 1,
+      },
+    })
+    if (data4.showAlert) {
+      this.setData({
+        toastShow: data4.showAlert,
+        toastType: 'guideEnterInfo',
+        toastParams: {},
+      })
     }
   },
   getUnreadCount() {
@@ -150,43 +199,72 @@ Page({
     })
   },
   getConfig(zdUserInfo: any) {
-    let UserType = zdUserInfo.UserType
-    if (UserType <= 2) {
-      UserType = 1
-    }
+    // 处理用户类型
+    const UserType = zdUserInfo.UserType <= 2 ? 1 : Math.min(zdUserInfo.UserType, 3)
+
     wx.ajax({
       method: 'GET',
       url: `?r=zd/mini-conf/get-config`,
-      data: { userType: UserType > 3 ? 3 : UserType },
+      data: { userType: UserType },
     }).then((res) => {
-      res = res.map((item: any) => {
-        if (item.code == 'spread1' || item.code == 'spread2' || item.code == 'serviceConf') {
-          item.subList = item.subList.filter((subItem) => {
-            return subItem.showStatus == 1
-          })
+      // 过滤子列表
+      const processedRes = res.map((item: any) => {
+        if (['spread1', 'spread2', 'serviceConf'].includes(item.code)) {
+          item.subList = item.subList?.filter((subItem: any) => subItem.showStatus == 1) || []
         }
         return item
       })
-      this.setData({
-        configList: res,
-      })
-      res.forEach((item) => {
-        if (item.code == 'article') {
-          this.getInfoList(item.configId)
+
+      // 初始化显示状态
+      const statusMap = {
+        qolShow: false,
+        hormoneShow: false,
+        medicalInsuranceShow: false,
+        hospitalMapShow: false,
+      }
+
+      // 处理配置项
+      processedRes.forEach((item: any) => {
+        const { code, showStatus, configId, showNum } = item
+
+        // 设置显示状态
+        if (code === 'medicalInsurance' && showStatus == 1) {
+          statusMap.medicalInsuranceShow = true
         }
-        if (item.code == 'adl') {
-          this.getQol()
+        if (code === 'hospitalMap' && showStatus == 1) {
+          statusMap.hospitalMapShow = true
         }
-        if (item.code == 'hormone') {
-          this.getHormone()
+        if (code === 'adl' && showStatus == 1) {
+          statusMap.qolShow = true
         }
-        if (item.code == 'activity2') {
-          this.getActivity(item.configId, item.showNum, 'liveList')
+        if (code === 'hormone' && showStatus == 1) {
+          statusMap.hormoneShow = true
         }
-        if (item.code == 'activity1') {
-          this.getActivity(item.configId, item.showNum, 'liveDownList')
+
+        // 调用对应方法
+        switch (code) {
+          case 'article':
+            this.getInfoList(configId)
+            break
+          case 'adl':
+            this.getQol()
+            break
+          case 'hormone':
+            this.getHormone()
+            break
+          case 'activity2':
+            this.getActivity(configId, showNum, 'liveList')
+            break
+          case 'activity1':
+            this.getActivity(configId, showNum, 'liveDownList')
+            break
         }
       })
+
+      this.setData({
+        configList: processedRes,
+        ...statusMap,
+      })
     })
   },
   setPopupInfo() {
@@ -222,7 +300,8 @@ Page({
       this.setData({
         qolDetail: {
           ...res.newRecord,
-          CreateDate: dayjs(res.newRecord.CreateTime).format('YYYY-MM-DD'),
+          isTodayRecord: res.isTodayRecord,
+          CreateDate: dayjs(res.newRecord.CreateTime).format('MM-DD'),
         },
       })
     })
@@ -236,7 +315,7 @@ Page({
       this.setData({
         hormoneDetail: {
           ...res,
-          createTime: dayjs(res.createTime).format('YYYY-MM-DD'),
+          createTime: dayjs(res.createTime).format('MM-DD'),
         },
       })
     })
@@ -299,6 +378,21 @@ Page({
       },
     })
   },
+  handleAddQol() {
+    const { qolDetail } = this.data
+    const url = qolDetail.Id ? `/patient/pages/qolAdd/index?id=${qolDetail.Id}` : `/patient/pages/qol/index`
+    wx.navigateTo({
+      url,
+      success() {
+        if (qolDetail.isTodayRecord) {
+          wx.showToast({
+            icon: 'none',
+            title: '每日仅录入1次，您可修改选项',
+          })
+        }
+      },
+    })
+  },
   handleReg() {
     app.zdPermissionVerification(3, 0, '')
   },
@@ -342,6 +436,36 @@ Page({
       })
       this.handleToastCancel(null, false)
     }
+    else if (toastType === 'medical-guide') {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/add-record',
+        data: { type: 3 },
+      }).then(() => {
+        wx.navigateTo({
+          url: '/patient/pages/medical/index',
+        })
+      })
+      this.handleToastCancel(null, false)
+    }
+    else if (toastType === 'guideEnterInfo') {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      }).then(() => {
+        wx.navigateTo({
+          url: '/patient/pages/personalInformation/index',
+        })
+        this.handleToastCancel(null, false)
+      })
+    }
+    else if (toastType === 'guideEnterInfoJump') {
+      wx.navigateTo({
+        url: '/patient/pages/personalInformation/index',
+      })
+      this.handleToastCancel(null, false)
+    }
   },
   handleToastCancel(_e = null, sure = true) {
     const { toastType } = this.data
@@ -370,6 +494,20 @@ Page({
         data: { type: 1 },
       })
     }
+    else if (toastType === 'medical-guide' && sure) {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/add-record',
+        data: { type: 3 },
+      })
+    }
+    else if (toastType === 'guideEnterInfo' && sure) {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      })
+    }
 
     this.setData({
       toastShow: false,
@@ -433,4 +571,15 @@ Page({
       }
     })
   },
+  handleQuestionToast(e) {
+    const { type } = e.currentTarget.dataset
+    this.setData({
+      toastShow: true,
+      toastType: 'question-toast',
+      toastParams: {
+        content: { 1: '???', 2: '???' }[type],
+        close: true,
+      },
+    })
+  },
 })
diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml
index 8852c3a..0dd8bd1 100644
--- a/src/patient/pages/index/index.wxml
+++ b/src/patient/pages/index/index.wxml
@@ -7,39 +7,132 @@
 >
   <view class="page-container">
     <view
-      class="doctor"
       wx:if="{{zdUserInfo.ExclusiveDoctorId}}"
+      class="doctor"
+      style="background: url('{{imageUrl}}bg42.png?t={{Timestamp}}') no-repeat top center/100%"
       bind:tap="routerTo"
-      data-code="doctor"
-      style="background:#fff url({{imageUrl}}bg11.png?t={{Timestamp}}) no-repeat top center/100% 256rpx"
       data-url="/patient/pages/interactivePatient/index"
     >
-      <view class="container">
-        <view class="avatar">
-          <image class="a-img" mode="aspectFill" src="{{zdUserInfo.ExclusiveDoctorImg}}" alt=""></image>
+      <view class="avatar">
+        <image class="a-img" mode="aspectFill" src="{{zdUserInfo.ExclusiveDoctorImg}}" alt=""></image>
+        <image wx:if="{{unreadCount}}" class="a-icon" src="{{imageUrl}}icon119.png?t={{Timestamp}}"></image>
+      </view>
+      <view class="wrap">
+        <view class="w-header">
+          <view class="name">{{zdUserInfo.ExclusiveDoctorName}}</view>
+          <image class="label" src="{{imageUrl}}icon117.png?t={{Timestamp}}"></image>
         </view>
-        <view class="wrap">
-          <view class="name-wrap">
-            <view class="name">
-              <view class="n-content">{{zdUserInfo.ExclusiveDoctorName}}</view>
-            </view>
+        <view class="w-content" wx:if="{{unreadCount}}">医生给您留言了,记得查看！</view>
+        <view class="hostipal" wx:else>
+          <view class="h-content">{{zdUserInfo.ExclusiveDoctorHospitalName}}</view>
+          <view
+            class="tag"
+            wx:if="{{zdUserInfo.ExclusiveDoctorHospitalClassificationName || zdUserInfo.ExclusiveDoctorHospitalLevelName}}"
+          >
+            {{zdUserInfo.ExclusiveDoctorHospitalClassificationName}}{{zdUserInfo.ExclusiveDoctorHospitalLevelName}}
           </view>
-          <view class="content" wx:if="{{unreadCount}}">
-            医生给您留言了,记得查看！
-            <image class="icon" src="{{imageUrl}}/icon31.png?t={{Timestamp}}"></image>
+        </view>
+      </view>
+      <image class="more" src="{{imageUrl}}icon118.png?t={{Timestamp}}"></image>
+    </view>
+    <view class="kkd1" wx:if="{{qolShow && hormoneShow}}">
+      <view class="k-qol" bind:tap="routerTo" data-url="/patient/pages/qolReport/index">
+        <view class="title" catch:tap="handleQuestionToast" data-type="1">
+          生活质量自评
+          <image class="k-question" src="{{imageUrl}}icon120.png?t={{Timestamp}}"></image>
+        </view>
+        <view class="content" wx:if="{{qolDetail.TotalScore}}">
+          <view class="num">
+            {{qolDetail.TotalScore}}
+            <text class="sub">分</text>
           </view>
-          <view class="hostipal" wx:else>
-            <view class="h-content">{{zdUserInfo.ExclusiveDoctorHospitalName}}</view>
-            <view
-              class="tag"
-              wx:if="{{zdUserInfo.ExclusiveDoctorHospitalClassificationName || zdUserInfo.ExclusiveDoctorHospitalLevelName}}"
-            >
-              {{zdUserInfo.ExclusiveDoctorHospitalClassificationName}}{{zdUserInfo.ExclusiveDoctorHospitalLevelName}}
-            </view>
+          <image
+            wx:if="{{qolDetail.TotalScore>=80}}"
+            class="icon"
+            src="{{imageUrl}}icon123.png?t={{Timestamp}}"
+          ></image>
+          <image
+            wx:elif="{{qolDetail.TotalScore>=40}}"
+            class="icon"
+            src="{{imageUrl}}icon121.png?t={{Timestamp}}"
+          ></image>
+          <image wx:else class="icon" src="{{imageUrl}}icon122.png?t={{Timestamp}}"></image>
+        </view>
+        <image class="none" wx:else src="{{imageUrl}}bg44.png?t={{Timestamp}}"></image>
+        <view class="k-footer">
+          <view class="date" wx:if="{{qolDetail.TotalScore}}">
+            <block wx:if="{{qolDetail.CreateTime}}">最近:{{qolDetail.CreateDate}}</block>
           </view>
+          <view class="no-tip" wx:else>记录主观感受</view>
+          <image class="add" catch:tap="handleAddQol" src="{{imageUrl}}icon127.png?t={{Timestamp}}"></image>
+        </view>
+      </view>
+      <view class="k-hormones" bind:tap="routerTo" data-url="/patient/pages/qolReport/index?scrollId=proit-hormone">
+        <image
+          class="status"
+          wx:if="{{hormoneDetail.medicationMethod==1}}"
+          src="{{imageUrl}}icon124.png?t={{Timestamp}}"
+        ></image>
+        <image
+          class="status"
+          wx:elif="{{hormoneDetail.medicationMethod==2}}"
+          src="{{imageUrl}}icon125.png?t={{Timestamp}}"
+        ></image>
+        <image
+          class="status"
+          wx:elif="{{hormoneDetail.medicationMethod==3}}"
+          src="{{imageUrl}}icon126.png?t={{Timestamp}}"
+        ></image>
+        <view class="title" catch:tap="handleQuestionToast" data-type="2">
+          激素记录
+          <image class="k-question" src="{{imageUrl}}icon120.png?t={{Timestamp}}"></image>
+        </view>
+        <view class="content" wx:if="{{hormoneDetail.dosage}}">
+          <view class="num">
+            {{hormoneDetail.dosage}}
+            <text class="sub">mg/周</text>
+          </view>
+        </view>
+        <image class="none" wx:else src="{{imageUrl}}bg45.png?t={{Timestamp}}"></image>
+        <view class="k-footer">
+          <view class="date" wx:if="{{hormoneDetail.dosage}}">最近:{{hormoneDetail.createTime}}</view>
+          <view class="no-tip" wx:else>关注不良反应</view>
+          <image
+            class="add"
+            wx:if="{{hormoneDetail.recordId>0}}"
+            catch:tap="routerTo"
+            data-url="/patient/pages/hormones/index?id={{hormoneDetail.recordId}}"
+            src="{{imageUrl}}icon127.png?t={{Timestamp}}"
+          ></image>
+          <image
+            class="add"
+            wx:else
+            catch:tap="routerTo"
+            data-url="/patient/pages/hormonesStart/index"
+            src="{{imageUrl}}icon127.png?t={{Timestamp}}"
+          ></image>
+        </view>
+      </view>
+    </view>
+    <view class="kkd2" wx:if="{{medicalInsuranceShow && hospitalMapShow}}">
+      <view class="k-item" bind:tap="routerTo" data-url="/patient/pages/doctor/index">
+        <view
+          class="wrap"
+          style="background: url('{{imageUrl}}icon128.png?t={{Timestamp}}') no-repeat bottom right/122rpx 134rpx"
+        >
+          <view class="title">就诊地图</view>
+          <view class="content">附近的医院</view>
+        </view>
+      </view>
+      <view class="k-item" bind:tap="routerTo" data-url="/patient/pages/medical/index">
+        <view
+          class="wrap"
+          style="background: url('{{imageUrl}}icon129.png?t={{Timestamp}}') no-repeat bottom right/122rpx 134rpx"
+        >
+          <view class="title">医保查询</view>
+          <view class="content">政策轻松查询</view>
         </view>
       </view>
-      <view class="btn">{{unreadCount ? '去看看':'去咨询'}}</view>
     </view>
     <block wx:for="{{configList}}" wx:key="index" wx:for-item="card" wx:for-index="cIndex">
       <view
@@ -66,34 +159,6 @@
           </swiper-item>
         </swiper>
       </view>
-      <view
-        class="qol"
-        wx:if="{{card.code == 'adl' && card.showStatus == 1}}"
-        style="background: url('{{imageUrl}}bg41.png?t={{Timestamp}}') no-repeat top center/100%"
-        bind:tap="routerTo"
-        data-url="/patient/pages/qolReport/index"
-      >
-        <view class="date" wx:if="{{qolDetail.CreateTime}}">最近记录 {{qolDetail.CreateDate}}</view>
-        <view class="btn" catch:tap="routerTo" data-url="/patient/pages/qol/index"></view>
-      </view>
-      <view
-        class="hormones"
-        wx:if="{{card.code == 'hormone' && card.showStatus == 1}}"
-        style="background: url('{{imageUrl}}bg36.png?t={{Timestamp}}') no-repeat top center/100%"
-        bind:tap="routerTo"
-        data-url="/patient/pages/qolReport/index?scrollId=proit-hormone"
-      >
-        <view class="date" wx:if="{{hormoneDetail && hormoneDetail.createTime}}">
-          最近记录 {{hormoneDetail.createTime}}
-        </view>
-        <view
-          wx:if="{{hormoneDetail.recordId>0}}"
-          class="btn"
-          catch:tap="routerTo"
-          data-url="/patient/pages/hormones/index?id={{hormoneDetail.recordId}}"
-        ></view>
-        <view wx:else class="btn" catch:tap="routerTo" data-url="/patient/pages/hormonesStart/index"></view>
-      </view>
       <view class="live-up-new" wx:if="{{card.code == 'activity2' && card.showStatus == 1 }}">
         <view class="header" wx:if="{{card.name}}">
           <view class="title">{{card.name}}</view>
@@ -209,25 +274,6 @@
           </swiper-item>
         </swiper>
       </view>
-      <view class="new-server" wx:if="{{card.code == 'serviceConf' && card.showStatus == 1}}">
-        <view class="title" wx:if="{{card.name}}">{{card.name}}</view>
-        <image
-          class="one-card"
-          wx:if="{{card.subList.length==1}}"
-          src="{{card.subList[0].img}}"
-          bind:tap="routerTo"
-          data-url="{{card.subList[0].linkUrl}}"
-          data-code="{{card.subList[0].code}}"
-        ></image>
-        <view class="list" wx:else>
-          <block wx:for="{{card.subList}}" wx:key="index">
-            <view class="item" bind:tap="routerTo" data-url="{{item.linkUrl}}" data-code="{{card.code}}">
-              <image class="icon" src="{{item.img}}"></image>
-              <view class="name">{{item.title}}</view>
-            </view>
-          </block>
-        </view>
-      </view>
     </block>
   </view>
 
diff --git a/src/patient/pages/live/index.wxml b/src/patient/pages/live/index.wxml
index ded621c..ff6e86a 100644
--- a/src/patient/pages/live/index.wxml
+++ b/src/patient/pages/live/index.wxml
@@ -16,27 +16,27 @@
     />
     <van-icon class="clear extend-via-pseudo-elem" wx:if="{{Search}}" name="clear" bind:tap="handleClear" />
   </view>
-  <view class="sticky">
-    <view class="tags">
-      <view class="scroll">
-        <view class="tag {{!CateId &&'active'}}" bind:tap="handleCate" data-id="">全部</view>
-        <view
-          class="tag {{CateId == item.CateId &&'active'}}"
-          wx:for="{{cateList}}"
-          wx:key="CateId"
-          bind:tap="handleCate"
-          data-id="{{item.CateId}}"
-        >
-          {{item.CateName}}
-        </view>
-        <view class="site" bind:tap="handleToggleSite" wx:if="{{active==1}}">
-          <image class="icon" wx:if="{{LNG}}" src="{{imageUrl}}za-images/1/select-active.png?t={{Timestamp}}"></image>
-          <image class="icon" wx:else src="{{imageUrl}}za-images/1/select.png?t={{Timestamp}}"></image>
-          距离最近
-        </view>
-      </view>
-    </view>
-  </view>
+  <!-- <view class="sticky"> -->
+  <!--   <view class="tags"> -->
+  <!--     <view class="scroll"> -->
+  <!--       <view class="tag {{!CateId &&'active'}}" bind:tap="handleCate" data-id="">全部</view> -->
+  <!--       <view -->
+  <!--         class="tag {{CateId == item.CateId &&'active'}}" -->
+  <!--         wx:for="{{cateList}}" -->
+  <!--         wx:key="CateId" -->
+  <!--         bind:tap="handleCate" -->
+  <!--         data-id="{{item.CateId}}" -->
+  <!--       > -->
+  <!--         {{item.CateName}} -->
+  <!--       </view> -->
+  <!--       <view class="site" bind:tap="handleToggleSite" wx:if="{{active==1}}"> -->
+  <!--         <image class="icon" wx:if="{{LNG}}" src="{{imageUrl}}za-images/1/select-active.png?t={{Timestamp}}"></image> -->
+  <!--         <image class="icon" wx:else src="{{imageUrl}}za-images/1/select.png?t={{Timestamp}}"></image> -->
+  <!--         距离最近 -->
+  <!--       </view> -->
+  <!--     </view> -->
+  <!--   </view> -->
+  <!-- </view> -->
   <view class="info-list" wx:if="{{active==0}}">
     <view class="list-item" wx:for="{{list}}" bind:tap="handleDetail" data-id="{{item.Id}}" wx:key="index">
       <view class="photo-wrap">
diff --git a/src/patient/pages/liveDetail/index.json b/src/patient/pages/liveDetail/index.json
index 69dabe5..72e4c31 100644
--- a/src/patient/pages/liveDetail/index.json
+++ b/src/patient/pages/liveDetail/index.json
@@ -9,6 +9,7 @@
     "navbar": "/components/navbar/index",
     "van-popup": "@vant/weapp/popup/index",
     "popup": "/components/popup/index",
-    "van-count-down": "@vant/weapp/count-down/index"
+    "van-count-down": "@vant/weapp/count-down/index",
+    "toast": "/components/toast/index"
   }
 }
diff --git a/src/patient/pages/liveDetail/index.ts b/src/patient/pages/liveDetail/index.ts
index c2bbc13..05620c9 100644
--- a/src/patient/pages/liveDetail/index.ts
+++ b/src/patient/pages/liveDetail/index.ts
@@ -24,10 +24,17 @@ Page({
 
     popupShow: false,
     popupType: 'popup6', // 登录失败弹窗
+    // popupType: 'popup14', // 切换医生端弹窗
     popupParams: {
       close: true,
     } as any,
 
+    toastShow: false,
+    toastType: '',
+    // toastType: 'guideEnterInfo',
+    // toastType: 'guideEnterInfoJump',
+    toastParams: {} as any,
+
     answer: false,
     isAnswer: false,
   },
@@ -37,6 +44,12 @@ Page({
       id: options.id,
       answer: options.answer === '1',
     })
+    if (options.jump == '1') {
+      this.setData({
+        popupShow: true,
+        popupType: 'popup15',
+      })
+    }
     if (options.scene) {
       const optionsScene: any = parseScene(options.scene)
       this.setData({
@@ -66,7 +79,13 @@ Page({
     app.waitLogin({ type: [0, 1, 2] }).then(() => {
       // 拦截医生直接访问直播详情页
       if (app.globalData.loginType == 2 && app.globalData.isLogin == 1) {
-        this.doctorLoginOut()
+        this.setData({
+          popupShow: true,
+          popupType: 'popup14',
+          popupParams: {
+            close: true,
+          },
+        })
         return
       }
       app.mpBehavior({
@@ -77,39 +96,43 @@ Page({
       this.getDetail()
       this.setView()
       this.getLightList()
+      this.getPopup()
       app.getZdUserInfo(this, true, () => {
         this.getPosterParams()
       })
     })
   },
-  doctorLoginOut() {
-    wx.showModal({
-      title: '访问直播活动页需切换至患者端',
-      content: '请问是否继续',
-      confirmColor: '#8c75d0',
-      cancelText: '取消',
-      confirmText: '继续',
-      success: (res) => {
-        if (res.confirm) {
-          wx.ajax({
-            method: 'POST',
-            url: '?r=xd/user/reg-logout',
-            data: {},
-          }).then(() => {
-            app.startLogin(() => {
-              wx.restartMiniProgram({
-                path: `/patient/pages/liveDetail/index?id=${this.data.id}`,
-              })
-            })
-          })
-        }
-        if (res.cancel) {
-          wx.reLaunch({
-            url: '/pages/home/index',
-          })
-        }
+  async getPopup() {
+    if (this.data.toastShow)
+      return
+
+    const data1 = await wx.ajax({
+      method: 'GET',
+      url: '?r=zd/popup/get-need-popup',
+      data: {
+        type: 1,
       },
     })
+    if (data1.showAlert) {
+      this.setData({
+        toastShow: data1.showAlert,
+        toastType: 'guideEnterInfo',
+        toastParams: {},
+      })
+    }
+  },
+  doctorLoginOut() {
+    wx.ajax({
+      method: 'POST',
+      url: '?r=xd/user/reg-logout',
+      data: {},
+    }).then(() => {
+      app.startLogin(() => {
+        wx.restartMiniProgram({
+          path: `/patient/pages/liveDetail/index?id=${this.data.id}`,
+        })
+      })
+    })
   },
   onReady() {
     this.videoContext = wx.createVideoContext('video')
@@ -481,11 +504,67 @@ Page({
       })
     })
   },
+  handlePopupOk() {
+    const { popupType } = this.data
+    if (popupType === 'popup14') {
+      this.doctorLoginOut()
+    }
+    if (popupType === 'popup15') {
+      this.doctorLoginOut()
+    }
+    this.setData({
+      popupShow: false,
+    })
+  },
   handlePopupCancel() {
+    const { popupType } = this.data
+    if (popupType === 'popup14') {
+      wx.reLaunch({
+        url: '/pages/home/index',
+      })
+    }
+
     this.setData({
       popupShow: false,
     })
   },
+  handleToastOk() {
+    const { toastType } = this.data
+    if (toastType === 'guideEnterInfo') {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      }).then(() => {
+        wx.navigateTo({
+          url: '/patient/pages/personalInformation/index',
+        })
+        this.handleToastCancel(null, false)
+      })
+    }
+    else if (toastType === 'guideEnterInfoJump') {
+      wx.navigateTo({
+        url: '/patient/pages/personalInformation/index',
+      })
+      this.handleToastCancel(null, false)
+    }
+  },
+  handleToastCancel(_e = null, sure = true) {
+    const { toastType } = this.data
+    if (toastType === 'guideEnterInfo' && sure) {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      })
+    }
+
+    this.setData({
+      toastShow: false,
+      toastType: '',
+      toastParams: '',
+    })
+  },
   handleAnswer() {
     const link = this.data.detail.QuestionnaireUrl
     wx.navigateTo({
diff --git a/src/patient/pages/liveDetail/index.wxml b/src/patient/pages/liveDetail/index.wxml
index 01c7884..02da9ab 100644
--- a/src/patient/pages/liveDetail/index.wxml
+++ b/src/patient/pages/liveDetail/index.wxml
@@ -151,7 +151,9 @@
         已满额
       </view>
       <view class="btn active" wx:elif="{{detail.SignUpDeadlineValue * 1 < dateValue * 1}}">报名已截止</view>
-      <view class="btn" wx:elif="{{detail.BeginTimeValue * 1 < dateValue * 1}}" bind:tap="handleSignUpLive">点此进入</view>
+      <view class="btn" wx:elif="{{detail.BeginTimeValue * 1 < dateValue * 1}}" bind:tap="handleSignUpLive">
+        点此进入
+      </view>
       <view class="btn" wx:else bind:tap="handleSignUp">报名</view>
     </block>
   </view>
@@ -199,3 +201,11 @@
   bind:ok="handlePopupOk"
   bind:cancel="handlePopupCancel"
 ></popup>
+
+<toast
+  bind:cancel="handleToastCancel"
+  bind:ok="handleToastOk"
+  show="{{toastShow}}"
+  type="{{toastType}}"
+  params="{{toastParams}}"
+></toast>
diff --git a/src/patient/pages/liveDetailVideo/index.ts b/src/patient/pages/liveDetailVideo/index.ts
index 48e683e..169cb9d 100644
--- a/src/patient/pages/liveDetailVideo/index.ts
+++ b/src/patient/pages/liveDetailVideo/index.ts
@@ -25,6 +25,7 @@ Page({
 
     offsetTop: 310,
   },
+  videoContexts: {} as any,
   onLoad(options) {
     this.setData({
       id: options.id,
@@ -43,15 +44,35 @@ Page({
     }).then((res) => {
       res.map((item: any) => {
         item.duration = dayjs(item.duration * 1000).format('mm:ss')
+        item.preload = false
         return item
       })
       this.setData({
         videoList: res,
         current: this.data.index,
       })
+      this.preloadVideos(this.data.index)
       this.playCurrentVideo()
     })
   },
+  preloadVideos(currentIndex: number) {
+    const { videoList } = this.data
+    const newVideoList = [...videoList]
+
+    // 只预加载当前和前后各一个视频
+    newVideoList.forEach((item: any, index: number) => {
+      if (Math.abs(index - currentIndex) <= 1) {
+        item.preload = true
+      }
+      else {
+        item.preload = false
+      }
+    })
+
+    this.setData({
+      videoList: newVideoList,
+    })
+  },
   handleChange(e: any) {
     const { beforeLoading, afterLoading, beforeEnd, afterEnd, videoList } = this.data
     const { current } = e.detail
@@ -71,22 +92,26 @@ Page({
       })
       // this.getList('after')
     }
+    this.preloadVideos(current)
     this.playCurrentVideo()
   },
   playCurrentVideo() {
     const { current, videoList } = this.data
-    videoList.forEach((item: any, index: number) => {
-      if (!item.ctx) {
-        item.ctx = wx.createVideoContext(`video-${item.attachmentId}`)
-      }
-      item.drag = false
-      if (index === current) {
-        item.ctx.play()
-      }
-      else {
-        item.ctx.pause()
-      }
+
+    // 暂停所有视频
+    Object.values(this.videoContexts).forEach((ctx: any) => {
+      ctx.pause()
     })
+
+    // 播放当前视频
+    const currentVideo = videoList[current]
+    if (currentVideo) {
+      const videoId = `video-${currentVideo.attachmentId}`
+      if (!this.videoContexts[videoId]) {
+        this.videoContexts[videoId] = wx.createVideoContext(videoId)
+      }
+      this.videoContexts[videoId].play()
+    }
   },
   handleFullScreenChange(e) {
     const { index } = e.currentTarget.dataset
@@ -97,8 +122,10 @@ Page({
   },
   handelFullScreen(e) {
     const { id } = e.currentTarget.dataset
-    const context = wx.createVideoContext(id)
-    context.requestFullScreen({})
+    if (!this.videoContexts[id]) {
+      this.videoContexts[id] = wx.createVideoContext(id)
+    }
+    this.videoContexts[id].requestFullScreen({})
   },
   handleLoadedMetaData(e) {
     const { index } = e.currentTarget.dataset
@@ -144,11 +171,18 @@ Page({
   handleTogglePlay(e) {
     const { index } = e.currentTarget.dataset
     const { videoList } = this.data
-    if (videoList[index].play) {
-      videoList[index].ctx.pause()
+    const video = videoList[index]
+    const videoId = `video-${video.attachmentId}`
+
+    if (!this.videoContexts[videoId]) {
+      this.videoContexts[videoId] = wx.createVideoContext(videoId)
+    }
+
+    if (video.play) {
+      this.videoContexts[videoId].pause()
     }
     else {
-      videoList[index].ctx.play()
+      this.videoContexts[videoId].play()
     }
   },
   handleDragStart(e: any) {
@@ -161,10 +195,17 @@ Page({
   handleDragEnd(e: any) {
     const { index } = e.currentTarget.dataset
     const { videoList } = this.data
-    const duration = videoList[index].duration
+    const video = videoList[index]
+    const duration = video.duration
     const drapProgress = e.detail
     const currentTime = (drapProgress / 100) * duration
-    videoList[index].ctx.seek(currentTime)
+
+    const videoId = `video-${video.attachmentId}`
+    if (!this.videoContexts[videoId]) {
+      this.videoContexts[videoId] = wx.createVideoContext(videoId)
+    }
+    this.videoContexts[videoId].seek(currentTime)
+
     const dragKey = `videoList[${index}].drag`
     this.setData({
       [dragKey]: false,
diff --git a/src/patient/pages/liveDetailVideo/index.wxml b/src/patient/pages/liveDetailVideo/index.wxml
index 0db1be5..f07cb99 100644
--- a/src/patient/pages/liveDetailVideo/index.wxml
+++ b/src/patient/pages/liveDetailVideo/index.wxml
@@ -8,7 +8,7 @@
       <video
         id="video-{{item.attachmentId}}"
         class="video"
-        src="{{item.videoUrl}}"
+        src="{{item.preload ? item.videoUrl : ''}}"
         poster="{{item.imgUrl}}"
         loop
         title="{{item.title}}"
diff --git a/src/patient/pages/medical/index.ts b/src/patient/pages/medical/index.ts
index faf4821..733197d 100644
--- a/src/patient/pages/medical/index.ts
+++ b/src/patient/pages/medical/index.ts
@@ -1,29 +1,60 @@
-const _app = getApp<IAppOption>()
+const app = getApp<IAppOption>()
 
 Page({
   data: {
-    ProvinceName: '',
-    ProvinceId: '',
-    CityName: '',
-    CityId: '',
+    bannerList: [],
+
+    provinceName: '',
+    provinceId: '',
+    cityName: '',
+    cityId: '',
 
     hostipalName: '',
     hostipalId: '',
-    hostipalList: [
-      {
-        id: '1',
-        name: '北京医院',
-      },
-    ],
+    hospitalPolicyId: '',
+    hostipalList: [] as any[],
+  },
+  onLoad() {
+    app.waitLogin({ type: [1] }).then(() => {
+      this.getBanner()
+    })
+  },
+  getBanner() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/hospital-policy/get-intro-list',
+      data: {},
+    }).then((res) => {
+      this.setData({
+        bannerList: res,
+      })
+    })
   },
-  onLoad() {},
   handleChangeSite(e: WechatMiniprogram.CustomEvent) {
     const detail = e.detail
     this.setData({
-      ProvinceId: detail.ProvinceId,
-      ProvinceName: detail.ProvinceName,
-      CityId: detail.CityId,
-      CityName: detail.CityName,
+      provinceId: detail.ProvinceId,
+      provinceName: detail.ProvinceName,
+      cityId: detail.CityId,
+      cityName: detail.CityName,
+    })
+    this.getHosList()
+  },
+  getHosList() {
+    const { provinceId, cityId } = this.data
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/hospital-policy/get-hospital-list',
+      data: {
+        provinceId,
+        cityId,
+      },
+    }).then((res) => {
+      this.setData({
+        hostipalList: res.map((item) => {
+          return { id: item.hospitalId, name: item.hospitalName, pId: item.hospitalPolicyId }
+        }),
+      })
     })
   },
   handleChange(e) {
@@ -32,6 +63,7 @@ Page({
     this.setData({
       hostipalName: hItem.name,
       hostipalId: hItem.id,
+      hospitalPolicyId: hItem.pId,
     })
   },
   handleHostipalDisable() {
@@ -49,9 +81,18 @@ Page({
       return
     }
     wx.navigateTo({
-      url: '/patient/pages/medicalDetail/index',
+      url: `/patient/pages/medicalDetail/index?id=${this.data.hospitalPolicyId}`,
     })
   },
+  handleInfo(e) {
+    const { id } = e.currentTarget.dataset
+    wx.navigateTo({
+      url: `/patient/pages/repositoryDetail/index?id=${id}`,
+    })
+  },
+  handleBack() {
+    wx.navigateBack()
+  },
 })
 
 export {}
diff --git a/src/patient/pages/medical/index.wxml b/src/patient/pages/medical/index.wxml
index 9b85ed6..b60ea7e 100644
--- a/src/patient/pages/medical/index.wxml
+++ b/src/patient/pages/medical/index.wxml
@@ -3,17 +3,17 @@
 </navbar>
 <view
   class="page"
-  style="background: url('/images/bg27.png') no-repeat top center/100% 546rpx;padding-top: {{pageTop}}px;"
+  style="background: url('{{imageUrl}}bg27.png?t={{Timestamp}}') no-repeat top center/100% 546rpx;padding-top: {{pageTop}}px;"
 >
   <view class="page-title">医保报销查询</view>
   <view class="page-sub-title">
-    <image class="icon" src="/images/icon110.png"></image>
+    <image class="icon" src="{{imageUrl}}icon110.png?t={{Timestamp}}"></image>
     医保政策轻松查询
   </view>
   <view class="form">
     <view class="form-item">
       <view class="title">
-        <image class="icon" src="/images/icon111.png"></image>
+        <image class="icon" src="{{imageUrl}}icon111.png?t={{Timestamp}}"></image>
         我的医保所在城市
       </view>
       <pickerArea
@@ -24,7 +24,7 @@
         bind:ok="handleChangeSite"
       >
         <view class="picker-content">
-          <block wx:if="{{ProvinceName}}">{{ProvinceName}}{{CityName}}</block>
+          <block wx:if="{{provinceName}}">{{provinceName}}{{cityName}}</block>
           <block wx:else>选择省份城市</block>
           <van-icon name="arrow-down" />
         </view>
@@ -32,7 +32,7 @@
     </view>
     <view class="form-item">
       <view class="title">
-        <image class="icon" src="/images/icon111.png"></image>
+        <image class="icon" src="{{imageUrl}}icon111.png?t={{Timestamp}}"></image>
         我就诊的医院
       </view>
       <picker mode="selector" range="{{hostipalList}}" range-key="name" bind:change="handleChange">
@@ -40,18 +40,26 @@
           <block wx:if="{{hostipalName}}">{{hostipalName}}</block>
           <block wx:else>选择就诊医院</block>
           <van-icon name="arrow-down" />
-          <view wx:if="{{!ProvinceId}}" class="disable" catch:tap="handleHostipalDisable"></view>
+          <view wx:if="{{!provinceId}}" class="disable" catch:tap="handleHostipalDisable"></view>
         </view>
       </picker>
     </view>
     <view class="submit-btn" bind:tap="handleSubmit">医保查询</view>
   </view>
-  <view class="list">
+  <view class="list" wx:if="{{bannerList.length}}">
     <view class="list-title">
-      <image class="icon" src="/images/icon112.png"></image>
+      <image class="icon" src="{{imageUrl}}icon112.png?t={{Timestamp}}"></image>
       <view class="content">关于替妥尤单抗</view>
-      <image class="icon icon-rotate" src="/images/icon112.png"></image>
+      <image class="icon icon-rotate" src="{{imageUrl}}icon112.png?t={{Timestamp}}"></image>
     </view>
-    <image class="card" src="/images/bg1.png"></image>
+    <image
+      wx:for="{{bannerList}}"
+      wx:key="id"
+      class="card"
+      mode="aspectFill"
+      src="{{item.bannerImg}}"
+      bind:tap="handleInfo"
+      data-id="{{item.picTextId}}"
+    ></image>
   </view>
 </view>
diff --git a/src/patient/pages/medicalDetail/index.scss b/src/patient/pages/medicalDetail/index.scss
index 272f57d..6e5f9e6 100644
--- a/src/patient/pages/medicalDetail/index.scss
+++ b/src/patient/pages/medicalDetail/index.scss
@@ -125,14 +125,21 @@ page {
     }
     .tip {
       margin-top: 32rpx;
-      font-size: 28rpx;
-      color: #211d2e;
+      font-size: 32rpx;
+      color: #b982ff;
     }
     .feedback {
       margin: 24rpx 0 0;
       font-size: 32rpx;
       color: #b982ff;
-      text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 12rpx;
+      .icon {
+        width: 44rpx;
+        height: 44rpx;
+      }
     }
   }
   .page-footer {
diff --git a/src/patient/pages/medicalDetail/index.ts b/src/patient/pages/medicalDetail/index.ts
index 040a6a5..804a00a 100644
--- a/src/patient/pages/medicalDetail/index.ts
+++ b/src/patient/pages/medicalDetail/index.ts
@@ -1,4 +1,4 @@
-const _app = getApp<IAppOption>()
+const app = getApp<IAppOption>()
 
 Page({
   data: {
@@ -10,8 +10,40 @@ Page({
     popupParams: {
       close: true,
     } as any,
+
+    id: '',
+    detail: {} as any,
+    medicationMethods: '',
+  },
+  onLoad(options) {
+    this.setData({
+      id: options.id,
+    })
+    app.waitLogin({ type: [1] }).then(() => {
+      this.getDetail()
+    })
+  },
+  getDetail() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=xd/hospital-policy/get-detail',
+      data: {
+        hospitalPolicyId: this.data.id,
+      },
+    }).then((res) => {
+      const medicationMethods = this.formatMedicationMethods(res.medicationMethodList)
+      this.setData({
+        detail: res,
+        medicationMethods,
+      })
+    })
+  },
+  formatMedicationMethods(medicationMethodList: any[]) {
+    if (!medicationMethodList || medicationMethodList.length === 0) {
+      return ''
+    }
+    return medicationMethodList.map(item => item.medicationMethodName).join('、')
   },
-  onLoad() {},
   handleInfo() {
     this.setData({
       popupShow: true,
@@ -19,9 +51,17 @@ Page({
     })
   },
   handleFeedback() {
-    wx.showToast({
-      title: '已收到您的报错反馈',
-      icon: 'none',
+    wx.ajax({
+      method: 'POST',
+      url: '?r=xd/hospital-policy/add-feedback',
+      data: {
+        hospitalId: this.data.detail.hospitalId || '',
+      },
+    }).then(() => {
+      wx.showToast({
+        title: '已收到您的报错反馈',
+        icon: 'none',
+      })
     })
   },
   handleConsult() {
@@ -36,7 +76,7 @@ Page({
   },
   handlePhone() {
     wx.makePhoneCall({
-      phoneNumber: '123',
+      phoneNumber: this.data.detail.telephone,
     })
     this.onClose()
   },
@@ -44,12 +84,17 @@ Page({
     this.setData({
       popupShow: true,
       popupType: 'popup12',
+      popupParams: {
+        imgs: this.data.detail.imgs || [],
+        consultImg: this.data.detail.consultImg || '',
+        close: true,
+      },
     })
     this.onClose()
   },
   handleHostipal() {
     wx.navigateTo({
-      url: `/patient/pages/hospital/index?id=1`,
+      url: `/patient/pages/hospital/index?id=${this.data.detail.hospitalId || ''}`,
     })
   },
   handlePopupOk() {
@@ -63,6 +108,9 @@ Page({
       popupShow: false,
     })
   },
+  handleBack() {
+    wx.navigateBack()
+  },
 })
 
 export {}
diff --git a/src/patient/pages/medicalDetail/index.wxml b/src/patient/pages/medicalDetail/index.wxml
index 14bffe7..39a0457 100644
--- a/src/patient/pages/medicalDetail/index.wxml
+++ b/src/patient/pages/medicalDetail/index.wxml
@@ -4,47 +4,48 @@
 <view class="page" style="padding-top: {{pageTop+60}}px;">
   <view class="banner">
     <view class="badge">
-      <image class="b-img" src="/images/bg1.png"></image>
+      <image class="b-img" src="{{detail.imgs || '{{imageUrl}}bg1.png?t={{Timestamp}}'}}"></image>
     </view>
-    <view class="name">北京同仁医院(崇文门院区)</view>
-    <view class="title" style="background: url('/images/bg28.png') no-repeat top left/52rpx 52rpx">用药方式</view>
+    <view class="name">{{detail.hospitalName || ''}}</view>
+    <view class="title" style="background: url('{{imageUrl}}bg28.png?t={{Timestamp}}') no-repeat top left/52rpx 52rpx">用药方式</view>
     <view class="content" bind:tap="handleInfo">
-      双通道
-      <image class="icon" src="/images/icon113.png"></image>
+      {{medicationMethods}}
+      <image class="icon" src="{{imageUrl}}icon113.png?t={{Timestamp}}"></image>
     </view>
   </view>
   <view class="container">
-    <view class="c-header" style="background: url('/images/bg28.png') no-repeat top left/52rpx 52rpx">
+    <view class="c-header" style="background: url('{{imageUrl}}bg28.png?t={{Timestamp}}') no-repeat top left/52rpx 52rpx">
       用药方式
-      <view class="status">
-        <image class="icon" src="/images/icon114.png"></image>
+      <view class="status" wx:if="{{detail.isReimbursement == '1'}}">
+        <image class="icon" src="{{imageUrl}}icon114.png?t={{Timestamp}}"></image>
         可报销
       </view>
     </view>
     <view class="row">
       <view class="r-title">起付线</view>
-      <view class="r-content">600元，第二次及以上，起付线300元</view>
+      <view class="r-content">{{detail.threshold || '暂无'}}</view>
     </view>
     <view class="row">
       <view class="r-title">个人先行自付比例</view>
-      <view class="r-content">20%</view>
+      <view class="r-content">{{detail.individualRatio || '暂无'}}</view>
     </view>
     <view class="row">
       <view class="r-title">职工医保</view>
-      <view class="r-content">报销比例：90%(退休95%)</view>
+      <view class="r-content">{{detail.employeeMedicalInsurance || '暂无'}}</view>
     </view>
     <view class="row">
       <view class="r-title">居民医保</view>
-      <view class="r-content">
-        参保人一个年度内因同一病种在同一家医疗机构住院的支付一次起付标准，未经转诊跨县(市)域在省属三级医疗机构住院治疗的，起付线增加0.5倍。报销比例:三级医院75%,省属三级医院70%。
-      </view>
+      <view class="r-content">{{detail.residentMedicalInsurance || '暂无'}}</view>
     </view>
     <view class="row">
       <view class="r-title">其他信息</view>
-      <view class="r-content">1号以后可以申请使用高值药品备案备案成功后方可报销</view>
+      <view class="r-content">{{detail.otherInfo || '暂无'}}</view>
     </view>
     <view class="tip">注：各地医保报销比例和具体政策请以当地执行为准</view>
-    <view class="feedback" bind:tap="handleFeedback">信息有误？点击反馈</view>
+    <view class="feedback" bind:tap="handleFeedback">
+      信息有误？点击反馈
+      <image class="icon" src="{{imageUrl}}icon130.png?t={{Timestamp}}"></image>
+    </view>
   </view>
   <view class="page-footer">
     <view class="btn" bind:tap="handleConsult">我要咨询</view>
@@ -55,11 +56,11 @@
 <van-popup show="{{ show }}" position="bottom" bind:close="onClose" closeable round custom-style="background:#f6f8f9 ">
   <view class="popup-consult">
     <view class="item" bind:tap="handlePhone">
-      <image class="icon" src="/images/icon115.png"></image>
+      <image class="icon" src="{{imageUrl}}icon115.png?t={{Timestamp}}"></image>
       <view class="name">电话咨询</view>
     </view>
     <view class="item" bind:tap="handleCustomerService">
-      <image class="icon" src="/images/icon116.png"></image>
+      <image class="icon" src="{{imageUrl}}icon116.png?t={{Timestamp}}"></image>
       <view class="name">咨询客服</view>
     </view>
   </view>
diff --git a/src/patient/pages/my/index.json b/src/patient/pages/my/index.json
index 69025c8..5ea3613 100644
--- a/src/patient/pages/my/index.json
+++ b/src/patient/pages/my/index.json
@@ -5,6 +5,7 @@
     "van-icon": "@vant/weapp/icon/index",
     "navBar": "/components/zd-navBar/navBar",
     "van-switch": "@vant/weapp/switch/index",
-    "patient-tab-bar": "/components/patient-tab-bar/index"
+    "patient-tab-bar": "/components/patient-tab-bar/index",
+    "toast": "/components/toast/index"
   }
 }
diff --git a/src/patient/pages/my/index.ts b/src/patient/pages/my/index.ts
index 1400f05..8029a13 100644
--- a/src/patient/pages/my/index.ts
+++ b/src/patient/pages/my/index.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs'
+
 const app = getApp<IAppOption>()
 
 Page({
@@ -13,8 +14,20 @@ Page({
     },
 
     adlNewRecord: {} as any,
+
+    toastShow: false,
+    toastType: '',
+    // toastType: 'guideEnterInfo',
+    // toastType: 'guideEnterInfoJump',
+    toastParams: {} as any,
   },
-  onLoad() {
+  onLoad(options) {
+    if (options.jump == '1') {
+      this.setData({
+        toastShow: true,
+        toastType: 'guideEnterInfoJump',
+      })
+    }
     app.zdGetTheme().then((res) => {
       this.setData({
         theme: res,
@@ -35,8 +48,28 @@ Page({
       app.mpBehavior({ PageName: 'PG_PatientPersonalCenter' })
       app.getZdUserInfo(this, true, () => {})
       this.getScore()
+      this.getPopup()
     })
   },
+  async getPopup() {
+    if (this.data.toastShow)
+      return
+
+    const data1 = await wx.ajax({
+      method: 'GET',
+      url: '?r=zd/popup/get-need-popup',
+      data: {
+        type: 1,
+      },
+    })
+    if (data1.showAlert) {
+      this.setData({
+        toastShow: data1.showAlert,
+        toastType: 'guideEnterInfo',
+        toastParams: {},
+      })
+    }
+  },
   getScore() {
     wx.ajax({
       method: 'GET',
@@ -125,4 +158,41 @@ Page({
       },
     })
   },
+  handleToastOk() {
+    const { toastType } = this.data
+    if (toastType === 'guideEnterInfo') {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      }).then(() => {
+        wx.navigateTo({
+          url: '/patient/pages/personalInformation/index',
+        })
+        this.handleToastCancel(null, false)
+      })
+    }
+    else if (toastType === 'guideEnterInfoJump') {
+      wx.navigateTo({
+        url: '/patient/pages/personalInformation/index',
+      })
+      this.handleToastCancel(null, false)
+    }
+  },
+  handleToastCancel(_e = null, sure = true) {
+    const { toastType } = this.data
+    if (toastType === 'guideEnterInfo' && sure) {
+      wx.ajax({
+        method: 'POST',
+        url: '?r=zd/popup/close-need-popup',
+        data: { type: 1 },
+      })
+    }
+
+    this.setData({
+      toastShow: false,
+      toastType: '',
+      toastParams: '',
+    })
+  },
 })
diff --git a/src/patient/pages/my/index.wxml b/src/patient/pages/my/index.wxml
index 35a2ca1..aa388e6 100644
--- a/src/patient/pages/my/index.wxml
+++ b/src/patient/pages/my/index.wxml
@@ -76,3 +76,11 @@
 </view>
 
 <patient-tab-bar></patient-tab-bar>
+
+<toast
+  bind:cancel="handleToastCancel"
+  bind:ok="handleToastOk"
+  show="{{toastShow}}"
+  type="{{toastType}}"
+  params="{{toastParams}}"
+></toast>
diff --git a/src/patient/pages/qolReport/index.ts b/src/patient/pages/qolReport/index.ts
index a9f2b2f..e185919 100644
--- a/src/patient/pages/qolReport/index.ts
+++ b/src/patient/pages/qolReport/index.ts
@@ -8,12 +8,12 @@ Page({
     footerBtnShow: false,
     hormoneDetail: { recordId: '' },
 
-    type: '1',
+    // 默认月度
+    type: '2',
     BeginMonth: '',
     EndMonth: '',
 
     fields: {
-      1: 'day',
       2: 'month',
       3: 'year',
     },
@@ -87,18 +87,15 @@ Page({
   handleChangeType(e?: WechatMiniprogram.CustomEvent) {
     let type = ''
     if (e) {
-      type = e.detail.index + 1
+      // Tab 已移除“日”，现仅有“月度/年度”
+      type = e.detail.index === 0 ? '2' : '3'
     }
     else {
       type = this.data.type
     }
     let EndMonth = ''
     let BeginMonth = ''
-    if (type == '1') {
-      EndMonth = dayjs().format('YYYY-MM-DD')
-      BeginMonth = dayjs().subtract(6, 'd').format('YYYY-MM-DD')
-    }
-    else if (type == '2') {
+    if (type == '2') {
       EndMonth = dayjs().format('YYYY-MM')
       BeginMonth = dayjs().subtract(1, 'M').format('YYYY-MM')
     }
@@ -494,7 +491,7 @@ Page({
         page: newPage,
       },
     }).then((res) => {
-      let list = res.page == 1 ? res.list : [...this.data.list, ...res.list]
+      const list = res.page == 1 ? res.list : [...this.data.list, ...res.list]
       this.setData({
         list,
         pagination: {
diff --git a/src/patient/pages/qolReport/index.wxml b/src/patient/pages/qolReport/index.wxml
index 206be57..7cb1ef0 100644
--- a/src/patient/pages/qolReport/index.wxml
+++ b/src/patient/pages/qolReport/index.wxml
@@ -10,7 +10,6 @@
       title-inactive-color="#69686E"
       bind:change="handleChangeType"
     >
-      <van-tab title="日"></van-tab>
       <van-tab title="月度"></van-tab>
       <van-tab title="年度"></van-tab>
     </van-tabs>
diff --git a/src/patient/pages/qolResult/index.wxml b/src/patient/pages/qolResult/index.wxml
index 142cb3d..a20e8fa 100644
--- a/src/patient/pages/qolResult/index.wxml
+++ b/src/patient/pages/qolResult/index.wxml
@@ -17,9 +17,9 @@
         </view>
         <view class="tip">分数越高，对生活质量影响越小</view>
       </view>
-      <image class="status" wx:if="{{detail.TotalScore >= 80}}" src="{{imageUrl}}icon72.png?t={{Timestamp}}"></image>
-      <image class="status" wx:elif="{{detail.TotalScore >= 40}}" src="{{imageUrl}}icon71.png?t={{Timestamp}}"></image>
-      <image class="status" wx:else src="{{imageUrl}}icon70.png?t={{Timestamp}}"></image>
+      <image class="status" wx:if="{{detail.TotalScore >= 80}}" src="{{imageUrl}}icon123.png?t={{Timestamp}}"></image>
+      <image class="status" wx:elif="{{detail.TotalScore >= 40}}" src="{{imageUrl}}icon121.png?t={{Timestamp}}"></image>
+      <image class="status" wx:else src="{{imageUrl}}icon122.png?t={{Timestamp}}"></image>
     </view>
     <view class="c-line"></view>
     <view
@@ -111,7 +111,11 @@
     </view>
     <view class="e-container">
       <view class="r1">定期评测，可帮助您更好地了解改善情况</view>
-      <view class="r1">已完成评测<text class="num">{{detail.Times}}</text>次</view>
+      <view class="r1">
+        已完成评测
+        <text class="num">{{detail.Times}}</text>
+        次
+      </view>
       <view class="btn" bind:tap="handleReport">
         查看我的评估报告
         <van-icon name="arrow" />
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 429c6d0..9aa77c0 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,18 +1,22 @@
 interface IGlobalParams {
   gUrl: string
+  version: string
 }
 
-export function request({ gUrl }: IGlobalParams, {
-  url,
-  method,
-  data,
-  header,
-  showMsg = true,
-  loading = false,
-  loadingText = '加载中...',
-  isJSON = false,
-  ...options
-}: IAgaxParams): Promise<any> {
+export function request(
+  { gUrl, version }: IGlobalParams,
+  {
+    url,
+    method,
+    data,
+    header,
+    showMsg = true,
+    loading = false,
+    loadingText = '加载中...',
+    isJSON = false,
+    ...options
+  }: IAgaxParams,
+): Promise<any> {
   return new Promise((resolve, reject) => {
     if (loading) {
       wx.showLoading({
@@ -22,7 +26,8 @@ export function request({ gUrl }: IGlobalParams, {
     }
     wx.request({
       header: {
-        loginState: getApp().globalData.loginState,
+        'loginState': getApp().globalData.loginState,
+        'X-MP-Version': version,
         ...header,
       },
       url: gUrl + url,