Merge branch 'main' of https://git.1024tool.vip/xz/patient-mini into main

pages/diagnosticResults/index.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    msg: ''
+    msg: '',
   },
   handleBack(){
     wx.navigateBack()

pages/diagnosticResults/index.less

@@ -42,6 +42,9 @@
       margin-top: -40rpx;
       margin-bottom: 24rpx;
     }
+    .success{
+      color: var(--td-brand-color);
+    }
     .msg-text{
       font-size: 30rpx;
       color: #606266;

pages/diagnosticResults/index.wxml

@@ -2,33 +2,29 @@
 
 
 <view class="emergency">
-<t-navbar
+  <t-navbar t-class-placeholder="t-navbar-placeholder" t-class-content="t-navbar-content" class="block" title="紧急通道" left-arrow bind:go-back="handleBack" />
-    t-class-placeholder="t-navbar-placeholder"
-    t-class-content="t-navbar-content"
-    class="block"
-    title="紧急通道"
-    left-arrow
-    bind:go-back="handleBack"
-  />
-  <image src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/diagnosticResults/bg.png" class="image_2"></image>
-<!-- <image src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/my/my-top-bg.png" class="image_3"></image> -->
-<view class="emergency-container">
 
-  <view class="title">
+  <image wx:if="{{msg == '暂无高危风险'}}" src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/my/my-top-bg.png" class="image_3"></image>
-    <image src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/diagnosticResults/img1.png" />
+  <image wx:else="" src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/diagnosticResults/bg.png" class="image_2"></image>
-  </view>
+  <view class="emergency-container">
-  <view class="high-risk"> 
+
-    高危预警
+    <view class="title">
-  </view>
+      <image src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/diagnosticResults/img1.png" />
-  <view class="msg-text"> 
+    </view>
-    您的症状组合提示可能存在胆管炎风险
+    <view wx:if="{{msg == '暂无高危风险'}}" class="high-risk success">
-  </view>
+      暂无风险
-  <!-- <view class="btn btn-1" bind:tap="handleDocter">
+    </view>
+    <view wx:else="" class="high-risk">
+      高危预警
+    </view>
+    <view class="msg-text">
+      {{msg}}
+    </view>
+    <!-- <view class="btn btn-1" bind:tap="handleDocter">
     <view>立即联系医生</view>
   </view>
   <view class="btn btn-2" bind:tap="handleBack">
     暂不处理
   </view> -->
   </view>
-</view>
+</view>
-

pages/followUp/index.js

@@ -385,7 +385,7 @@ Page({
 
   async getDetail(){
     const res = await request('patient/questionnaire_info', 'post',{patient_id : 0, questionnaire_id: Number(this.planId)})
-    const data = res.data
+    const data = res
     data.liver_function_image = data.liver_function_image ? data.liver_function_image.split(',') : []
     data.b_mode_image = data.b_mode_image ? data.b_mode_image.split(',') : []
     data.blood_routine_image = data.blood_routine_image ? data.blood_routine_image.split(',') : []

pages/home/index.wxml

@@ -26,7 +26,7 @@
         <ec-canvas wx:else id="mychart-dom-weight" canvas-id="mychart-weight" ec="{{ ec2 }}" ></ec-canvas>
       </view>
     </view>
-    <view class="item-content item-content-1">
+    <view class="item-content item-content-1" wx:if="{{carList.length > 0}}">
       <image class="item-content-1-bg" src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/home/img_1.png" mode="widthFix"></image>
       <view class="item-title">
         <image class="item-title-img" src="https://image-fudan.oss-cn-beijing.aliyuncs.com/mini_images/home/img_title_1.png" mode="heightFix"></image>

pages/message/index.js

@@ -106,6 +106,12 @@ Page({
       url: `/pages/followUp/index?planId=${id}&name=${name}&time=${time}` ,
     })
   },
+  goQuestionnaire(e) {
+    const data = this.data.dataList[0]
+    wx.navigateTo({
+      url: `/pages/followUp/index?planId=${data.id}&name=${data.plan_name}&time=${data.plan_date}` ,
+    })
+  },
   toRegister() {
     wx.navigateTo({
       url: '/pages/register/index',

pages/message/index.wxml

@@ -21,7 +21,7 @@
   </view>
   
   <view class="footer-example" wx:if="{{planId}}">
-    <view bindtap="toQuestionnaire" data-id="{{planId}}">
+    <view bindtap="goQuestionnaire" data-id="{{planId}}" >
       <text class="iconfont icon-zengjiatianjiajiahao"></text>
       添加随访
     </view>

pages/my/index.js

@@ -42,6 +42,7 @@ Page({
       { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' },
 
     ],
+    risk_type: ''
   },
 
   onLoad() {
@@ -56,6 +57,16 @@ Page({
     const Token = wx.getStorageSync('access_token');
     if (Token) {
       const personalInfo = await this.getPersonalInfo();
+      let style = ''
+      if(personalInfo.risk_type == '1' || !personalInfo.risk_type){
+        style = 'success'
+      }
+      if(personalInfo.risk_type == '2'){
+        style = 'waring'
+      }
+      if(personalInfo.risk_type == '3'){
+        style = 'danger'
+      }
       this.setData({
         isLoad: false,
         personalInfo: personalInfo,
@@ -64,6 +75,7 @@ Page({
           { label: '健康教育', path: '/pages/articleList/index', icon: 'setting', type: 'text' },
     
         ],
+        risk_type: style
       });
     } else {
       this.setData({

pages/my/index.less

@@ -220,7 +220,7 @@
 }
 .group_1 {
   width: 270rpx;
-  background-color: rgba(208,15,22,0.100000);
+  // background-color: rgba(208,15,22,0.100000);
   border-radius: 28rpx;
   border: 1px solid rgba(255,255,255,1);
   padding-left: 20rpx;
@@ -229,6 +229,43 @@
   justify-content: space-between;
   margin: 22rpx 82rpx 0 0;
 }
+.success{
+  background-color: rgba(43, 164, 113, 0.1);
+  .text-wrapper_2{
+    background-color: rgba(43, 164, 113, 1);;
+  }
+  .text-group_5{
+    color: rgba(43, 164, 113);
+  }
+  .thumbnail_1{
+    color: rgba(43, 164, 113);
+  }
+}
+.waring{
+  background-color: rgba(227, 115, 24, 0.1);
+  .text-wrapper_2{
+    background-color: rgba(227, 115, 24, 1);
+  }
+  .text-group_5{
+    color: rgba(227, 115, 24, 1);
+  }
+  .thumbnail_1{
+    color: rgba(227, 115, 24, 1);
+  }
+}
+.danger{
+  background-color: rgba(208, 15, 22, 0.1);
+  .text-wrapper_2{
+    background-color: rgba(208, 15, 22, 1);
+  }
+  .text-group_5{
+    color: rgba(208, 15, 22, 1);
+  }
+  .thumbnail_1{
+    color: rgba(208, 15, 22, 1);
+  }
+
+}
 .image-text_4 {
   width: 188rpx;
   flex-direction: row;
@@ -257,16 +294,7 @@
   flex-direction: column;
   padding: 12rpx 22rpx 12rpx 22rpx;
 }
-.scuess{
-  background-color: #2ba471;
-}
-.waring{
-  background-color: #e37318;
-}
-.danger{
-  background-color: rgba(208,15,22,1.000000);
 
-}
 .text_6 {
   overflow-wrap: break-word;
   color: rgba(255,255,255,1);

pages/my/index.wxml

@@ -27,20 +27,21 @@
           <text lines="1" class="text_4">胆道闭锁手术时间：{{personalInfo.operative_date}}</text>
         </view>
         
-        <view class="group_1" wx:if="{{personalInfo.risk_value}}">
+        <view class="group_1 {{risk_type}}" >
           <view class="image-text_4">
             <text class="iconfont icon-gantanhao_icon thumbnail_1"></text>
-            <text lines="1" class="text-group_5">PELD评分：{{personalInfo.risk_value}}</text>
+            <text lines="1" class="text-group_5">PELD评分：{{personalInfo.risk_value || '--'}}</text>
           </view>
-          <view class="text-wrapper_2 scuess" wx:if="{{personalInfo.risk_type == 1}}">
+          <view class="text-wrapper_2" wx:if="{{personalInfo.risk_type == 1}}">
             <text lines="1" class="text_6">低危</text>
           </view>
-          <view class="text-wrapper_2 waring" wx:if="{{personalInfo.risk_type == 2}}">
+          <view class="text-wrapper_2" wx:if="{{personalInfo.risk_type == 2}}">
             <text lines="1" class="text_6">中危</text>
           </view>
-          <view class="text-wrapper_2 danger" wx:if="{{personalInfo.risk_type == 3}}">
+          <view class="text-wrapper_2" wx:if="{{personalInfo.risk_type == 3}}">
             <text lines="1" class="text_6">高危</text>
           </view>
+         
         </view>
       </view>
       <text class="iconfont icon-youjiantou label_4"></text>

pages/register/index.wxml

@@ -3,7 +3,7 @@
     t-class-placeholder="t-navbar-placeholder"
     t-class-content="t-navbar-content"
     class="block"
-    title="紧急通道"
+    title="预约挂号"
     left-arrow
     bind:go-back="handleBack"
   />

pages/therapeuticRegimen/index.js

@@ -56,14 +56,14 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-    this.getList()
+    
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    this.getList()
   },
 
   /**

pages/therapeuticRegimen/index.less

@@ -4,7 +4,7 @@
   box-sizing: border-box;
   padding: 24rpx;
   position: relative;
-  height: calc(100vh - 130rpx);
+  height: calc(100vh - 110rpx);
   .therapeuticRegimen-item{
     padding: 28rpx;
     background-color: #fff;

pages/therapeuticRegimen/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/therapeuticRegimen/index.wxml-->
-<scroll-view class="therapeuticRegimen">
+<scroll-view class="therapeuticRegimen" scroll-y>
   <!-- <view class="therapeuticRegimen-item">
     <view class="time">
       2024.10.01 至 2024.10.31