From 1b8adeecac5ed53bdc238eae67278c6de9a6c487 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 23 May 2022 12:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=9B=9E=E8=AE=BFupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/talkonlineweb/task/PushChatInfoTask.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java
index 9956dd8..ef149d9 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushChatInfoTask.java
@@ -95,7 +95,8 @@ public class PushChatInfoTask {
 
         if (null!=chatgroup) {
             final List<LymsReturnVisitRecord> returnVisitRecords = lymsReturnVisitRecordService.list(new QueryWrapper<LymsReturnVisitRecord>()
-                    .lambda().eq(LymsReturnVisitRecord::getPcid, (Integer)map.get("pcid")));
+                    .lambda().eq(LymsReturnVisitRecord::getPcid, (Integer)map.get("pcid"))
+                    .eq(LymsReturnVisitRecord::getType, 0));
             List<LymsDoctor> doctorAminList= lymsDoctorService.list(new QueryWrapper<LymsDoctor>()
                     .lambda().eq(LymsDoctor::getDpid, doctor.getDpid())
                     .in(LymsDoctor::getAdminType, Arrays.asList(1,2))
@@ -103,7 +104,7 @@ public class PushChatInfoTask {
             int day = DateUtil.daysBetween(DateUtil.parseYMD(map.get("createdtime").toString()),new Date());
             switch (returnVisitRecords.size()) {
                 case 0:
-                    if (day==2) {
+                    if (day==1) {
                         //就诊医生回复
                         final List<LymsIllness> lymsIllnessList = lymsIllnessService.list(new QueryWrapper<LymsIllness>()
                                 .lambda().eq(LymsIllness::getPcid, (Integer) map.get("pcid")));
@@ -125,7 +126,7 @@ public class PushChatInfoTask {
                     }
                     break;
                 case 1:
-                    if (day==5) {
+                    if (day==4) {
                         //获取值班护士回复
                         String dlogin="";
                         for (LymsDoctor lymsDoctor : doctorAminList) {
@@ -153,7 +154,7 @@ public class PushChatInfoTask {
                     }
                     break;
                 case 2:
-                    if (day==10) {
+                    if (day==9) {
                         //获取值班医生回复
                         String dlogin="";
                         for (LymsDoctor lymsDoctor : doctorAminList) {
@@ -182,7 +183,7 @@ public class PushChatInfoTask {
                     }
                     break;
                 case 3:
-                    if (day==20) {
+                    if (day==19) {
                         //就诊医生回复
                         final List<LymsIllness> lymsIllnessList = lymsIllnessService.list(new QueryWrapper<LymsIllness>()
                                 .lambda().eq(LymsIllness::getPcid, (Integer) map.get("pcid")));
@@ -204,7 +205,7 @@ public class PushChatInfoTask {
                     }
                     break;
                 case 4:
-                    if (day==30) {
+                    if (day==29) {
                         //获取值班医生回复
                         String dlogin="";
                         for (LymsDoctor lymsDoctor : doctorAminList) {
@@ -362,6 +363,7 @@ public class PushChatInfoTask {
         returnVisitRecord.setIdno(patient.getIdno());
         returnVisitRecord.setType(0);
         returnVisitRecord.setHxgroupid(chatgroup.getHxgroupid());
+        returnVisitRecord.setPcid(chatgroup.getPcid());
         final boolean save = lymsReturnVisitRecordService.save(returnVisitRecord);
         if (!save) {
             throw new RuntimeException("回滚状态，执行失败，请联系管理员");
-- 
1.8.3.1