From b912b025ab9d6f1bd6510282d7f05f3768057722 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期一, 06 十二月 2021 14:31:12 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/doc/sql/20211203_w.sql | 2 ++
PAMapp/pages/myAppointmentList/appointmentList.vue | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/PAMapp/pages/myAppointmentList/appointmentList.vue b/PAMapp/pages/myAppointmentList/appointmentList.vue
index 4e6ac07..8cee481 100644
--- a/PAMapp/pages/myAppointmentList/appointmentList.vue
+++ b/PAMapp/pages/myAppointmentList/appointmentList.vue
@@ -39,7 +39,7 @@
onMyAppointmentListChange() {
const unreadList = this.myAppointmentList
.filter(item => item.communicateStatus !== 'contacted' && !item.consultantReadTime)
- .sort((a, b) => a.consultantViewTime > b.consultantViewTime ? 1 : -1);
+ .sort((a, b) => a.appointmentDate > b.appointmentDate ? -1 : 1);
const readList = this.myAppointmentList
.filter(item => item.communicateStatus !== 'contacted' && item.consultantReadTime)
diff --git a/pamapi/src/doc/sql/20211203_w.sql b/pamapi/src/doc/sql/20211203_w.sql
index b6adcdc..1d45563 100644
--- a/pamapi/src/doc/sql/20211203_w.sql
+++ b/pamapi/src/doc/sql/20211203_w.sql
@@ -1 +1,3 @@
UPDATE omo.appointment SET contact_time = appointment_date where communicate_status = 'CONTACTED';
+UPDATE omo.appointment SET consultant_view_time = appointment_date where communicate_status = 'CONTACTED';
+UPDATE omo.appointment SET consultant_read_time = appointment_date where communicate_status = 'CONTACTED';
--
Gitblit v1.8.0