bug处理

src/components/customAudioText/index.ts

@@ -22,12 +22,10 @@ Component({
   methods: {
     init() {},
     handleAudioText() {
-      this.setData({
-        show: true,
-      });
       wx.ajax({
         method: "GET",
         url: "?r=takeda/common/audio-url-to-text",
+        loading: true,
         data: {
           AudioUrl: this.data.url,
         },

src/components/uploadFile/index.ts

@@ -151,7 +151,7 @@ Component({
             const suffix = this.GetExtensionFileName(data.data.Url);
             const expandJson = {
               fileId: "",
-              name: `病历相关文件.${suffix}`,
+              name: item.name || `病历相关文件.${suffix}`,
               size: (item.size / 1024).toFixed(2),
               fileUrl: data.data.Url,
               suffix,

src/echart/components/homeLevel2/index.ts

@@ -21,7 +21,7 @@ Component({
     fold2: false,
     foldHeight2: 10000,
     take: {},
-    case: {},
+    case: {} as any,
     cooperateList: [],
     inviteList: [],
   },
@@ -147,6 +147,16 @@ Component({
       const { index } = e.currentTarget.dataset;
       this.triggerEvent("question", index);
     },
+    handleNewCase() {
+      const { case: cases } = this.data;
+      wx.showModal({
+        confirmColor: "#00B4C5",
+        cancelColor: "#141515",
+        showCancel: false,
+        confirmText: "关闭",
+        content: `本人提交:${cases.newOneCaseCount}\r\n他人提交:${cases.newTwoCaseCount}`,
+      });
+    },
   },
 });
 

src/echart/components/homeLevel2/index.wxml

@@ -75,10 +75,10 @@
         <view class="num">{{case.totalCaseCount}}</view>
       </view>
       <view class="line"></view>
-      <view class="item">
+      <view class="item" bind:tap="handleNewCase">
         <view class="name">
           新病历
-          <van-icon bind:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.newCaseCount}}</view>
       </view>
@@ -86,7 +86,7 @@
       <view class="item">
         <view class="name">
           讨论中
-          <van-icon bind:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.feedbackCaseCount}}</view>
       </view>

src/echart/components/homeLevel3/index.ts

@@ -17,7 +17,7 @@ Component({
    */
   data: {
     take: {},
-    case: {},
+    case: {} as any,
     doctorCount: {},
   },
 

src/echart/components/homeLevel3/index.wxml

@@ -74,14 +74,14 @@
       <view class="item">
         <view class="name">
           新病历
-          <van-icon bind:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.newCaseCount}}</view>
       </view>
       <view class="item">
         <view class="name">
           讨论中
-          <van-icon bind:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.feedbackCaseCount}}</view>
       </view>

src/echart/components/homeLevel4/index.ts

@@ -23,7 +23,7 @@ Component({
       lazyLoad: true,
     },
     take: {},
-    case: {},
+    case: {} as any,
     doctorCount: {},
 
     DepartmentId: "",
@@ -680,6 +680,16 @@ Component({
       const { index } = e.currentTarget.dataset;
       this.triggerEvent("question", index);
     },
+    handleNewCase() {
+      const { case: cases } = this.data;
+      wx.showModal({
+        confirmColor: "#00B4C5",
+        cancelColor: "#141515",
+        showCancel: false,
+        confirmText: "关闭",
+        content: `本科室:${cases.newOneCaseCount}\r\n无科室:${cases.newTwoCaseCount}`,
+      });
+    },
   },
 });
 

src/echart/components/homeLevel4/index.wxml

@@ -72,17 +72,17 @@
         <view class="num">{{case.totalCaseCount}}</view>
       </view>
       <view class="line"></view>
-      <view class="item">
+      <view class="item" bind:tap="handleNewCase">
         <view class="name">
           新病历
-          <van-icon bind:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="1" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.newCaseCount}}</view>
       </view>
-      <view class="item">
+      <view class="item" >
         <view class="name">
           讨论中
-          <van-icon bind:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
+          <van-icon catch:tap="handleQuestion" data-index="2" name="question" color="rgba(224, 224, 224, 1)" />
         </view>
         <view class="num">{{case.feedbackCaseCount}}</view>
       </view>

src/module1/pages/casesDetail/index.ts

@@ -291,6 +291,17 @@ Page({
       },
     });
   },
