diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js
index 10fcb32..e38c4cf 100644
--- a/Pages/yishi/chufangsetup/index.js
+++ b/Pages/yishi/chufangsetup/index.js
@@ -84,9 +84,27 @@ Page({
     console.log(url);
     app.go(url);
   },
+  handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id){
+    api. getLastInquiry({
+      patient_id:patient_id,
+      doctor_id:doctor_id
+    }).then(data=>{
+      let result=data.data;
+      let url='';
+      if(result.data){
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+result.data;
+      }else{
+        url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
+       
+      }
+      app.go(url);
+      console.log(result);
+
+    })
+  },
   gochat(e){
-    let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id;
-    let url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id;
-    app.go(url);
+    let {order_inquiry_id,patient_id,doctor_id} = e.currentTarget.dataset;
+     this.handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id);
+   
   }
 })
\ No newline at end of file
diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml
index 26a3001..6155939 100644
--- a/Pages/yishi/chufangsetup/index.wxml
+++ b/Pages/yishi/chufangsetup/index.wxml
@@ -15,8 +15,10 @@
           
             <!-- 头部 -->
             <view class="item_top">
+              <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status">
@@ -34,9 +36,9 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
-                <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
+                <view class="item_content_li_txt" >{{item.diagnosis_date}}</view>
               </view>
               <view class="item_content_li">
                 <view class="item_content_li_title">病情诊断：</view>
@@ -46,8 +48,8 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
-              <view class="item_bottom_btn">问诊记录</view>
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
+              <view class="item_bottom_btn" >问诊记录</view>
             </view>
           </view>
           
@@ -61,8 +63,10 @@
           
             <!-- 头部 -->
             <view class="item_top">
+              <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status">
@@ -80,7 +84,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -92,7 +96,7 @@
               </view>
             </view>
             <!-- 底部按钮 -->
-            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">
+            <view class="item_bottom" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">
               <view class="item_bottom_btn">问诊记录</view>
             </view>
           </view>
@@ -107,8 +111,10 @@
           <view class="item" wx:for="{{chufang_list_2}}">
             <!-- 头部 -->
             <view class="item_top">
+             <view class="namebox">
               <view class="item_top_name">{{item.patient_name}}</view>
               <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
+             </view>
               <view class="item_top_status_box">
                 <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
                 <view class="item_top_status item_top_status_no">
@@ -126,7 +132,7 @@
                 <view class="item_content_li_title">病情描述：</view>
                 <view class="item_content_li_txt">{{item.disease_desc}}</view>
               </view>
-              <view class="item_content_li">
+              <view class="item_content_li" wx:if="{{item.diagnosis_date}}">
                 <view class="item_content_li_title">确诊日期：</view>
                 <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
               </view>
@@ -141,7 +147,7 @@
             </view>
             <!-- 底部按钮 -->
             <view class="item_bottom">
-              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}">问诊记录</view>
+              <view class="item_bottom_btn" bindtap="gochat" data-order_inquiry_id="{{item.order_inquiry_id}}" data-doctor_id="{{item.doctor_id}}"  data-patient_id="{{item.patient_id}}">问诊记录</view>
               <view class="item_bottom_btn item_bottom_btn_repeat" bindtap="go" data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{item.order_inquiry_id}}&order_prescription_id={{item.order_prescription_id}}">
                   重开处方
               </view>
diff --git a/Pages/yishi/chufangsetup/index.wxss b/Pages/yishi/chufangsetup/index.wxss
index fc8f212..4038cff 100644
--- a/Pages/yishi/chufangsetup/index.wxss
+++ b/Pages/yishi/chufangsetup/index.wxss
@@ -23,10 +23,14 @@ page{
   background-color: #fff;
   margin: 20rpx 0;
 }
+.namebox{
+  display: flex;
+}
 .item_top{
   position: relative;
   height: 100rpx;
   display: flex;
+  justify-content:space-between;
   align-items: center;
   padding: 0 32rpx;
 }
@@ -47,7 +51,7 @@ page{
   font-size: 34rpx;
 }
 .item_top_sex{
- 
+ margin-left: 30rpx;
   font-size: 34rpx;
   color: #666;
 }
@@ -79,6 +83,7 @@ page{
 .item_content_li_txt{
   margin-left: 10rpx;
   flex: 1;
+  word-break: break-all;
   color: #666666;
   font-size: 28rpx;
 }
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js
index f104ea5..5b04e38 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -390,13 +390,13 @@ Component({
     $handleMessageRender(messageList, currentMessageList) {
       //console.log("order_inquiry_id:"+this.data.order_inquiry_id)
       console.log(messageList);
-      if(messageList.length>0){
-        let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
-        if(last_cloudCustomData){
-          let cloudCustomData=JSON.parse(last_cloudCustomData);
-          this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
-        }
-      }
+      // if(messageList.length>0){
+      //   let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
+      //   if(last_cloudCustomData){
+      //     let cloudCustomData=JSON.parse(last_cloudCustomData);
+      //     this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
+      //   }
+      // }
       // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
       // this.showHistoryMessageTime(currentMessageList);
       if (messageList.length > 0) {
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index d5f904b..241a7d6 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -12,8 +12,9 @@
         问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text>
         <view wx:else="{{rest_time!=-1}}" class="time_desc">
           <text class="time_desc">剩余</text>
+        
           <van-count-down class="control-count-down" use-slot time="{{rest_time}}" bind:change="onChangeTime" format="HH:mm:ss">
-                <text class="item" wx:if="{{timeData.hours!= 0 && timeData.days!=0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
+                <text class="item" wx:if="{{timeData.hours!= 0 || timeData.days!=0}}">{{(timeData.days*24)+timeData.hours }}小时</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{timeData.minutes }}分</text>
                 <text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text>
               </van-count-down>
@@ -46,7 +47,7 @@
     <scroll-view  class="message-list" bindtap="triggerClose">
     <MessageList 
     bind:getInquiryMessageBasic="getInquiryMessageBasic" 
-   
+    bind:freshInfo="freshInfo"
     bind:refreshMessageRounds="refreshMessageRounds" 
     id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
   </scroll-view>
diff --git a/utils/network/api.js b/utils/network/api.js
index cbc8a7f..a1988a1 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -808,6 +808,16 @@ class API extends HTTP {
     }
   })
 }
+//获取患者最后一条问诊订单id
+getLastInquiry(params) {
+  return this.request({
+    url: `${this.baseUrl}/inquiry/last`,
+    method: 'GET',
+    data: {
+      ...params
+    }
+  })
+}