3.0联调

README.md

@@ -5,11 +5,13 @@
 svn://39.106.86.127:28386/projects/wutian_xueyoubing_b/proj_src/shop/frontend/web/GeneB
 
 ### vscode
-(/images/)(\S*(?=["|']))
+
+(/images/)(\S\*(?=["|']))
 {{imageUrl}}$2?t={{Timestamp}}
 
 ### neovim
-(/images/)([^\"|']*)
+
+(/images/)([^\"|']\*)
 {{imageUrl}}${2}?t={{Timestamp}}
 
 https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567
@@ -23,3 +25,23 @@ wx.showModal({
   // confirmColor: 'rgba(29, 107, 255, 1)',
 })
 ```
+
+## 游客端
+
+1. 个人信息及隐私政策
+   /doc/pages/doc1/index
+
+## 患者端
+
+1. 个人信息共享知情同意书
+   /doc/pages/doc2/index
+
+2. 个人信息及隐私政策
+   /doc/pages/doc3/index
+
+3. 用户协议
+   /doc/pages/doc4/index
+
+## 医生端
+1. 个人信息及隐私政策
+   /doc/pages/doc5/index

src/app.json

@@ -70,7 +70,13 @@
     },
     {
       "root": "doc",
-      "pages": ["pages/doc1/index"]
+      "pages": [
+        "pages/doc1/index",
+        "pages/doc2/index",
+        "pages/doc3/index",
+        "pages/doc4/index",
+        "pages/doc5/index"
+      ]
     }
   ],
   "tabBar": {

src/doc/pages/doc2/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "个人信息共享知情同意书",
+  "usingComponents": {
+    "mp-html": "mp-html"
+  }
+}

src/doc/pages/doc2/index.scss

@@ -0,0 +1,3 @@
+.page{
+  padding: 0 40rpx;
+}

src/doc/pages/doc2/index.wxml

@@ -0,0 +1,3 @@
+<view class="page">
+  <mp-html content="{{doc}}"></mp-html>
+</view>

src/doc/pages/doc3/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "个人信息及隐私保护政策",
+  "usingComponents": {
+    "mp-html": "mp-html"
+  }
+}

src/doc/pages/doc3/index.scss

@@ -0,0 +1,3 @@
+.page{
+  padding: 0 40rpx;
+}

src/doc/pages/doc3/index.wxml

@@ -0,0 +1,3 @@
+<view class="page">
+  <mp-html content="{{doc}}"></mp-html>
+</view>

src/doc/pages/doc4/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "用户协议",
+  "usingComponents": {
+    "mp-html": "mp-html"
+  }
+}

src/doc/pages/doc4/index.scss

@@ -0,0 +1,3 @@
+.page{
+  padding: 0 40rpx;
+}

src/doc/pages/doc4/index.wxml

@@ -0,0 +1,3 @@
+<view class="page">
+  <mp-html content="{{doc}}"></mp-html>
+</view>

src/doc/pages/doc5/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "个人信息及隐私保护政策",
+  "usingComponents": {
+    "mp-html": "mp-html"
+  }
+}

src/doc/pages/doc5/index.scss

@@ -0,0 +1,3 @@
+.page{
+  padding: 0 40rpx;
+}

src/doc/pages/doc5/index.wxml

@@ -0,0 +1,3 @@
+<view class="page">
+  <mp-html content="{{doc}}"></mp-html>
+</view>

src/doctor/pages/index/index.scss

@@ -106,7 +106,7 @@ page {
       display: flex;
       align-items: center;
       .title {
-        width: 236rpx;
+        width: 141rpx;
         height: 34rpx;
       }
       font-size: 36rpx;

src/doctor/pages/index/index.ts

@@ -1,16 +1,40 @@
-const _app = getApp<IAppOption>()
+const app = getApp<IAppOption>()
 
 Page({
-  data: {},
-  onLoad() {},
+  data: {
+    userInfo: {},
+    patientList: [],
+  },
+  onLoad() {
+    app.waitLogin({ type: 2 }).then(() => {
+      this.getPatientList()
+      app.getUserInfo(2).then((userInfo) => {
+        this.setData({
+          userInfo: userInfo,
+        })
+      })
+    })
+  },
+  getPatientList() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=wtx/doctor/patient/get-list',
+      data: {},
+    }).then((res) => {
+      this.setData({
+        patientList: res.list || [],
+      })
+    })
+  },
   handleCalculator() {
     wx.navigateTo({
       url: '/doctor/pages/calculator/index',
     })
   },
-  handlePatientDetail() {
+  handlePatientDetail(e) {
+    const { id } = e.currentTarget.dataset
     wx.navigateTo({
-      url: '/doctor/pages/patientDetail/index',
+      url: `/doctor/pages/patientDetail/index?id=${id}`,
     })
   },
   handlePoster() {

src/doctor/pages/index/index.wxml

@@ -1,16 +1,13 @@
 <navbar fixed custom-style="background:{{background}}" back>
   <image class="page-title" slot="left" src="/images/title13.png"></image>
 </navbar>
-<view class="page" style="padding-top:{{pageTop}}px;">
+<view class="page" style="background: url('{{imageUrl}}bg24.png?t={{Timestamp}}') no-repeat top center/100% 544rpx;padding-top:{{pageTop}}px;">
   <view class="page-header">
     <view class="user">
-      <image
-        class="avatar"
-        src="https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567"
-      ></image>
+      <image class="avatar" src="{{userInfo.doctorAvatar}}"></image>
       <view class="wrap">
-        <view class="name">王青</view>
-        <view class="content">北京协和医院</view>
+        <view class="name">{{userInfo.doctorName}}</view>
+        <view class="content">{{userInfo.hospitalName}}</view>
       </view>
       <image class="code" bind:tap="handlePoster" src="/images/icon100.png"></image>
     </view>
@@ -39,22 +36,22 @@
   <view class="patient">
     <view class="p-header">
       <image class="title" src="/images/title15.png"></image>
-      (12)
+      ({{patientList.length}})
     </view>
     <view class="patient-list">
-      <view class="card" bind:tap="handlePatientDetail">
+      <view class="card" wx:for="{{patientList}}" bind:tap="handlePatientDetail" data-id="{{item.patientId}}" wx:key="patientId">
         <image
           class="photo"
-          src="https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567"
+          src="{{item.userAvatar}}"
         ></image>
         <view class="wrap">
           <view class="title">
-            <view class="name">刘可</view>
-            <view class="date">入组：2024.3.12</view>
+            <view class="name">{{item.patientName}}</view>
+            <view class="date">入组：{{item.createTime}}</view>
           </view>
           <view class="content">
-            <view class="step">第一阶段</view>
-            <view class="s-name">诊前筛选</view>
+            <view class="step">{{item.currentPeriods}}</view>
+            <view class="s-name">{{item.currentPeriodName}}</view>
           </view>
         </view>
         <image class="icon" src="/images/icon12.png"></image>

src/doctor/pages/login/index.ts

@@ -111,6 +111,12 @@ Page({
       showTel: !this.data.showTel,
     })
   },
+  handleLink(e: any) {
+    const { url } = e.currentTarget.dataset
+    wx.navigateTo({
+      url,
+    })
+  },
   handleBack() {
     wx.navigateBack()
   },

src/doctor/pages/login/index.wxml

@@ -48,14 +48,14 @@
       <checkbox model:checked="{{check1}}" class="checkbox" color="#fff"></checkbox>
       <view class="r-content">
         我已阅读并同意
-        <text class="link">《个人信息及隐私协议政策》</text>
+        <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc5/index">《个人信息及隐私协议政策》</text>
       </view>
     </view>
     <view class="row">
       <checkbox model:checked="{{check2}}" class="checkbox" color="#fff"></checkbox>
       <view class="r-content">
         我已阅读并同意
-        <text class="link">《个人信息共享知情同意书》</text>
+        <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc5/index">《个人信息及隐私协议政策》</text>
         规定收集我的相关敏感个人信息
       </view>
     </view>

src/doctor/pages/patientDetail/index.scss

@@ -117,20 +117,30 @@ page {
       .d-container {
         margin-top: 32rpx;
         display: flex;
-        align-items: center;
         justify-content: space-between;
         gap: 16rpx;
         .avatar {
           flex-shrink: 0;
-          width: calc(92rpx * 1.5);
           display: flex;
           .a-img {
+            display: inline-block;
+            position: relative;
             flex-shrink: 0;
             width: 92rpx;
             height: 92rpx;
             border-radius: 50%;
-            &:last-of-type {
-              transform: translateX(-50%);
+            border: 1px solid #fff;
+            &:nth-of-type(2) {
+              z-index: 1;
+              margin-left: -46rpx;
+            }
+            &:nth-of-type(3) {
+              z-index: 2;
+              margin-left: -46rpx;
+            }
+            &:nth-of-type(4) {
+              z-index: 3;
+              margin-left: -46rpx;
             }
           }
         }
@@ -149,14 +159,9 @@ page {
         }
         .btn {
           flex-shrink: 0;
-          width: 162rpx;
-          height: 56rpx;
-          font-size: 32rpx;
-          color: rgba(255, 255, 255, 1);
-          text-align: center;
-          line-height: 56rpx;
-          background: #1c6bff;
-          border-radius: 68rpx 68rpx 68rpx 68rpx;
+          margin-top: 18rpx;
+          width: 48rpx;
+          height: 48rpx;
         }
       }
     }

src/doctor/pages/patientDetail/index.ts

@@ -1,8 +1,47 @@
-const _app = getApp<IAppOption>()
+import dayjs from 'dayjs'
+
+const app = getApp<IAppOption>()
 
 Page({
-  data: {},
-  onLoad() {},
+  data: {
+    id: '',
+    patientInfo: {},
+    doctorAvatarListMore: false,
+    doctorAvatarList: [],
+    lastBindDoctorInfo: {},
+    patientArchiveInfo: {},
+  },
+  onLoad(options: any) {
+    this.setData({
+      id: options.id,
+    })
+    app.waitLogin({ type: 2 }).then(() => {
+      this.getDetail()
+    })
+  },
+  getDetail() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=wtx/doctor/patient/get-detail',
+      data: {
+        patientId: this.data.id,
+      },
+    }).then((res) => {
+      this.setData({
+        patientInfo: {
+          ...res.patientInfo,
+          createTimeName: dayjs(res.patientInfo.createTime).format('YYYY年MM月DD日'),
+        },
+        doctorAvatarListMore: res.doctorAvatarList.length > 4,
+        doctorAvatarList:
+          res.doctorAvatarList.length > 4
+            ? [res.doctorAvatarList[0], res.doctorAvatarList[1], 'none', res.doctorAvatarList[4]]
+            : res.doctorAvatarList,
+        lastBindDoctorInfo: res.lastBindDoctorInfo,
+        patientArchiveInfo: res.patientArchiveInfo,
+      })
+    })
+  },
   handleBack() {
     wx.navigateBack()
   },

src/doctor/pages/patientDetail/index.wxml

@@ -14,24 +14,21 @@
 >
   <view class="header">
     <view class="user">
-      <image
-        class="avatar"
-        src="https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567"
-      ></image>
+      <image class="avatar" src="{{patientInfo.userAvatar}}"></image>
       <view class="wrap">
         <view class="w-header">
-          <view class="name">王青</view>
+          <view class="name">{{patientInfo.patientName}}</view>
           <view class="age">
             <image class="icon" src="{{imageUrl}}icon91.png?t={{Timestamp}}"></image>
-            32岁
+            {{patientInfo.ageYear}}岁
           </view>
           <view class="site">
-            <image class="icon" src="{{imageUrl}}icon92.png?t={{Timestamp}}"></image>
-            北京
+            <image class="icon" src="{{imageUrl}}icon104.png?t={{Timestamp}}"></image>
+            {{patientInfo.provinceName}}
           </view>
         </view>
         <view class="w-footer">
-          <view class="content">入组时间:2025年6月12日</view>
+          <view class="content">入组时间:{{patientInfo.createTimeName}}</view>
           <view class="doc">
             查看档案
             <van-icon name="arrow" />
@@ -45,31 +42,32 @@
       <view class="d-header">
         <view class="title">共同照护团队</view>
         <view class="message">
-          最新消息12条
+          最新消息???条
           <view class="dot"></view>
         </view>
       </view>
       <view class="d-container">
-        <view class="avatar">
-          <image
-            class="a-img"
-            src="https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567"
-          ></image>
-          <image
-            class="a-img"
-            src="https://pic1.zhimg.com/50/v2-8cfef5f9ea7d15963af2277c6814f152_720w.jpg?source=2c26e567"
-          ></image>
+        <view class="avatar" wx:if="{{doctorAvatarListMore}}">
+          <block wx:for="{{doctorAvatarList}}" wx:key="index">
+            <image wx:if="{{item=='none'}}" class="a-img" src="/images/icon105.png"></image>
+            <image wx:else class="a-img" src="{{item}}"></image>
+          </block>
+        </view>
+        <view class="avatar" wx:else>
+          <image wx:for="{{doctorAvatarList}}" wx:key="index" class="a-img" src="{{item}}"></image>
         </view>
         <view class="wrap">
-          <view class="name">刘湖飞</view>
-          <view class="content">天津血液科诊断中心</view>
+          <view class="name">{{lastBindDoctorInfo.doctorName}}</view>
+          <view class="content">{{lastBindDoctorInfo.hospitalName}}</view>
         </view>
-        <view class="btn">去看看></view>
+        <image class="btn" src="/images/icon106.png"></image>
       </view>
     </view>
     <view class="progress">
-      <view class="p-header">刘可的检查进展</view>
-      <view class="card finish">
+      <view class="p-header">{{patientInfo.patientName}}的检查进展</view>
+      <view
+        class="card {{patientArchiveInfo.periodOneStatus==2 && 'current'}} {{patientArchiveInfo.periodOneStatus==2 && 'finish'}}"
+      >
         <view class="c-aside">
           <view class="line-top hide"></view>
           <view class="num">1</view>
@@ -79,16 +77,33 @@
           <view class="module">
             <view class="m-header">
               <view class="title">诊前筛查</view>
-              <view class="date">2024-08-24</view>
+              <view
+                class="date"
+                wx:if="{{patientArchiveInfo.periodOneExamBeginDate && patientArchiveInfo.periodOneExamEndDate}}"
+              >
+                {{patientArchiveInfo.periodOneExamBeginDate && patientArchiveInfo.periodOneExamEndDate}}
+              </view>
             </view>
             <view class="m-body">
-              <image class="status" src="/images/icon102.png"></image>
+              <image wx:if="{{patientArchiveInfo.periodOneStatus==1}}" class="status" src="/images/icon103.png"></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodOneStatus==2}}"
+                class="status"
+                src="/images/icon102.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodOneStatus==3}}"
+                class="status"
+                src="/images/icon101.png"
+              ></image>
               <view class="detail">查看详情</view>
             </view>
           </view>
         </view>
       </view>
-      <view class="card current">
+      <view
+        class="card {{patientArchiveInfo.periodTwoStatus==2 && 'current'}} {{patientArchiveInfo.periodTwoStatus==2 && 'finish'}}"
+      >
         <view class="c-aside">
           <view class="line-top"></view>
           <view class="num">2</view>
@@ -100,12 +115,24 @@
               <view class="title">注射前准备</view>
             </view>
             <view class="m-body">
-              <image class="status" src="/images/icon101.png"></image>
+              <image wx:if="{{patientArchiveInfo.periodTwoStatus==1}}" class="status" src="/images/icon103.png"></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodTwoStatus==2}}"
+                class="status"
+                src="/images/icon102.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodTwoStatus==3}}"
+                class="status"
+                src="/images/icon101.png"
+              ></image>
             </view>
           </view>
         </view>
       </view>
-      <view class="card">
+      <view
+        class="card {{patientArchiveInfo.periodThreeStatus==2 && 'current'}} {{patientArchiveInfo.periodThreeStatus==2 && 'finish'}}"
+      >
         <view class="c-aside">
           <view class="line-top"></view>
           <view class="num">3</view>
@@ -116,16 +143,35 @@
             <view class="m-header">
               <view class="title">
                 诊前筛查
-                <view class="tag">还未确定注射日</view>
+                <view class="tag" wx:if="{{patientArchiveInfo.injectionDate}}">
+                  {{patientArchiveInfo.injectionDate}}
+                </view>
+                <view class="tag" wx:else>还未确定注射日</view>
               </view>
             </view>
             <view class="m-body">
-              <image class="status" src="/images/icon103.png"></image>
+              <image
+                wx:if="{{patientArchiveInfo.periodThreeStatus==1}}"
+                class="status"
+                src="/images/icon103.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodThreeStatus==2}}"
+                class="status"
+                src="/images/icon102.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodThreeStatus==3}}"
+                class="status"
+                src="/images/icon101.png"
+              ></image>
             </view>
           </view>
         </view>
       </view>
-      <view class="card">
+      <view
+        class="card {{patientArchiveInfo.periodFourStatus==2 && 'current'}} {{patientArchiveInfo.periodFourStatus==2 && 'finish'}}"
+      >
         <view class="c-aside">
           <view class="line-top"></view>
           <view class="num">4</view>
@@ -137,7 +183,21 @@
               <view class="title">诊前筛查</view>
             </view>
             <view class="m-body">
-              <image class="status" src="/images/icon103.png"></image>
+              <image
+                wx:if="{{patientArchiveInfo.periodFourStatus==1}}"
+                class="status"
+                src="/images/icon103.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodFourStatus==2}}"
+                class="status"
+                src="/images/icon102.png"
+              ></image>
+              <image
+                wx:elif="{{patientArchiveInfo.periodFourStatus==3}}"
+                class="status"
+                src="/images/icon101.png"
+              ></image>
             </view>
             <view class="btn">待启动</view>
           </view>

src/doctor/pages/poster/index.scss

@@ -1,16 +1,13 @@
-page {
-  background-color: #c65174;
-}
 .page {
   position: relative;
-  height: 1448rpx;
+  height: 1624rpx;
   .poster {
     width: 100%;
     height: 100%;
   }
   .btn {
     position: absolute;
-    bottom: 88rpx;
+    bottom: 220rpx;
     left: 50%;
     transform: translateX(-50%);
     margin: 36rpx auto;

src/doctor/pages/poster/index.ts

@@ -17,25 +17,13 @@ Page({
         bottom,
       })
     }
-    app.waitLogin().then((_res) => {
+    app.waitLogin({ type: 2 }).then((_res) => {
       wx.showLoading({
         title: '加载中',
       })
-      app.mpBehavior({ doctor: true, PageName: 'PG_DOCTORINVITEPATIENT' })
-      this.getDetail()
-    })
-  },
-  getDetail() {
-    wx.ajax({
-      method: 'GET',
-      url: '?r=zd/doctor/account/info',
-      data: {},
-    }).then((res) => {
-      this.setData({
-        doctor: res.doctor,
-        hospital: res.hospital,
+      app.getUserInfo(2).then((userInfo) => {
+        this.getPrepare(userInfo.doctorId)
       })
-      this.getPrepare(res.doctor.Id)
     })
   },
   getPrepare(id) {

src/doctor/pages/poster/index.wxml

@@ -1,4 +1,4 @@
-<view class="page">
+<view class="page" style="background: url('/images/bg23.png') no-repeat top center/100% 100%">
   <image class="poster" show-menu-by-longpress src="{{posterUrl}}"></image>
   <view class="btn" bind:tap="handleDownload">长按图片保存</view>
 </view>

src/patient/pages/coltStat/index.wxml

@@ -116,7 +116,7 @@
             <view class="date" wx:else>--</view>
             <view class="wrap">
               <view class="title">{{item.periodName}}</view>
-              <view class="progress">{{item.clottingFactor}}</view>
+              <view class="progress" wx:if="{{item.clottingFactor}}">{{item.clottingFactor}}</view>
             </view>
           </view>
         </view>

src/patient/pages/file/index.ts

@@ -197,7 +197,7 @@ Page({
   },
   handleRevisitRecord() {
     wx.navigateTo({
-      url: '/patient/pages/lastDiagnosisReport/index',
+      url: '/patient/pages/lastDiagnosisReport/index?period=4',
     })
   },
   handleRevisitDetail(e) {

src/patient/pages/file/index.wxml

@@ -287,12 +287,12 @@
   <view class="container2" wx:if="{{nav==2}}">
     <view class="date-card" bind:tap="handleInjectionDate">
       <image class="icon" src="{{imageUrl}}icon67.png?t={{Timestamp}}"></image>
-      <view class="content" wx:if="{{followExam.injectionDateName}}">注射日：{{followExam.injectionDateName}}</view>
+      <view class="content" wx:if="{{followExam.injectionDate}}">注射日：{{followExam.injectionDateName}}</view>
       <view class="content" wx:else>请填写您的注射日生成随访计划</view>
     </view>
     <view
       class="notic"
-      wx:if="{{followExam.injectionDateName}}"
+      wx:if="{{followExam.injectionDate}}"
       style="background: url('{{imageUrl}}bg21.png?t={{Timestamp}}') no-repeat top center/100%"
     >
       <view class="title">{{followExam.tipsInfo}}</view>

src/patient/pages/index/index.wxml

@@ -223,7 +223,8 @@
       </view>
       <!-- prettier-ignore -->
       <view class="item"  wx:if="{{treatment.bleedInfo.diffDays}}" bind:tap="handleBleed" style="background: url('{{imageUrl}}icon16.png?t={{Timestamp}}') no-repeat top 32rpx right 24rpx/84rpx 84rpx, linear-gradient(32deg, #ffffff 0%, #fffcfc 55%, #fff0f0 100%);">
-        <view class="num">{{treatment.bleedInfo.diffDays}}<text class="sub">天前</text></view>
+        <view class="num" wx:if="{{treatment.bleedInfo.diffDays == '0'}}">今<text class="sub">天</text></view>
+        <view class="num" wx:else>{{treatment.bleedInfo.diffDays}}<text class="sub">天前</text></view>
         <view class="content">最近一次出血</view>
         <view class="footer">
           <view class="date">{{treatment.bleedInfo.bleedDate}}</view>

src/patient/pages/lastDiagnosisReport/index.ts

@@ -95,12 +95,13 @@ Page({
         attachmentList2: res.attachmentList[2] || [],
         attachmentList3: res.attachmentList[3] || [],
         attachmentList10: res.attachmentList[10] || [],
+        hospitalName: res.hospitalName || '',
       })
     })
   },
   handleSelectHospital() {
     wx.navigateTo({
-      url: '/patient/pages/selectHostipal/index?select=1',
+      url: `/patient/pages/selectHostipal/index?select=1&id=${this.data.hospitalId}`,
       events: {
         acceptDataFromOpenedPage: (data) => {
           this.setData({

src/patient/pages/lastDiagnosisReport/index.wxml

@@ -43,7 +43,12 @@
               <view class="title">生化检查</view>
               <image class="icon {{fold1 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isBiochemical==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isBiochemical" data-fold="fold1">
+            <view
+              class="status {{isBiochemical==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isBiochemical"
+              data-fold="fold1"
+            >
               <image wx:if="{{isBiochemical==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isBiochemical==1?'已检查':'未检查'}}
@@ -128,7 +133,12 @@
               <view class="title">凝血因子 IX 活性</view>
               <image class="icon {{fold2 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isCFIxActivity==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isCFIxActivity" data-fold="fold2">
+            <view
+              class="status {{isCFIxActivity==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isCFIxActivity"
+              data-fold="fold2"
+            >
               <image wx:if="{{isCFIxActivity==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isCFIxActivity==1?'已检查':'未检查'}}
@@ -178,7 +188,12 @@
               <view class="title">其他检查</view>
               <image class="icon {{fold3 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isOther==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isOther" data-fold="fold3">
+            <view
+              class="status {{isOther==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isOther"
+              data-fold="fold3"
+            >
               <image wx:if="{{isOther==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isOther==1?'已检查':'未检查'}}

src/patient/pages/login/index.ts

@@ -128,6 +128,12 @@ Page({
       showTel: !this.data.showTel,
     })
   },
+  handleLink(e: any) {
+    const { url } = e.currentTarget.dataset
+    wx.navigateTo({
+      url,
+    })
+  },
   handleBack() {
     wx.navigateBack()
   },

src/patient/pages/login/index.wxml

@@ -52,7 +52,7 @@
       <checkbox model:checked="{{check1}}" class="checkbox" color="#fff"></checkbox>
       <view class="r-content">
         我特此同意
-        <text class="link">《个人信息及隐私协议政策》</text>
+        <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc3/index">《个人信息及隐私协议政策》</text>
         规定收集我的相关敏感个人信息
       </view>
     </view>
@@ -60,7 +60,7 @@
       <checkbox model:checked="{{check2}}" class="checkbox" color="#fff"></checkbox>
       <view class="r-content">
         我特此同意
-        <text class="link">《用户协议》</text>
+        <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc4/index">《用户协议》</text>
         中关于用户权利与义务的约定
       </view>
     </view>
@@ -68,7 +68,7 @@
       <checkbox model:checked="{{check3}}" class="checkbox" color="#fff"></checkbox>
       <view class="r-content">
         我特此同意
-        <text class="link">《个人信息共享知情同意书》</text>
+        <text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index">《个人信息共享知情同意书》</text>
         规定共享我的相关个人敏感数据
       </view>
     </view>

src/patient/pages/my/index.wxml

@@ -16,7 +16,7 @@
       </view>
     </view>
   </view>
-  <view class="apply" bind:tap="routerTo" data-url="/pages/applyFrom/index">
+  <view class="apply" bind:tap="routerTo" data-url="/patient/pages/file/index">
     <image class="a-img" src="{{imageUrl}}index-apply.png?t={{Timestamp}}"></image>
     <view class="content">查看我的健康档案</view>
   </view>

src/patient/pages/preDiagnosisReport/index.ts

@@ -213,7 +213,7 @@ Page({
   handleToggleCheck(e: any) {
     const { check, fold } = e.currentTarget.dataset
     let foldValue = this.data[fold]
-    if (this.data[check] == 2) {
+    if (this.data[check] == 2 || !this.data[check]) {
       foldValue = false
     }
     this.setData({

src/patient/pages/preDiagnosisReport/index.wxml

@@ -42,7 +42,12 @@
               <view class="title">血常规检查</view>
               <image class="icon {{fold1 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isBloodRoutine==1 && 'active'}} {{isBloodRoutine==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isBloodRoutine" data-fold="fold1">
+            <view
+              class="status {{isBloodRoutine==1 && 'active'}} {{isBloodRoutine==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isBloodRoutine"
+              data-fold="fold1"
+            >
               <image wx:if="{{isBloodRoutine==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isBloodRoutine==1?'已检查':'未检查'}}
@@ -80,7 +85,12 @@
               <view class="title">生化检查</view>
               <image class="icon {{fold2 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isBiochemical==1 && 'active'}} {{isBiochemical==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isBiochemical" data-fold="fold2">
+            <view
+              class="status {{isBiochemical==1 && 'active'}} {{isBiochemical==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isBiochemical"
+              data-fold="fold2"
+            >
               <image wx:if="{{isBiochemical==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isBiochemical==1?'已检查':'未检查'}}
@@ -170,7 +180,12 @@
               <view class="title">凝血因子 IX 活性</view>
               <image class="icon {{fold3 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isCFIxActivity==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isCFIxActivity" data-fold="fold3">
+            <view
+              class="status {{isCFIxActivity==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isCFIxActivity"
+              data-fold="fold3"
+            >
               <image wx:if="{{isCFIxActivity==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isCFIxActivity==1?'已检查':'未检查'}}
@@ -222,7 +237,12 @@
               <view class="title">凝血因子 IX 抑制物检测</view>
               <image class="icon {{fold4 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isCFIxInhibitor==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isCFIxInhibitor" data-fold="fold4">
+            <view
+              class="status {{isCFIxInhibitor==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isCFIxInhibitor"
+              data-fold="fold4"
+            >
               <image wx:if="{{isCFIxInhibitor==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isCFIxInhibitor==1?'已检查':'未检查'}}
@@ -271,7 +291,12 @@
               <view class="title">乙型肝炎相关检查</view>
               <image class="icon {{fold5 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isHepatitisB==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isHepatitisB" data-fold="fold5">
+            <view
+              class="status {{isHepatitisB==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isHepatitisB"
+              data-fold="fold5"
+            >
               <image wx:if="{{isHepatitisB==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isHepatitisB==1?'已检查':'未检查'}}
@@ -334,7 +359,12 @@
               <view class="title">丙型肝炎相关检查</view>
               <image class="icon {{fold6 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isHepatitisC==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isHepatitisC" data-fold="fold6">
+            <view
+              class="status {{isHepatitisC==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isHepatitisC"
+              data-fold="fold6"
+            >
               <image wx:if="{{isHepatitisC==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isHepatitisC==1?'已检查':'未检查'}}
@@ -397,7 +427,12 @@
               <view class="title">HIV抗体</view>
               <image class="icon {{fold7 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isHivAntibody==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isHivAntibody" data-fold="fold7">
+            <view
+              class="status {{isHivAntibody==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isHivAntibody"
+              data-fold="fold7"
+            >
               <image wx:if="{{isHivAntibody==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isHivAntibody==1?'已检查':'未检查'}}
@@ -448,7 +483,12 @@
               <view class="title">甲胎蛋白（AFP）检测</view>
               <image class="icon {{fold8 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isAfp==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isAfp" data-fold="fold8">
+            <view
+              class="status {{isAfp==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isAfp"
+              data-fold="fold8"
+            >
               <image wx:if="{{isAfp==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isAfp==1?'已检查':'未检查'}}
@@ -500,7 +540,12 @@
               <view class="title">AAV 抗体检查</view>
               <image class="icon {{fold9 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isAav==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isAav" data-fold="fold9">
+            <view
+              class="status {{isAav==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isAav"
+              data-fold="fold9"
+            >
               <image wx:if="{{isAav==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isAav==1?'已检查':'未检查'}}
@@ -551,7 +596,12 @@
               <view class="title">其他检查</view>
               <image class="icon {{fold10 && 'turn'}}" src="{{imageUrl}}icon63.png?t={{Timestamp}}"></image>
             </view>
-            <view class="status {{isOther==1 && 'active'}}" catch:tap="handleToggleCheck" data-check="isOther" data-fold="fold10">
+            <view
+              class="status {{isOther==1 && 'active'}}"
+              catch:tap="handleToggleCheck"
+              data-check="isOther"
+              data-fold="fold10"
+            >
               <image wx:if="{{isOther==1}}" class="icon" src="{{imageUrl}}icon64.png?t={{Timestamp}}"></image>
               <image wx:else class="icon" src="{{imageUrl}}icon65.png?t={{Timestamp}}"></image>
               {{isOther==1?'已检查':'未检查'}}