+  handlePreviewName(e) {
+    const { item } = e.currentTarget.dataset;
+    wx.showModal({
+      title: "文件名",
+      content: item.name,
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      showCancel: false,
+      confirmText: "关闭",
+    });
+  },
   handleDownloadFile(e) {
     const { item } = e.currentTarget.dataset;
     wx.downloadFile({

src/module1/pages/casesDetail/index.wxml

@@ -85,6 +85,7 @@
             wx:for="{{detail.caseFiles}}"
             wx:key="url"
             bind:tap="handlePreviewFile"
+            bind:longpress="handlePreviewName"
             data-item="{{item}}"
           >
             <view class="wrap">
@@ -190,6 +191,7 @@
             wx:for-item="cItem"
             wx:key="url"
             bind:tap="handlePreviewFile"
+            bind:longpress="handlePreviewName"
             data-item="{{cItem}}"
           >
             <view class="wrap">

src/module1/pages/casesFeedback/index.ts

@@ -137,6 +137,18 @@ Page({
       },
     });
   },
+  handlePreviewName(e) {
+    const { index } = e.currentTarget.dataset;
+    const item = this.data.files[index];
+    wx.showModal({
+      title: "文件名",
+      content: item.name,
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      showCancel: false,
+      confirmText: "关闭",
+    });
+  },
   handleDownloadFile(e) {
     const { index } = e.currentTarget.dataset;
     const item = this.data.files[index];

src/module1/pages/casesFeedback/index.wxml

@@ -62,7 +62,7 @@
       </uploadFile>
     </view>
     <view class="file-list" wx:if="{{files.length}}">
-      <view class="fl-row" wx:for="{{files}}" wx:key="name" bind:tap="handlePreviewFile" data-index="{{index}}">
+      <view class="fl-row" wx:for="{{files}}" wx:key="name" bind:tap="handlePreviewFile" bind:longpress="handlePreviewName" data-index="{{index}}">
         <view class="wrap">
           <image class="icon" src="{{imageUrl}}icon-file{{item.fileType}}.png?t={{Timestamp}}"></image>
           <view class="name">{{item.name}}</view>

src/module1/pages/entryCases/index.ts

@@ -208,6 +208,18 @@ Page({
       },
     });
   },
