bug处理

src/components/popup/index.scss

@@ -1,6 +1,9 @@
 .popup1 {
   padding: 84rpx 60rpx;
   background: linear-gradient(6deg, #ffffff 0%, #ffe6e4 100%);
+  max-height: 75vh;
+  overflow-y: auto;
+  overflow-x: hidden;
   .logo {
     display: block;
     margin: 0 auto;
@@ -89,8 +92,14 @@
     .title {
       display: block;
       margin: 0 auto;
-      width: 146rpx;
+      text-align: center;
-      height: 34rpx;
+      font-size: 36rpx;
+      font-weight: bold;
+      transform: skew(-10deg);
+      color: transparent;
+      background: linear-gradient(356deg, rgba(225, 36, 42, 1) 0%, rgba(255, 116, 64, 1) 100%);
+      background-clip: text;
+      -webkit-background-clip: text;
     }
     .card {
       position: relative;

src/components/popup/index.wxml

@@ -44,7 +44,8 @@
   <view class="popup3" wx:elif="{{type==='bindDoctor'}}">
     <image class="icon" src="{{imageUrl}}icon23.png?t={{Timestamp}}"></image>
     <view class="container">
-      <image class="title" src="{{imageUrl}}title1.png?t={{Timestamp}}"></image>
+      <!-- <image class="title" src="{{imageUrl}}title1.png?t={{Timestamp}}"></image> -->
+      <view class="title">绑定成功</view>
       <view class="card">
         <image class="avatar" src="{{params.avatar}}"></image>
         <view class="wrap">

src/components/star/index.ts

@@ -29,14 +29,14 @@ Component({
           this.data.height = res[0].height * dpr;
           // context.fillStyle = "rgba(255, 255, 255, 0)";
           const images = [
-            "star/icon1.png",
+            "star/icon1.png?r=1",
-            "star/icon2.png",
+            "star/icon2.png?r=1",
-            "star/icon3.png",
+            "star/icon3.png?r=1",
-            "star/icon4.png",
+            "star/icon4.png?r=1",
-            "star/icon5.png",
+            "star/icon5.png?r=1",
-            "star/icon6.png",
+            "star/icon6.png?r=1",
-            "star/icon7.png",
+            "star/icon7.png?r=1",
-            "star/icon8.png",
+            "star/icon8.png?r=1",
           ];
           const promiseAll = [] as Array<Promise<any>>;
           images.forEach((src) => {
@@ -83,7 +83,7 @@ Component({
     },
     createRender() {
       if (this.data.imgsList.length == 0) return null;
-      const basicScale = [0.6, 0.9, 1.2][getRandom(0, 2)];
+      const basicScale = [0.4, 0.5, 0.6][getRandom(0, 2)];
 
       const getScale = (diffTime) => {
         if (diffTime < this.data.scaleTime) {

src/components/uploadFile/index.js

@@ -227,13 +227,14 @@ Component({
       })
     },
     onSelect(e) {
-      if (e.detail.id === 1) {
+      const { id } = e.currentTarget.dataset
+      if (id == 1) {
         this.setData({
           show: false,
         })
         this.selectMedia()
       }
-      if (e.detail.id === 2) {
+      if (id == 2) {
         this.setData({
           show: false,
         })

src/components/uploadFile/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-icon": "@vant/weapp/icon/index",
     "van-image": "@vant/weapp/image/index",
-    "van-action-sheet": "@vant/weapp/action-sheet/index"
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-popup": "@vant/weapp/popup/index"
   }
 }

src/components/uploadFile/index.scss

@@ -34,7 +34,7 @@
       height: 100%;
       border-radius: 12rpx;
     }
-    .sub-image{
+    .sub-image {
       width: 104rpx;
       height: 104rpx;
     }
@@ -65,3 +65,26 @@
   }
 }
 
+.popup {
+  padding: 102rpx 48rpx;
+  display: flex;
+  align-items: center;
+  gap: 30rpx;
+  justify-content: space-between;
+  .item {
+    padding: 32rpx;
+    flex: 1;
+    border-radius: 36rpx;
+    background-color: #fff;
+    text-align: center;
+    .title {
+      margin-top: 16rpx;
+      font-size: 32rpx;
+      color: rgba(1, 1, 5, 1);
+    }
+    .icon {
+      width: 136rpx;
+      height: 136rpx;
+    }
+  }
+}

src/components/uploadFile/index.wxml

@@ -2,7 +2,12 @@
   <view class="item" wx:for="{{fileList}}" wx:key="index" data-index="{{index}}" catchtap="viewFile">
     <image wx:if="{{item.fileType==='image'}}" class="image" mode="aspectFill" src="{{item.url}}"></image>
     <image wx:elif="{{item.fileType==='video'}}" class="image" mode="aspectFill" src="{{item.url}}"></image>
-    <image wx:elif="{{item.fileType==='audio'}}" class="sub-image" mode="aspectFill" src="{{imageUrl}}file.png?t={{Timestamp}}"></image>
+    <image
+      wx:elif="{{item.fileType==='audio'}}"
+      class="sub-image"
+      mode="aspectFill"
+      src="{{imageUrl}}file.png?t={{Timestamp}}"
+    ></image>
     <image wx:else class="sub-image" mode="aspectFill" src="{{imageUrl}}{{item.fileType}}.png?t={{Timestamp}}"></image>
     <view class="item_mask">
       <van-icon
@@ -31,4 +36,17 @@
   </view>
 </view>
 
-<van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" />
+<!-- <van-action-sheet title=" " show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" /> -->
+
+<van-popup show="{{ show }}" custom-styple="background-color: rgba(247, 247, 250, 1);" round position="bottom" closeable bind:close="onClose">
+  <view class="popup">
+    <view class="item" bind:tap="onSelect" data-id="1">
+      <view class="title">选择视频或图片</view>
+      <image class="icon" src="{{imageUrl}}icon117.png?t={{Timestamp}}"></image>
+    </view>
+    <view class="item" bind:tap="onSelect" data-id="2">
+      <view class="title">选择聊天文件</view>
+      <image class="icon" src="{{imageUrl}}icon118.png?t={{Timestamp}}"></image>
+    </view>
+  </view>
+</van-popup>

src/doctor/pages/askDoctor/index.wxml

@@ -112,7 +112,7 @@
     </view>
     <view class="send-date" bind:tap="handleReferral">
       <image class="icon" src="{{imageUrl}}/icon113.png?t={{Timestamp}}"></image>
-      <view style="color: #67baca">复诊提醒</view>
+      <view>复诊提醒</view>
     </view>
   </view>
 </view>

src/doctor/pages/bbmReport/index.ts

@@ -29,6 +29,11 @@ Page({
         injectionDrugs,
         injectionNum,
       })
+    } else {
+      this.setData({
+        injectionDrugs: '',
+        injectionNum: '',
+      })
     }
   },
   getDetail() {

src/doctor/pages/calculator/index.ts

@@ -11,6 +11,33 @@ Page({
   onLoad() {
     app.waitLogin({ type: 2 }).then(() => {})
   },
+  handleInput(e) {
+    const { key, length } = e.currentTarget.dataset
+    const value = e.detail.value
+    this.setData({
+      [`${key}`]: this.validateInput(value, length),
+    })
+  },
+  validateInput(val, integerLimit) {
+    let num = val.toString()
+    // 清除“数字”和“.”以外的字符
+    num = num.replace(/[^\d.]/g, '')
+    // 只保留第一个.，清除多余的
+    num = num.replace(/\.{2,}/g, '.')
+    // 限制整数位位数
+    const index = num.indexOf('.')
+    if (index !== -1) {
+      num = num.slice(0, index + integerLimit + 1)
+    } else {
+      num = num.slice(0, integerLimit)
+    }
+    // 限制小数位位数
+    const decimalIndex = num.indexOf('.')
+    if (decimalIndex !== -1) {
+      num = num.slice(0, decimalIndex + 3)
+    }
+    return num
+  },
   handleWeight(e) {
     const value = e.detail.value
     if (value) {

src/doctor/pages/calculator/index.wxml

@@ -12,8 +12,11 @@
           class="input"
           placeholder-class="input-place"
           placeholder="请输入"
-          model:value="{{injectionWeight}}"
+          value="{{injectionWeight}}"
           bindblur="handleWeight"
+          bind:input="handleInput"
+          data-key="injectionWeight"
+          data-length="3"
         />
         <view class="sub">KG</view>
       </view>

src/doctor/pages/coltStat/index.ts

@@ -107,8 +107,7 @@ Page({
         altList,
         cfRecordList,
       }
-      console.log('DEBUGPRINT[107]: index.ts:102: initParams=', initParams)
+      this.initChart(initParams)
-      this.initChart(initParams, rangeDate)
     })
   },
   getRangeDate() {
@@ -221,8 +220,6 @@ Page({
         year,
         month,
       },
-      beginDate: dayjs(`${year}-${month}-01`).startOf('month').format('YYYY-MM-DD'),
-      endDate: dayjs(`${year}-${month}-01`).endOf('month').format('YYYY-MM-DD'),
     })
     this.handleIsDisableRight()
   },
@@ -288,8 +285,8 @@ Page({
       })
     }
   },
-  initChart({ altList = {}, astList = {}, cfRecordList = {} }, rangeDate) {
+  initChart({ altList = {}, astList = {}, cfRecordList = {} }) {
-    const arr = this.generateDateArray(rangeDate.beginDate, rangeDate.endDate)
+    const arr = this.generateDateArray(altList, astList, cfRecordList)
     const astArr: Number[] = []
     const altArr: Number[] = []
     const cfRecordArr: Number[] = []
@@ -496,15 +493,17 @@ Page({
       return chart
     })
   },
-  generateDateArray(startDate, endDate) {
+  generateDateArray(altList, astList, cfRecordList) {
-    const dates: string[] = []
+    const keys1 = Object.keys(altList)
-    let currentDate = dayjs(startDate)
+    const keys2 = Object.keys(astList)
-
+    const keys3 = Object.keys(cfRecordList)
-    while (currentDate.isBefore(dayjs(endDate).add(1, 'day'))) {
-      dates.push(currentDate.format('YYYY-MM-DD'))
-      currentDate = currentDate.add(1, 'day')
-    }
 
+    const dates = licia
+      .unique([...keys1, ...keys2, ...keys3])
+      .filter((item) => item && item != 'null')
+      .sort((a, b) => {
+        return dayjs(a).unix() - dayjs(b).unix()
+      })
     return dates
   },
 

src/doctor/pages/file/index.scss

@@ -600,7 +600,7 @@ page {
       line-height: 48rpx;
       color: #fff;
       text-align: center;
-      background: linear-gradient(356deg, #f23a2f 0%, #fc684f 100%);
+      background: linear-gradient( 356deg, #1D6BFF 0%, #4F8DFF 100%);
       border-radius: 96rpx;
     }
   }

src/doctor/pages/file/index.ts

@@ -41,9 +41,6 @@ Page({
       takeoverTap: true,
       highlightToday: true,
       onlyShowCurrentMonth: true,
-      disableMode: {
-        type: 'after', // [‘before’, 'after']
-      },
     },
   },
   onLoad(options) {
@@ -251,6 +248,15 @@ Page({
       url: `/doctor/pages/preDiagnosisReport/index?examid=${id}&period=${period}&id=${this.data.id}`,
     })
   },
+  handleRevisitRecord() {
+    this.setData({
+      nav: 0,
+    })
+    wx.pageScrollTo({
+      scrollTop: 0,
+      duration: 300,
+    })
+  },
   handleBack() {
     wx.navigateBack()
   },

src/doctor/pages/file/index.wxml

@@ -33,7 +33,7 @@
       data-nav="0"
       data-name="BTN_TREATMENT_RECORD_TAB_CLICK"
     >
-      治疗档案
+      健康档案
     </view>
     <view class="nav {{nav==1 && 'active'}}" bindtap="handleNav" data-nav="1" data-name="BTN_MEDICAL_HISTORY_TAB_CLICK">
       病史档案
@@ -376,5 +376,6 @@
       </view>
       <view class="c-sub-card"></view>
     </view>
+    <view class="btn" bind:tap="handleRevisitRecord">查看健康档案</view>
   </view>
 </view>

src/doctor/pages/index/index.scss

@@ -80,6 +80,7 @@ page {
       .card {
         flex-shrink: 0;
         .photo {
+          display: block;
           width: 424rpx;
           height: 246rpx;
           border-radius: 24rpx 24rpx 0 0;

src/doctor/pages/knowledgeDetail/index.scss

@@ -50,7 +50,7 @@
     padding-bottom: env(safe-area-inset-bottom);
     display: flex;
     align-items: center;
-    background-color: rgba(255,255,255, 0.93);
+    background-color: rgba(255, 255, 255, 0.93);
     box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
     .btn {
       flex: 1;

src/doctor/pages/lastDiagnosisReport/index.wxml

@@ -86,7 +86,7 @@
                 <view class="sub">μmol/L</view>
               </view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList2.length}}">请上传您的检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList2.length}}">检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -133,7 +133,7 @@
               />
               <view class="sub">%</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList3.length}}">请上传您的检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList3.length}}">检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -175,7 +175,7 @@
               disable-default-padding
               bind:blur="updateSave"
             ></textarea>
-            <view class="m-title" wx:if="{{attachmentList10.length}}">提交您的检测报告</view>
+            <view class="m-title" wx:if="{{attachmentList10.length}}">检测报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"

src/doctor/pages/patientDetail/index.wxml

@@ -240,7 +240,7 @@
         <image class="icon" src="{{imageUrl}}icon73.png?t={{Timestamp}}"></image>
         <view class="wrap">
           <view class="title">他的全部</view>
-          <view class="content">病历档案</view>
+          <view class="content">健康档案</view>
         </view>
       </view>
       <view class="k-item" bind:tap="handleStat">

src/doctor/pages/preDiagnosisReport/index.wxml

@@ -40,7 +40,7 @@
         </view>
         <view class="c-body {{fold1 && 'fold'}}">
           <view class="module1">
-            <view class="m-title" wx:if="{{attachmentList1.length}}">请上传您的检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList1.length}}">检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -131,7 +131,7 @@
                 <view class="sub">μmol/L</view>
               </view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList2.length}}">请上传您的检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList2.length}}">检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -180,7 +180,7 @@
               />
               <view class="sub">%</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList3.length}}">请上传您的检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList3.length}}">检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -216,7 +216,7 @@
             <view class="m-select">
               <view class="m-item {{cFII==index && 'active'}}" wx:for="{{dict.result}}" wx:key="index">{{item}}</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList4.length}}">可上传您的抑制物检查结果</view>
+            <view class="m-title" wx:if="{{attachmentList4.length}}">抑制物检查结果</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -257,7 +257,7 @@
             <view class="m-select">
               <view class="m-item {{hbvDNA==index && 'active'}}" wx:for="{{dict.number}}" wx:key="index">{{item}}</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList5.length}}">请上传乙型肝炎检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList5.length}}">乙型肝炎检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -300,7 +300,7 @@
             <view class="m-select">
               <view class="m-item {{hcvRNA==index && 'active'}}" wx:for="{{dict.result}}" wx:key="index">{{item}}</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList6.length}}">请上传丙型肝炎检查报告</view>
