gdxz/miniprogram-doctor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间样式,以及结束问诊去掉判断

Browse Source
This commit is contained in:
zoujiandong 2023-08-31 17:44:01 +08:00
parent 95d15479dc
commit c5cf4c67eb
6 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Pages/yishi/chufangsetup/index.js
View File

@ -84,9 +84,27 @@ Page({
console.log(url); console.log(url);
app.go(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){ gochat(e){
let order_inquiry_id = e.currentTarget.dataset.order_inquiry_id; let {order_inquiry_id,patient_id,doctor_id} = e.currentTarget.dataset;
let url = "/Pages/yishi/chat/index?order_inquiry_id="+order_inquiry_id; this.handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id);
app.go(url);
} }
}) })

22
Pages/yishi/chufangsetup/index.wxml
View File

@ -15,8 +15,10 @@
<!-- 头部 --> <!-- 头部 -->
<view class="item_top"> <view class="item_top">
<view class="namebox">
<view class="item_top_name">{{item.patient_name}}</view> <view class="item_top_name">{{item.patient_name}}</view>
<view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view> <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
</view>
<view class="item_top_status_box"> <view class="item_top_status_box">
<!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） --> <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
<view class="item_top_status"> <view class="item_top_status">
@ -34,9 +36,9 @@
<view class="item_content_li_title">病情描述：</view> <view class="item_content_li_title">病情描述：</view>
<view class="item_content_li_txt">{{item.disease_desc}}</view> <view class="item_content_li_txt">{{item.disease_desc}}</view>
</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_title">确诊日期：</view>
<view class="item_content_li_txt">{{item.diagnosis_date}}</view> <view class="item_content_li_txt" >{{item.diagnosis_date}}</view>
</view> </view>
<view class="item_content_li"> <view class="item_content_li">
<view class="item_content_li_title">病情诊断：</view> <view class="item_content_li_title">病情诊断：</view>
@ -46,8 +48,8 @@
</view> </view>
</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 class="item_bottom_btn" >问诊记录</view>
</view> </view>
</view> </view>
@ -61,8 +63,10 @@
<!-- 头部 --> <!-- 头部 -->
<view class="item_top"> <view class="item_top">
<view class="namebox">
<view class="item_top_name">{{item.patient_name}}</view> <view class="item_top_name">{{item.patient_name}}</view>
<view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view> <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
</view>
<view class="item_top_status_box"> <view class="item_top_status_box">
<!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） --> <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
<view class="item_top_status"> <view class="item_top_status">
@ -80,7 +84,7 @@
<view class="item_content_li_title">病情描述：</view> <view class="item_content_li_title">病情描述：</view>
<view class="item_content_li_txt">{{item.disease_desc}}</view> <view class="item_content_li_txt">{{item.disease_desc}}</view>
</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_title">确诊日期：</view>
<view class="item_content_li_txt">{{item.diagnosis_date}}</view> <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
</view> </view>
@ -92,7 +96,7 @@
</view> </view>
</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 class="item_bottom_btn">问诊记录</view>
</view> </view>
</view> </view>
@ -107,8 +111,10 @@
<view class="item" wx:for="{{chufang_list_2}}"> <view class="item" wx:for="{{chufang_list_2}}">
<!-- 头部 --> <!-- 头部 -->
<view class="item_top"> <view class="item_top">
<view class="namebox">
<view class="item_top_name">{{item.patient_name}}</view> <view class="item_top_name">{{item.patient_name}}</view>
<view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view> <view class="item_top_sex">{{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁</view>
</view>
<view class="item_top_status_box"> <view class="item_top_status_box">
<!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） --> <!-- 药师审核状态（0:审核中 1:审核成功 2:审核驳回） -->
<view class="item_top_status item_top_status_no"> <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_title">病情描述：</view>
<view class="item_content_li_txt">{{item.disease_desc}}</view> <view class="item_content_li_txt">{{item.disease_desc}}</view>
</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_title">确诊日期：</view>
<view class="item_content_li_txt">{{item.diagnosis_date}}</view> <view class="item_content_li_txt">{{item.diagnosis_date}}</view>
</view> </view>
@ -141,7 +147,7 @@
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="item_bottom"> <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 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> </view>

7
Pages/yishi/chufangsetup/index.wxss
View File

@ -23,10 +23,14 @@ page{
background-color: #fff; background-color: #fff;
margin: 20rpx 0; margin: 20rpx 0;
} }
.namebox{
display: flex;
}
.item_top{ .item_top{
position: relative; position: relative;
height: 100rpx; height: 100rpx;
display: flex; display: flex;
justify-content:space-between;
align-items: center; align-items: center;
padding: 0 32rpx; padding: 0 32rpx;
} }
@ -47,7 +51,7 @@ page{
font-size: 34rpx; font-size: 34rpx;
} }
.item_top_sex{ .item_top_sex{
margin-left: 30rpx;
font-size: 34rpx; font-size: 34rpx;
color: #666; color: #666;
} }
@ -79,6 +83,7 @@ page{
.item_content_li_txt{ .item_content_li_txt{
margin-left: 10rpx; margin-left: 10rpx;
flex: 1; flex: 1;
word-break: break-all;
color: #666666; color: #666666;
font-size: 28rpx; font-size: 28rpx;
} }

14
TUIKit/components/TUIChat/components/MessageList/index.js
View File

@ -390,13 +390,13 @@ Component({
$handleMessageRender(messageList, currentMessageList) { $handleMessageRender(messageList, currentMessageList) {
//console.log("order_inquiry_id:"+this.data.order_inquiry_id) //console.log("order_inquiry_id:"+this.data.order_inquiry_id)
console.log(messageList); console.log(messageList);
if(messageList.length>0){ // if(messageList.length>0){
let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData; // let last_cloudCustomData=messageList[messageList.length-1].cloudCustomData;
if(last_cloudCustomData){ // if(last_cloudCustomData){
let cloudCustomData=JSON.parse(last_cloudCustomData); // let cloudCustomData=JSON.parse(last_cloudCustomData);
this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id) // this.getInquiryMessageBasic(cloudCustomData.order_inquiry_id)
} // }
} // }
// console.log("handleMessageRenderhandleMessageRenderhandleMessageRender"); // console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
// this.showHistoryMessageTime(currentMessageList); // this.showHistoryMessageTime(currentMessageList);
if (messageList.length > 0) { if (messageList.length > 0) {

5
TUIKit/components/TUIChat/index.wxml
View File

@ -12,8 +12,9 @@
问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text> 问诊中｜<text wx:if="{{rest_time==-1}}" class="time_desc">不限时间</text>
<view wx:else="{{rest_time!=-1}}" class="time_desc"> <view wx:else="{{rest_time!=-1}}" class="time_desc">
<text class="time_desc">剩余</text> <text class="time_desc">剩余</text>
<van-count-down class="control-count-down" use-slot time="{{rest_time}}" bind:change="onChangeTime" format="HH:mm:ss"> <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.minutes }}分</text>
<text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text> <text class="item" wx:if="{{timeData.hours==0}}">{{ timeData.seconds }}秒</text>
</van-count-down> </van-count-down>
@ -46,7 +47,7 @@
<scroll-view class="message-list" bindtap="triggerClose"> <scroll-view class="message-list" bindtap="triggerClose">
<MessageList <MessageList
bind:getInquiryMessageBasic="getInquiryMessageBasic" bind:getInquiryMessageBasic="getInquiryMessageBasic"
bind:freshInfo="freshInfo"
bind:refreshMessageRounds="refreshMessageRounds" 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> id="MessageList" conversation="{{conversation}}" unreadCount="{{unreadCount}}" bind:changeMemberCount="changeMemberCount" bind:resendMessage="resendMessage" bind:typing="typing" order_inquiry_id="{{order_inquiry_id}}"></MessageList>
</scroll-view> </scroll-view>

10
utils/network/api.js
View File

@ -808,6 +808,16 @@ class API extends HTTP {
} }
}) })
} }
//获取患者最后一条问诊订单id
getLastInquiry(params) {
return this.request({
url: `${this.baseUrl}/inquiry/last`,
method: 'GET',
data: {
...params
}
})
}