From 6e9acc9002dde1db8acced50f1099cb4170eac2d Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Sat, 21 May 2022 08:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0retDlogin,pcid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/controller/ChatGroupController.java | 3 ++- .../talkonlineweb/controller/TkRecordController.java | 5 ++++- .../com/lyms/talkonlineweb/domain/LymsChatgroup.java | 10 ++++++++++ .../talkonlineweb/domain/LymsReturnVisitRecord.java | 17 +++++++++++------ .../com/lyms/talkonlineweb/domain/LymsTkrecord.java | 9 ++++++++- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java index 58c2ac9..763f2a9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -95,10 +95,11 @@ public class ChatGroupController { LymsDoctor doctor= lymsDoctorService.getOne(new QueryWrapper() .lambda().eq(LymsDoctor::getDlogin, group.getTarget())); LymsReturnVisitRecord returnVisitRecord=new LymsReturnVisitRecord(); - returnVisitRecord.setDlogins(doctor.getDlogin()); + returnVisitRecord.setDlogin(group.getRetDlogin());//前端传的当前登录医生账号 returnVisitRecord.setDpid(doctor.getDpid()); returnVisitRecord.setIdno(patient.getIdno()); returnVisitRecord.setType(1); + returnVisitRecord.setPcid(group.getPcid()); returnVisitRecord.setHxgroupid(group2.getHxgroupid()); lymsReturnVisitRecordService.save(returnVisitRecord); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java index db5d1e1..1a47129 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java @@ -141,6 +141,8 @@ public class TkRecordController { group.setGroupname(StringUtils.join(groupnames.toArray(), ",")); group.setFromp(patient.getIdno()); group.setTarget(doctor.getDlogin()); + group.setRetDlogin(tkrecord.getRetDlogin());//前端传的当前登录医生账号 + group.setPcid(tkrecord.getPcid()); if(null==tkrecord.getType()) { lymsChatgroupService.saveOrUpdate(group); lymsTkrecordService.save(tkrecord); @@ -148,10 +150,11 @@ public class TkRecordController { group.setType(1); lymsChatgroupService.saveOrUpdate(group); LymsReturnVisitRecord returnVisitRecord=new LymsReturnVisitRecord(); - returnVisitRecord.setDlogins(doctor.getDlogin()); + returnVisitRecord.setDlogin(group.getRetDlogin()); returnVisitRecord.setDpid(doctor.getDpid()); returnVisitRecord.setIdno(patient.getIdno()); returnVisitRecord.setType(1); + returnVisitRecord.setPcid(tkrecord.getPcid()); returnVisitRecord.setHxgroupid(rJson.getJSONObject("data").getString("groupid")); lymsReturnVisitRecordService.save(returnVisitRecord); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java index 405875b..7b3cae7 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java @@ -74,6 +74,16 @@ public class LymsChatgroup implements Serializable { */ @TableField(value = "stat") private Integer stat; + /** + * 回访医生dlogin + */ + @TableField(value = "retdlogin") + private String retDlogin; + /** + * 病例id + */ + @TableField(value = "pcid") + private Integer pcid; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsReturnVisitRecord.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsReturnVisitRecord.java index 4e42b1d..4fcd69a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsReturnVisitRecord.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsReturnVisitRecord.java @@ -22,10 +22,10 @@ public class LymsReturnVisitRecord implements Serializable { private Integer id; /** - * 回访医生dlogin组 + * 回访医生dlogin */ - @TableField(value = "dlogins") - private String dlogins; + @TableField(value = "dlogin") + private String dlogin; /** * 科室id @@ -62,6 +62,11 @@ public class LymsReturnVisitRecord implements Serializable { */ @TableField(value = "update_time") private Date updateTime; + /** + * 病例id + */ + @TableField(value = "pcid") + private Integer pcid; @TableField(exist = false) private static final long serialVersionUID = 1L; @@ -79,7 +84,7 @@ public class LymsReturnVisitRecord implements Serializable { } LymsReturnVisitRecord other = (LymsReturnVisitRecord) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getDlogins() == null ? other.getDlogins() == null : this.getDlogins().equals(other.getDlogins())) + && (this.getDlogin() == null ? other.getDlogin() == null : this.getDlogin().equals(other.getDlogin())) && (this.getDpid() == null ? other.getDpid() == null : this.getDpid().equals(other.getDpid())) && (this.getIdno() == null ? other.getIdno() == null : this.getIdno().equals(other.getIdno())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) @@ -93,7 +98,7 @@ public class LymsReturnVisitRecord implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getDlogins() == null) ? 0 : getDlogins().hashCode()); + result = prime * result + ((getDlogin() == null) ? 0 : getDlogin().hashCode()); result = prime * result + ((getDpid() == null) ? 0 : getDpid().hashCode()); result = prime * result + ((getIdno() == null) ? 0 : getIdno().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); @@ -110,7 +115,7 @@ public class LymsReturnVisitRecord implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", dlogins=").append(dlogins); + sb.append(", dlogin=").append(dlogin); sb.append(", dpid=").append(dpid); sb.append(", idno=").append(idno); sb.append(", type=").append(type); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java index 578859e..d86a378 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java @@ -36,7 +36,7 @@ public class LymsTkrecord implements Serializable { private Integer did; /** - * 诊断id + * 病例id */ @TableField(value = "pcid") private Integer pcid; @@ -96,4 +96,11 @@ public class LymsTkrecord implements Serializable { */ @TableField(exist = false) private Integer type; + + /** + * 回访医生dlogin + */ + @TableField(exist = false) + private String retDlogin; + } \ No newline at end of file -- 1.8.3.1