+            <view class="m-title" wx:if="{{attachmentList6.length}}">丙型肝炎检查报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -338,7 +338,7 @@
             <view class="m-select">
               <view class="m-item {{hiv==index && 'active'}}" wx:for="{{dict.result}}" wx:key="index">{{item}}</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList7.length}}">提交您的HIV检测报告</view>
+            <view class="m-title" wx:if="{{attachmentList7.length}}">HIV检测报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -387,7 +387,7 @@
               />
               <view class="sub">μg/L</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList8.length}}">提交您的AFP 检测报告</view>
+            <view class="m-title" wx:if="{{attachmentList8.length}}">AFP 检测报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -425,7 +425,7 @@
             <view class="m-select">
               <view class="m-item {{aav==index && 'active'}}" wx:for="{{dict.result}}" wx:key="index">{{item}}</view>
             </view>
-            <view class="m-title" wx:if="{{attachmentList9.length}}">提交您的AAV检测报告</view>
+            <view class="m-title" wx:if="{{attachmentList9.length}}">AAV检测报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"
@@ -466,7 +466,7 @@
               placeholder="--"
               disable-default-padding
             ></textarea>
-            <view class="m-title" wx:if="{{attachmentList10.length}}">提交您的检测报告</view>
+            <view class="m-title" wx:if="{{attachmentList10.length}}">检测报告</view>
             <view class="file-list">
               <uploadFile
                 upload="{{false}}"