+  handlePreviewName(e) {
+    const { index } = e.currentTarget.dataset;
+    const item = this.data.files[index];
+    wx.showModal({
+      title: "文件名",
+      content: item.name,
+      confirmColor: "#00B4C5",
+      cancelColor: "#141515",
+      showCancel: false,
+      confirmText: "关闭",
+    });
+  },
   handleDownloadFile(e) {
     const { index } = e.currentTarget.dataset;
     const item = this.data.files[index];

src/module1/pages/entryCases/index.wxml

@@ -66,7 +66,7 @@
       </uploadFile>
     </view>
     <view class="file-list" wx:if="{{files.length}}">
-      <view class="fl-row" wx:for="{{files}}" wx:key="name" bind:tap="handlePreviewFile" data-index="{{index}}">
+      <view class="fl-row" wx:for="{{files}}" wx:key="name" bind:tap="handlePreviewFile" catch:longpress="handlePreviewName" data-index="{{index}}">
         <view class="wrap">
           <image class="icon" src="{{imageUrl}}icon-file{{item.fileType}}.png?t={{Timestamp}}"></image>
           <view class="name">{{item.name}}</view>

src/module1/pages/org3/index.scss

@@ -7,7 +7,27 @@ page {
     padding: 32rpx;
     border-radius: 0 0 32rpx 32rpx;
     background-color: #fff;
+    .select {
+      display: flex;
+      align-content: inherit;
+      gap: 14rpx;
+      .label {
+        font-size: 28rpx;
+        color: rgba(20, 21, 21, 1);
+      }
+      .picker {
+        .picker-content {
+          padding: 4rpx 24rpx;
+          font-size: 28rpx;
+          color: rgba(133, 133, 133, 1);
+          line-height: 39rpx;
+          border-radius: 98rpx;
+          background-color: rgba(246, 246, 246, 1);
+        }
+      }
+    }
     .banner {
+      margin-top: 24rpx;
       padding: 32rpx 0;
       display: flex;
       justify-content: space-between;
@@ -29,9 +49,8 @@ page {
           color: rgba(255, 255, 255, 1);
           line-height: 1;
         }
-        &:nth-of-type(2) {
+        &:nth-of-type(1) {
           border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
-          border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
         }
       }
     }
@@ -94,6 +113,7 @@ page {
       }
     }
     .wrap {
+      flex: 1;
       padding-top: 8rpx;
       .w-header {
         display: flex;
@@ -105,6 +125,7 @@ page {
           display: flex;
           align-items: baseline;
           gap: 16rpx;
+          flex-wrap: wrap;
           .name {
             font-size: 36rpx;
             color: rgba(20, 21, 21, 1);
@@ -186,19 +207,39 @@ page {
     margin: 24rpx 24rpx 0;
     border-radius: 16rpx;
     background-color: #fff;
+    overflow: hidden;
     .level-three {
-      margin: 24rpx 0 0;
+      &.active {
+        background: #E9F7F9;
+        .doctor {
+          background: #E9F7F9;
+        }
+      }
       .doctor {
         padding: 24rpx;
         background: linear-gradient(180deg, #e5f5f7 0%, #ffffff 50%);
         box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
         border-radius: 16rpx 16rpx 16rpx 16rpx;
         border: 2rpx solid #ffffff;
+        .avatar-wrap {
+          .num {
+            flex-shrink: 0;
+            margin-top: 8rpx;
+            padding: 0 20rpx;
+            font-size: 22rpx;
+            color: rgba(255, 255, 255, 1);
+            border-radius: 64rpx;
+            background-color: rgba(0, 180, 197, 1);
+          }
+        }
       }
     }
 
     .level-two {
       display: flex;
+      &.active {
+        background-color: #E9F7F9;
+      }
       .aside {
         padding-left: 60rpx;
         display: flex;
@@ -242,6 +283,9 @@ page {
     }
     .level-one {
       display: flex;
+      &.active {
+        background-color: #E9F7F9;
+      }
       .aside {
         margin-left: 60rpx;
         padding-left: 42rpx;
@@ -274,6 +318,9 @@ page {
     }
     .level-one-only {
       display: flex;
+      &.active {
+        background-color: #E9F7F9;
+      }
       .aside {
         padding-left: 60rpx;
         display: flex;
@@ -296,6 +343,11 @@ page {
       }
     }
   }
+  .fold-wrap {
+    &.fold {
+      display: none;
+    }
+  }
 
   .empty-wrap {
     .empty {

src/module1/pages/org3/index.ts

@@ -2,8 +2,16 @@ const app = getApp<IAppOption>();
 
 Page({
   data: {
+    Department: [],
+
     doctorCount: {},
-    tree: [],
+
+    tree: [] as any,
+    search: "",
+
+    userInfo: {} as any,
+
+    allFold: false,
   },
   onLoad() {
     app.waitLogin().then(() => {
@@ -38,6 +46,73 @@ Page({
       url: "/module1/pages/invite/index",
     });
   },
+  handleSearch() {
+    const { tree, search } = this.data;
+    let newTree: any = null;
+    if (search) {
+      newTree = this.sourceTree(tree, search);
+    } else {
+      newTree = this.clearTree(tree, search);
+    }
+    this.setData({
+      tree: newTree,
+    });
+  },
+  sourceTree(tree: any[], search: string): any[] {
+    return tree.map((item) => {
+      if (item.Children?.length) {
+        this.sourceTree(item.Children, search);
+      }
+      if (item.DoctorInfo.doctorName.includes(search)) {
+        item.active = true;
+      } else {
+        item.active = false;
+      }
+      return item;
+    });
+  },
+  clearTree(tree: any[], search: string): any[] {
+    return tree.map((item) => {
+      if (item.Children?.length) {
+        this.clearTree(item.Children, search);
+      }
+      item.active = false;
+      return item;
+    });
+  },
+  handleFold(e) {
+    const { index } = e.currentTarget.dataset;
+    const { tree } = this.data;
+    tree[index].fold = !tree[index].fold;
+    this.setData({
+      tree,
+    });
+  },
+  handleSubFold(e) {
+    const { index, subindex } = e.currentTarget.dataset;
+    const { tree } = this.data;
+    tree[index].Children[subindex].fold = !tree[index].Children[subindex].fold;
+    this.setData({
+      tree,
+    });
+  },
+  handleFoldAll() {
+    const { tree, allFold } = this.data;
+    const newTree = this.toggleFoldAll(tree, !allFold);
+    this.setData({
+      allFold: !allFold,
+      tree: newTree,
+    });
+  },
+  toggleFoldAll(tree, fold) {
+    return tree.map((item) => {
+      if (item.Children?.length) {
+        this.toggleFoldAll(item.Children, fold);
+      }
+      item.fold = fold;
+      return item;
+    });
+  },
 });
 
 export {};

src/module1/pages/org3/index.wxml

@@ -1,12 +1,12 @@
 <view class="page">
   <view class="header">
-    <view class="banner" wx:if="{{doctorCount.TotalCount>0}}">
+    <view class="banner" wx:if="{{doctorCount.TotalCount}}">
       <view class="item">
         <view class="name">全部医生</view>
         <view class="num">{{doctorCount.TotalCount}}</view>
       </view>
       <view class="item">
-        <view class="name">二级医生</view>
+        <view class="name">核心医生</view>
         <view class="num">{{doctorCount.TwoCount}}</view>
       </view>
       <view class="item">
@@ -17,175 +17,423 @@
     <view class="operate">
       <view class="search">
         <image class="icon" src="{{imageUrl}}icon-search.png?t={{Timestamp}}"></image>
-        <input type="text" class="input" placeholder-class="place-input" placeholder="搜索医院名称" />
+        <input
+          type="text"
+          model:value="{{search}}"
+          class="input"
+          placeholder-class="place-input"
+          placeholder="搜索医生名称"
+          confirm-type="search"
+          bindconfirm="handleSearch"
+        />
       </view>
       <view class="invite" bind:tap="handleInvite">邀约新医生</view>
     </view>
   </view>
 
   <block wx:for="{{tree}}" wx:key="DoctorId">
-    <view class="container" wx:if="{{item.DoctorLevel==='3'}}">
-      <view class="level-three">
+    <view class="container" wx:if="{{userInfo.DoctorId == item.DoctorId}}">
+      <view class="level-three {{item.active && 'active'}}">
         <view class="doctor">
           <view class="avatar-wrap">
             <doctorAvatar
               class="avatar"
-              src="https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567"
-              level="{{1}}"
+              src="{{item.DoctorInfo.doctorImg}}"
+              level="{{item.DoctorInfo.doctorLevel}}"
             ></doctorAvatar>
+            <block wx:if="{{item.Children.length}}">
+              <view class="num">{{item.ChildCount}}人</view>
+              <view class="line"></view>
+            </block>
           </view>
           <view class="wrap">
             <view class="w-header">
               <view class="wh-wrap">
-                <view class="name">徐萌</view>
-                <view class="label">主任医师</view>
-                <view class="line"></view>
-                <view class="label">心内科</view>
+                <view class="name">{{item.DoctorInfo.doctorName}}</view>
+                <view class="label" wx:if="{{item.DoctorInfo.doctorTitle==='99'}}">
+                  {{item.DoctorInfo.doctorOtherTitle}}
+                </view>
+                <view class="label" wx:else>{{item.DoctorInfo.doctorTitleName}}</view>
+                <block wx:for="{{item.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                  <view class="line"></view>
+                  <view class="label">{{dept.DepartmentName}}</view>
+                </block>
               </view>
-              <view class="fold">
-                收起
-                <image class="f-icon" src="{{imageUrl}}fold-down.png?t={{Timestamp}}"></image>
+              <view class="fold" bind:tap="handleFoldAll">
+                {{item.fold ? '全部展开':'全部收起'}}
+                <image class="f-icon" src="{{imageUrl}}fold-{{item.fold?'down':'top'}}.png?t={{Timestamp}}"></image>
               </view>
             </view>
             <view class="w-container">
-              <text class="hostipal">北京天坛医院</text>
-              <view class="tag">三甲</view>
-              <view class="site">广州市/番禺区</view>
+              <text class="hostipal">{{item.DoctorInfo.hospitalName}}</text>
+              <view class="tag">
+                {{item.DoctorInfo.hospitalClassificationName}}{{item.DoctorInfo.hospitalLevelName}}
+              </view>
+              <view class="site" wx:if="{{item.DoctorInfo.cityName}}">
+                {{item.DoctorInfo.cityName}}{{item.DoctorInfo.countyName ? '/':''}}{{item.DoctorInfo.countyName}}
+              </view>
             </view>
-            <view class="w-footer">
+            <view class="w-footer" wx:if="{{item.DoctorInfo.doctorSpecialty.length}}">
               <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
+              <view class="wf-tag" wx:for="{{item.DoctorInfo.doctorSpecialty}}" wx:for-item="spec" wx:key="SpecialtyId">
+                {{spec.SpecialtyName}}
+              </view>
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view class="container">
-      <view class="level-two">
-        <view class="aside">
-          <view class="vertical"></view>
-          <view class="across"></view>
-        </view>
+    <view class="container" wx:elif="{{item.DoctorLevel=='3'}}">
+      <view class="level-three {{item.active && 'active'}}">
         <view class="doctor">
           <view class="avatar-wrap">
             <doctorAvatar
               class="avatar"
-              src="https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567"
-              level="{{1}}"
+              src="{{item.DoctorInfo.doctorImg}}"
+              level="{{item.DoctorInfo.doctorLevel}}"
             ></doctorAvatar>
-            <view class="num">2人</view>
-            <view class="line"></view>
+            <block wx:if="{{item.Children.length}}">
+              <view class="num">{{item.ChildCount}}人</view>
+              <view class="line"></view>
+            </block>
           </view>
           <view class="wrap">
             <view class="w-header">
               <view class="wh-wrap">
-                <view class="name">徐萌</view>
-                <view class="label">主任医师</view>
-                <view class="line"></view>
-                <view class="label">心内科</view>
+                <view class="name">{{item.DoctorInfo.doctorName}}</view>
+                <view class="label" wx:if="{{item.DoctorInfo.doctorTitle==='99'}}">
+                  {{item.DoctorInfo.doctorOtherTitle}}
+                </view>
+                <view class="label" wx:else>{{item.DoctorInfo.doctorTitleName}}</view>
+                <block wx:for="{{item.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                  <view class="line"></view>
+                  <view class="label">{{dept.DepartmentName}}</view>
+                </block>
               </view>
-              <view class="fold">
-                收起
-                <image class="f-icon" src="{{imageUrl}}fold-down.png?t={{Timestamp}}"></image>
+              <view class="fold" bind:tap="handleFold" data-index="{{index}}">
+                {{item.fold ? '展开':'收起'}}
+                <image class="f-icon" src="{{imageUrl}}fold-{{item.fold?'down':'top'}}.png?t={{Timestamp}}"></image>
               </view>
             </view>
             <view class="w-container">
-              <text class="hostipal">北京天坛医院</text>
-              <view class="tag">三甲</view>
-              <view class="site">广州市/番禺区</view>
+              <text class="hostipal">{{item.DoctorInfo.hospitalName}}</text>
+              <view class="tag">
+                {{item.DoctorInfo.hospitalClassificationName}}{{item.DoctorInfo.hospitalLevelName}}
+              </view>
+              <view class="site" wx:if="{{item.DoctorInfo.cityName}}">
+                {{item.DoctorInfo.cityName}}{{item.DoctorInfo.countyName ? '/':''}}{{item.DoctorInfo.countyName}}
+              </view>
             </view>
-            <view class="w-footer">
+            <view class="w-footer" wx:if="{{item.DoctorInfo.doctorSpecialty.length}}">
               <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
+              <view class="wf-tag" wx:for="{{item.DoctorInfo.doctorSpecialty}}" wx:for-item="spec" wx:key="SpecialtyId">
+                {{spec.SpecialtyName}}
+              </view>
             </view>
           </view>
         </view>
       </view>
-      <view class="level-one">
-        <view class="aside">
-          <view class="vertical"></view>
-          <view class="across"></view>
-          <view class="vertical-grow"></view>
-        </view>
-        <view class="doctor">
-          <view class="avatar-wrap">
-            <doctorAvatar
-              class="avatar"
-              src="https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567"
-              level="{{1}}"
-            ></doctorAvatar>
+    </view>
+    <view
+      class="fold-wrap {{item.fold && 'fold'}}"
+      wx:for="{{item.Children}}"
+      wx:key="DoctorId"
+      wx:for-item="subItem"
+      wx:for-index="subIndex"
+    >
+      <view class="container" wx:if="{{subItem.DoctorLevel=='2'}}">
+        <view class="level-two {{subItem.active && 'active'}}">
+          <view class="aside">
+            <view class="vertical"></view>
+            <view class="across"></view>
           </view>
-          <view class="wrap">
-            <view class="w-header">
-              <view class="wh-wrap">
-                <view class="name">徐萌</view>
-                <view class="label">主任医师</view>
+          <view class="doctor">
+            <view class="avatar-wrap">
+              <doctorAvatar
+                class="avatar"
+                src="{{subItem.DoctorInfo.doctorImg}}"
+                level="{{subItem.DoctorInfo.doctorLevel}}"
+              ></doctorAvatar>
+              <block wx:if="{{subItem.Children.length}}">
+                <view class="num">{{subItem.ChildCount}}人</view>
                 <view class="line"></view>
-                <view class="label">心内科</view>
+              </block>
+            </view>
+            <view class="wrap">
+              <view class="w-header">
+                <view class="wh-wrap">
+                  <view class="name">{{subItem.DoctorInfo.doctorName}}</view>
+                  <view class="label" wx:if="{{subItem.DoctorInfo.doctorTitle==='99'}}">
+                    {{subItem.DoctorInfo.doctorOtherTitle}}
+                  </view>
+                  <view class="label" wx:else>{{subItem.DoctorInfo.doctorTitleName}}</view>
+                  <block wx:for="{{subItem.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                    <view class="line"></view>
+                    <view class="label">{{dept.DepartmentName}}</view>
+                  </block>
+                </view>
+                <view class="fold" bind:tap="handleSubFold" data-index="{{index}}" data-subindex="{{subIndex}}">
+                  {{subItem.fold ? '展开':'收起'}}
+                  <image
+                    class="f-icon"
+                    src="{{imageUrl}}fold-{{subItem.fold?'down':'top'}}.png?t={{Timestamp}}"
+                  ></image>
+                </view>
+              </view>
+              <view class="w-container">
+                <text class="hostipal">{{subItem.DoctorInfo.hospitalName}}</text>
+                <view class="tag">
+                  {{subItem.DoctorInfo.hospitalClassificationName}}{{subItem.DoctorInfo.hospitalLevelName}}
+                </view>
+                <view class="site" wx:if="{{subItem.DoctorInfo.cityName}}">
+                  {{subItem.DoctorInfo.cityName}} {{subItem.DoctorInfo.countyName ? '/':''}}
+                  {{subItem.DoctorInfo.countyName}}
+                </view>
+              </view>
+              <view class="w-footer" wx:if="{{subItem.DoctorInfo.doctorSpecialty.length}}">
+                <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
+                <view
+                  class="wf-tag"
+                  wx:for="{{subItem.DoctorInfo.doctorSpecialty}}"
+                  wx:for-item="spec"
+                  wx:key="SpecialtyId"
+                >
+                  {{spec.SpecialtyName}}
+                </view>
               </view>
             </view>
-            <view class="w-container">
-              <text class="hostipal">北京天坛医院</text>
-              <view class="tag">三甲</view>
-              <view class="site">广州市/番禺区</view>
+          </view>
+        </view>
+        <view
+          class="fold-wrap {{subItem.fold && 'fold'}}"
+          wx:for="{{subItem.Children}}"
+          wx:key="DoctorId"
+          wx:for-item="subSubItem"
+        >
+          <view class="level-one {{subSubItem.active && 'active'}}">
+            <view class="aside">
+              <view class="vertical"></view>
+              <view class="across"></view>
+              <view class="vertical-grow" wx:if="{{subItem.Children.length > index+1}}"></view>
             </view>
-            <view class="w-footer">
-              <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
+            <view class="doctor">
+              <view class="avatar-wrap">
+                <doctorAvatar
+                  class="avatar"
+                  src="{{subSubItem.DoctorInfo.doctorImg}}"
+                  level="{{subSubItem.DoctorInfo.doctorLevel}}"
+                ></doctorAvatar>
+              </view>
+              <view class="wrap">
+                <view class="w-header">
+                  <view class="wh-wrap">
+                    <view class="name">{{subSubItem.DoctorInfo.doctorName}}</view>
+                    <view class="label" wx:if="{{subSubItem.DoctorInfo.doctorTitle==='99'}}">
+                      {{subSubItem.DoctorInfo.doctorOtherTitle}}
+                    </view>
+                    <view class="label" wx:else>{{subSubItem.DoctorInfo.doctorTitleName}}</view>
+                    <block wx:for="{{subSubItem.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                      <view class="line"></view>
+                      <view class="label">{{dept.DepartmentName}}</view>
+                    </block>
+                  </view>
+                </view>
+                <view class="w-container">
+                  <text class="hostipal">{{subSubItem.DoctorInfo.hospitalName}}</text>
+                  <view class="tag">
+                    {{subSubItem.DoctorInfo.hospitalClassificationName}}{{subSubItem.DoctorInfo.hospitalLevelName}}
+                  </view>
+                  <view class="site" wx:if="{{subSubItem.DoctorInfo.cityName}}">
+                    {{subSubItem.DoctorInfo.cityName}}{{subSubItem.DoctorInfo.countyName ?
+                    '/':''}}{{subSubItem.DoctorInfo.countyName}}
+                  </view>
+                </view>
+                <view class="w-footer" wx:if="{{subSubItem.DoctorInfo.doctorSpecialty.length}}">
+                  <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
+                  <view
+                    class="wf-tag"
+                    wx:for="{{subSubItem.DoctorInfo.doctorSpecialty}}"
+                    wx:for-item="spec"
+                    wx:key="SpecialtyId"
+                  >
+                    {{spec.SpecialtyName}}
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="container" wx:if="{{subItem.DoctorLevel=='1'}}">
+        <view class="level-one-only {{subItem.active && 'active'}}">
+          <view class="aside">
+            <view class="vertical"></view>
+            <view class="across"></view>
+          </view>
+          <view class="doctor">
+            <view class="avatar-wrap">
+              <doctorAvatar
+                class="avatar"
+                src="{{subItem.DoctorInfo.doctorImg}}"
+                level="{{subItem.DoctorInfo.doctorLevel}}"
+              ></doctorAvatar>
+            </view>
+            <view class="wrap">
+              <view class="w-header">
+                <view class="wh-wrap">
+                  <view class="name">{{subItem.DoctorInfo.doctorName}}</view>
+                  <view class="label" wx:if="{{subItem.DoctorInfo.doctorTitle==='99'}}">
+                    {{subItem.DoctorInfo.doctorOtherTitle}}
+                  </view>
+                  <view class="label" wx:else>{{subItem.DoctorInfo.doctorTitleName}}</view>
+                  <block wx:for="{{subItem.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                    <view class="line"></view>
+                    <view class="label">{{dept.DepartmentName}}</view>
+                  </block>
+                </view>
+              </view>
+              <view class="w-container">
+                <text class="hostipal">{{subItem.DoctorInfo.hospitalName}}</text>
+                <view class="tag">
+                  {{subItem.DoctorInfo.hospitalClassificationName}}{{subItem.DoctorInfo.hospitalLevelName}}
+                </view>
+                <view class="site" wx:if="{{subItem.DoctorInfo.cityName}}">
+                  {{subItem.DoctorInfo.cityName}} {{subItem.DoctorInfo.countyName ? '/':''}}
+                  {{subItem.DoctorInfo.countyName}}
+                </view>
+              </view>
+              <view class="w-footer" wx:if="{{subItem.DoctorInfo.doctorSpecialty.length}}">
+                <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
+                <view
+                  class="wf-tag"
+                  wx:for="{{subItem.DoctorInfo.doctorSpecialty}}"
+                  wx:for-item="spec"
+                  wx:key="SpecialtyId"
+                >
+                  {{spec.SpecialtyName}}
+                </view>
+              </view>
             </view>
           </view>
         </view>
       </view>
-      <view class="level-one">
+    </view>
+    <view class="container" wx:if="{{item.DoctorLevel=='2'}}">
+      <view class="level-two {{item.active && 'active'}}">
         <view class="aside">
           <view class="vertical"></view>
           <view class="across"></view>
-          <view class="vertical-grow"></view>
         </view>
         <view class="doctor">
           <view class="avatar-wrap">
             <doctorAvatar
               class="avatar"
-              src="https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567"
-              level="{{1}}"
+              src="{{item.DoctorInfo.doctorImg}}"
+              level="{{item.DoctorInfo.doctorLevel}}"
             ></doctorAvatar>
+            <block wx:if="{{item.Children.length}}">
+              <view class="num">{{item.ChildCount}}人</view>
+              <view class="line"></view>
+            </block>
           </view>
           <view class="wrap">
             <view class="w-header">
               <view class="wh-wrap">
-                <view class="name">徐萌</view>
-                <view class="label">主任医师</view>
-                <view class="line"></view>
-                <view class="label">心内科</view>
+                <view class="name">{{item.DoctorInfo.doctorName}}</view>
+                <view class="label" wx:if="{{item.DoctorInfo.doctorTitle==='99'}}">
+                  {{item.DoctorInfo.doctorOtherTitle}}
+                </view>
+                <view class="label" wx:else>{{item.DoctorInfo.doctorTitleName}}</view>
+                <block wx:for="{{item.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                  <view class="line"></view>
+                  <view class="label">{{dept.DepartmentName}}</view>
+                </block>
+              </view>
+              <view class="fold" bind:tap="handleFold" data-index="{{index}}">
+                {{item.fold ? '展开':'收起'}}
+                <image class="f-icon" src="{{imageUrl}}fold-{{item.fold?'down':'top'}}.png?t={{Timestamp}}"></image>
               </view>
             </view>
             <view class="w-container">
-              <text class="hostipal">北京天坛医院</text>
-              <view class="tag">三甲</view>
-              <view class="site">广州市/番禺区</view>
+              <text class="hostipal">{{item.DoctorInfo.hospitalName}}</text>
+              <view class="tag">
+                {{item.DoctorInfo.hospitalClassificationName}}{{item.DoctorInfo.hospitalLevelName}}
+              </view>
+              <view class="site" wx:if="{{item.DoctorInfo.cityName}}">
+                {{item.DoctorInfo.cityName}} {{item.DoctorInfo.countyName ? '/':''}} {{item.DoctorInfo.countyName}}
+              </view>
             </view>
-            <view class="w-footer">
+            <view class="w-footer" wx:if="{{item.DoctorInfo.doctorSpecialty.length}}">
               <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
+              <view class="wf-tag" wx:for="{{item.DoctorInfo.doctorSpecialty}}" wx:for-item="spec" wx:key="SpecialtyId">
+                {{spec.SpecialtyName}}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view
+        class="fold-wrap {{item.fold && 'fold'}}"
+        wx:for="{{item.Children}}"
+        wx:key="DoctorId"
+        wx:for-item="subSubItem"
+      >
+        <view class="level-one {{subSubItem.active && 'active'}}">
+          <view class="aside">
+            <view class="vertical"></view>
+            <view class="across"></view>
+            <view class="vertical-grow"></view>
+          </view>
+          <view class="doctor">
+            <view class="avatar-wrap">
+              <doctorAvatar
+                class="avatar"
+                src="{{subSubItem.DoctorInfo.doctorImg}}"
+                level="{{subSubItem.DoctorInfo.doctorLevel}}"
+              ></doctorAvatar>
+            </view>
+            <view class="wrap">
+              <view class="w-header">
+                <view class="wh-wrap">
+                  <view class="name">{{subSubItem.DoctorInfo.doctorName}}</view>
+                  <view class="label" wx:if="{{subSubItem.DoctorInfo.doctorTitle==='99'}}">
+                    {{subSubItem.DoctorInfo.doctorOtherTitle}}
+                  </view>
+                  <view class="label" wx:else>{{subSubItem.DoctorInfo.doctorTitleName}}</view>
+                  <block wx:for="{{subSubItem.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                    <view class="line"></view>
+                    <view class="label">{{dept.DepartmentName}}</view>
+                  </block>
+                </view>
+              </view>
+              <view class="w-container">
+                <text class="hostipal">{{subSubItem.DoctorInfo.hospitalName}}</text>
+                <view class="tag">
+                  {{subSubItem.DoctorInfo.hospitalClassificationName}}{{subSubItem.DoctorInfo.hospitalLevelName}}
+                </view>
+                <view class="site" wx:if="{{subSubItem.DoctorInfo.cityName}}">
+                  {{subSubItem.DoctorInfo.cityName}}{{subSubItem.DoctorInfo.countyName ?
+                  '/':''}}{{subSubItem.DoctorInfo.countyName}}
+                </view>
+              </view>
+              <view class="w-footer" wx:if="{{subSubItem.DoctorInfo.doctorSpecialty.length}}">
+                <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
+                <view
+                  class="wf-tag"
+                  wx:for="{{subSubItem.DoctorInfo.doctorSpecialty}}"
+                  wx:for-item="spec"
+                  wx:key="SpecialtyId"
+                >
+                  {{spec.SpecialtyName}}
+                </view>
+              </view>
             </view>
           </view>
         </view>
       </view>
     </view>
-    <view class="container">
-      <view class="level-one-only">
+    <view class="container" wx:if="{{item.DoctorLevel=='1'}}">
+      <view class="level-one-only {{item.active && 'active'}}">
         <view class="aside">
           <view class="vertical"></view>
           <view class="across"></view>
@@ -194,30 +442,38 @@
           <view class="avatar-wrap">
             <doctorAvatar
               class="avatar"
-              src="https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567"
-              level="{{1}}"
+              src="{{item.DoctorInfo.doctorImg}}"
+              level="{{item.DoctorInfo.doctorLevel}}"
             ></doctorAvatar>
           </view>
           <view class="wrap">
             <view class="w-header">
               <view class="wh-wrap">
-                <view class="name">徐萌</view>
-                <view class="label">主任医师</view>
-                <view class="line"></view>
-                <view class="label">心内科</view>
+                <view class="name">{{item.DoctorInfo.doctorName}}</view>
+                <view class="label" wx:if="{{item.DoctorInfo.doctorTitle==='99'}}">
+                  {{item.DoctorInfo.doctorOtherTitle}}
+                </view>
+                <view class="label" wx:else>{{item.DoctorInfo.doctorTitleName}}</view>
+                <block wx:for="{{item.DoctorInfo.doctorDept}}" wx:key="DepartmentId" wx:for-item="dept">
+                  <view class="line"></view>
+                  <view class="label">{{dept.DepartmentName}}</view>
+                </block>
               </view>
             </view>
             <view class="w-container">
-              <text class="hostipal">北京天坛医院</text>
-              <view class="tag">三甲</view>
-              <view class="site">广州市/番禺区</view>
+              <text class="hostipal">{{item.DoctorInfo.hospitalName}}</text>
+              <view class="tag">
+                {{item.DoctorInfo.hospitalClassificationName}}{{item.DoctorInfo.hospitalLevelName}}
+              </view>
+              <view class="site" wx:if="{{item.DoctorInfo.cityName}}">
+                {{item.DoctorInfo.cityName}} {{item.DoctorInfo.countyName ? '/':''}} {{item.DoctorInfo.countyName}}
+              </view>
             </view>
-            <view class="w-footer">
+            <view class="w-footer" wx:if="{{item.DoctorInfo.doctorSpecialty.length}}">
               <image class="wf-label" src="{{imageUrl}}text-specialty.png?t={{Timestamp}}" mode="aspectFit"></image>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
-              <view class="wf-tag">心律失常</view>
+              <view class="wf-tag" wx:for="{{item.DoctorInfo.doctorSpecialty}}" wx:for-item="spec" wx:key="SpecialtyId">
+                {{spec.SpecialtyName}}
+              </view>
             </view>
           </view>
         </view>

src/module1/pages/setInfo/index.ts

@@ -230,11 +230,10 @@ Page({
       success: (res) => {
         if (res.confirm) {
           wx.scanCode({
-            scanType: ["qrCode"],
             success: (res) => {
               if (res.errMsg === "scanCode:ok") {
                 if (res.path.includes("pages/start/index")) {
-                  const scene: any = parseScene(res.path.split("?scene=")[1]);
+                  const scene: any = parseScene(res.path?.split("?scene=")[1]);
                   if (scene?.doctorId) {
                     app.globalData.scene = scene;
                     this.getDoctorInfo(scene.doctorId as string);