src/pages/index/index.scss

@@ -193,7 +193,6 @@
             flex-shrink: 0;
             padding-bottom: 24rpx;
             display: flex;
-            align-items: center;
             gap: 12rpx;
             border-bottom: 1px dashed #f0f0f6;
             .icon {
@@ -205,6 +204,11 @@
               font-weight: bold;
               font-size: 28rpx;
               color: #010105;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-line-clamp: 2;
+              -webkit-box-orient: vertical;
             }
           }
           .content {

src/patient/pages/bbmReport/index.ts

@@ -51,6 +51,11 @@ Page({
         injectionDrugs,
         injectionNum,
       })
+    } else {
+      this.setData({
+        injectionDrugs: '',
+        injectionNum: '',
+      })
     }
   },
   handleChangeDate(e) {

src/patient/pages/bloodAdd/index.scss

@@ -77,8 +77,8 @@ page {
       position: relative;
       margin: 30rpx auto 0;
       padding-bottom: 24rpx;
-      width: 345rpx;
+      width: 416rpx;
-      height: 417rpx;
+      height: 504rpx;
       .part {
         position: absolute;
         width: 32rpx;

src/patient/pages/bloodAdd/index.ts

@@ -12,83 +12,83 @@ Page({
     },
     parts: [
       {
-        top: '94',
+        top: '114',
-        left: '-14',
+        left: '-16',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '28',
+        left: '36',
         active: false,
       },
       {
-        top: '88',
+        top: '106',
-        left: '72',
+        left: '88',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '126',
+        left: '152',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '184',
+        left: '226',
         active: false,
       },
       {
-        top: '88',
+        top: '106',
-        left: '238',
+        left: '290',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '284',
+        left: '342',
         active: false,
       },
       {
-        top: '94',
+        top: '114',
-        left: '324',
+        left: '394',
         active: false,
       },
       {
-        top: '194',
+        top: '236',
-        left: '122',
+        left: '148',
         active: false,
       },
       {
-        top: '194',
+        top: '236',
-        left: '190',
+        left: '230',
         active: false,
       },
       {
-        top: '296',
+        top: '356',
-        left: '122',
+        left: '146',
         active: false,
       },
       {
-        top: '296',
+        top: '356',
-        left: '190',
+        left: '234',
         active: false,
       },
       {
-        top: '364',
+        top: '438',
-        left: '122',
+        left: '146',
         active: false,
       },
       {
-        top: '364',
+        top: '438',
-        left: '190',
+        left: '236',
         active: false,
       },
       {
-        top: '396',
+        top: '476',
-        left: '104',
+        left: '130',
         active: false,
       },
       {
-        top: '396',
+        top: '476',
-        left: '206',
+        left: '250',
         active: false,
       },
     ],

src/patient/pages/bloodAdd/index.wxml

@@ -18,7 +18,7 @@
     <view class="sub-title">因反复自发性出血或创伤后出血而导致慢性损伤的关节</view>
     <view
       class="body"
-      style="background: #fff url({{imageUrl}}body1.png?t={{Timestamp}}) no-repeat top center/345rpx 417rpx"
+      style="background: #fff url({{imageUrl}}body1.png?t={{Timestamp}}) no-repeat top center/416rpx 504rpx"
     >
       <view
         class="part {{item.active && 'active'}}"

src/patient/pages/casesAdd/index.scss

@@ -355,8 +355,8 @@ page {
             position: relative;
             margin: 30rpx auto 0;
             padding-bottom: 24rpx;
-            width: 345rpx;
+            width: 416rpx;
-            height: 417rpx;
+            height: 504rpx;
             .part {
               position: absolute;
               width: 32rpx;

src/patient/pages/casesAdd/index.ts

@@ -58,83 +58,83 @@ Page({
     },
     parts: [
       {
-        top: '94',
+        top: '114',
-        left: '-14',
+        left: '-16',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '28',
+        left: '36',
         active: false,
       },
       {
-        top: '88',
+        top: '106',
-        left: '72',
+        left: '88',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '126',
+        left: '152',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '184',
+        left: '226',
         active: false,
       },
       {
-        top: '88',
+        top: '106',
-        left: '238',
+        left: '290',
         active: false,
       },
       {
-        top: '78',
+        top: '94',
-        left: '284',
+        left: '342',
         active: false,
       },
       {
-        top: '94',
+        top: '114',
-        left: '324',
+        left: '394',
         active: false,
       },
       {
-        top: '194',
+        top: '236',
-        left: '122',
+        left: '148',
         active: false,
       },
       {
-        top: '194',
+        top: '236',
-        left: '190',
+        left: '230',
         active: false,
       },
       {
-        top: '296',
+        top: '356',
-        left: '122',
+        left: '146',
         active: false,
       },
       {
-        top: '296',
+        top: '356',
-        left: '190',
+        left: '234',
         active: false,
       },
       {
-        top: '364',
+        top: '438',
-        left: '122',
+        left: '146',
         active: false,
       },
       {
-        top: '364',
+        top: '438',
-        left: '190',
+        left: '236',
         active: false,
       },
       {
-        top: '396',
+        top: '476',
-        left: '104',
+        left: '130',
         active: false,
       },
       {
-        top: '396',
+        top: '476',
-        left: '206',
+        left: '250',
         active: false,
       },
     ],

src/patient/pages/casesAdd/index.wxml

@@ -267,7 +267,7 @@
           <view class="sub-title">因反复自发性出血或创伤后出血而导致慢性损伤的关节</view>
           <view
             class="body"
-            style="background: #fff url({{imageUrl}}body1.png?t={{Timestamp}}) no-repeat top center/345rpx 417rpx"
+            style="background: #fff url({{imageUrl}}body1.png?t={{Timestamp}}) no-repeat top center/416rpx 504rpx"
           >
             <view
               class="part {{item.active && 'active'}}"

src/patient/pages/coltStat/index.ts

@@ -110,8 +110,7 @@ Page({
         altList,
         cfRecordList,
       }
-      console.log('DEBUGPRINT[107]: index.ts:102: initParams=', initParams)
+      this.initChart(initParams)
-      this.initChart(initParams, rangeDate)
     })
   },
   getRangeDate() {
@@ -225,8 +224,6 @@ Page({
         year,
         month,
       },
-      beginDate: dayjs(`${year}-${month}-01`).startOf('month').format('YYYY-MM-DD'),
-      endDate: dayjs(`${year}-${month}-01`).endOf('month').format('YYYY-MM-DD'),
     })
     this.handleIsDisableRight()
   },
@@ -292,8 +289,8 @@ Page({
       })
     }
   },
-  initChart({ altList = {}, astList = {}, cfRecordList = {} }, rangeDate) {
+  initChart({ altList = {}, astList = {}, cfRecordList = {} }) {
-    const arr = this.generateDateArray(rangeDate.beginDate, rangeDate.endDate)
+    const arr = this.generateDateArray(altList, astList, cfRecordList)
     const astArr: Number[] = []
     const altArr: Number[] = []
     const cfRecordArr: Number[] = []
@@ -500,15 +497,17 @@ Page({
       return chart
     })
   },
-  generateDateArray(startDate, endDate) {
+  generateDateArray(altList, astList, cfRecordList) {
-    const dates: string[] = []
+    const keys1 = Object.keys(altList)
-    let currentDate = dayjs(startDate)
+    const keys2 = Object.keys(astList)
-
+    const keys3 = Object.keys(cfRecordList)
-    while (currentDate.isBefore(dayjs(endDate).add(1, 'day'))) {
-      dates.push(currentDate.format('YYYY-MM-DD'))
-      currentDate = currentDate.add(1, 'day')
-    }
 
+    const dates = licia
+      .unique([...keys1, ...keys2, ...keys3])
+      .filter((item) => item && item != 'null')
+      .sort((a, b) => {
+        return dayjs(a).unix() - dayjs(b).unix()
+      })
     return dates
   },
 

src/patient/pages/file/index.ts

@@ -40,9 +40,6 @@ Page({
       takeoverTap: true,
       highlightToday: true,
       onlyShowCurrentMonth: true,
-      disableMode: {
-        type: 'after', // [‘before’, 'after']
-      },
     },
   },
   onLoad(options) {

src/patient/pages/file/index.wxml

@@ -30,7 +30,7 @@
       data-nav="0"
       data-name="BTN_TREATMENTARCHIVE_TAB_CLICK"
     >
-      治疗档案
+      健康档案
     </view>
     <view class="nav {{nav==1 && 'active'}}" bindtap="handleNav" data-nav="1" data-name="BTN_MEDICALHISTORY_TAB_CLICK">
       病史档案

src/patient/pages/index/index.scss

@@ -143,6 +143,25 @@ page {
             }
           }
         }
+        .message {
+          position: relative;
+          margin-top: 18rpx;
+          font-size: 28rpx;
+          color: rgba(161, 164, 172, 1);
+          display: flex;
+          align-items: baseline;
+          .num {
+            font-size: 36rpx;
+            color: rgba(246, 74, 58, 1);
+          }
+          .dot {
+            align-self: flex-start;
+            width: 12rpx;
+            height: 12rpx;
+            background-color: rgba(246, 74, 58, 1);
+            border-radius: 50%;
+          }
+        }
         .content {
           margin-top: 18rpx;
           font-size: 26rpx;
@@ -327,7 +346,7 @@ page {
             border-right: 1px dashed rgba(207, 209, 213, 1);
           }
           .item2 {
-            min-width: 160rpx;
+            flex: 1;
             .title {
               font-size: 28rpx;
               color: rgba(161, 164, 172, 1);
@@ -392,6 +411,7 @@ page {
       .card {
         flex-shrink: 0;
         .photo {
+          display: block;
           width: 424rpx;
           height: 246rpx;
           border-radius: 24rpx 24rpx 0 0;

src/patient/pages/index/index.ts

@@ -31,6 +31,8 @@ Page({
 
     knowledgeList: [] as any,
 
+    messageCount: 0,
+
     guide: 0,
     guideShow: false,
     guideList: ['1', '2', '3'],
@@ -52,7 +54,9 @@ Page({
         this.getKnowledge()
         this.getBindDoctorList()
         this.getTeratmentInfo()
+        this.getMesageCount()
         this.getPublicCard()
+        this.getGuide()
         const waitBindDoctorId = app.globalData.waitBindDoctorId
         if (waitBindDoctorId) {
           this.handleWaitBindDoctor(waitBindDoctorId)
@@ -67,9 +71,35 @@ Page({
     if (this.data.isLoad) {
       this.getBindDoctorList()
       this.getTeratmentInfo()
+      this.getMesageCount()
       this.getPublicCard()
+      this.getGuide()
     }
   },
+  getMesageCount() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=wtx/message-interact/get-not-read-count',
+      data: {},
+    }).then((res) => {
+      this.setData({
+        messageCount: res,
+      })
+    })
+  },
+  getGuide() {
+    wx.ajax({
+      method: 'GET',
+      url: '?r=wtx/popup/get-user-record',
+      data: {
+        type: 1,
+      },
+    }).then((res) => {
+      this.setData({
+        guideShow: res == 2,
+      })
+    })
+  },
   getPublicCard() {
     wx.ajax({
       method: 'GET',
@@ -344,6 +374,13 @@ Page({
       this.setData({
         guideShow: false,
       })
+      wx.ajax({
+        method: 'POST',
+        url: '?r=wtx/popup/add-visit-record',
+        data: {
+          type: 1,
+        },
+      })
     }
     this.setData({
       guide: Number(this.data.guide) + 1,

src/patient/pages/index/index.wxml

@@ -39,7 +39,13 @@
             <view class="name">添加医生</view>
           </view>
         </view>
-        <view class="content">随时随地您可以联系专属医生团队</view>
+        <view class="message" wx:if="{{messageCount>0}}">
+          您当前有
+          <view class="num">{{messageCount}}</view>
+          条未读消息
+          <view class="dot"></view>
+        </view>
+        <view class="content" wx:else>随时随地您可以联系专属医生团队</view>
       </view>
       <view class="btn" bind:tap="handleAskPatient">问医生</view>
     </view>

src/patient/pages/injectDate/index.ts

@@ -14,9 +14,6 @@ Page({
       takeoverTap: true,
       highlightToday: true,
       onlyShowCurrentMonth: true,
-      disableMode: {
-        type: 'after', // [‘before’, 'after']
-      },
     },
 
     endGif: false,

src/patient/pages/lastDiagnosisReport/index.scss

@@ -320,6 +320,7 @@ page {
     position: fixed;
     bottom: 0;
     left: 0;
+    z-index: 10;
     width: 100%;
     box-sizing: border-box;
     margin-top: 32rpx;