changpengfei / talkonline

Commit 6e9acc9002dde1db8acced50f1099cb4170eac2d

Authored by shiyang almost 3 years ago

Exists in master

增加retDlogin,pcid

Showing 5 changed files with 35 additions and 9 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsReturnVisitRecord.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java

...	...	@@ -95,10 +95,11 @@
95	95	LymsDoctor doctor= lymsDoctorService.getOne(new QueryWrapper<LymsDoctor>()
96	96	.lambda().eq(LymsDoctor::getDlogin, group.getTarget()));
97	97	LymsReturnVisitRecord returnVisitRecord=new LymsReturnVisitRecord();
98		- returnVisitRecord.setDlogins(doctor.getDlogin());
	98	+ returnVisitRecord.setDlogin(group.getRetDlogin());//前端传的当前登录医生账号
99	99	returnVisitRecord.setDpid(doctor.getDpid());
100	100	returnVisitRecord.setIdno(patient.getIdno());
101	101	returnVisitRecord.setType(1);
	102	+ returnVisitRecord.setPcid(group.getPcid());
102	103	returnVisitRecord.setHxgroupid(group2.getHxgroupid());
103	104	lymsReturnVisitRecordService.save(returnVisitRecord);
104	105	}

...	...	@@ -141,6 +141,8 @@
141	141	group.setGroupname(StringUtils.join(groupnames.toArray(), ","));
142	142	group.setFromp(patient.getIdno());
143	143	group.setTarget(doctor.getDlogin());
	144	+ group.setRetDlogin(tkrecord.getRetDlogin());//前端传的当前登录医生账号
	145	+ group.setPcid(tkrecord.getPcid());
144	146	if(null==tkrecord.getType()) {
145	147	lymsChatgroupService.saveOrUpdate(group);
146	148	lymsTkrecordService.save(tkrecord);
147	149
...	...	@@ -148,10 +150,11 @@
148	150	group.setType(1);
149	151	lymsChatgroupService.saveOrUpdate(group);
150	152	LymsReturnVisitRecord returnVisitRecord=new LymsReturnVisitRecord();
151		- returnVisitRecord.setDlogins(doctor.getDlogin());
	153	+ returnVisitRecord.setDlogin(group.getRetDlogin());
152	154	returnVisitRecord.setDpid(doctor.getDpid());
153	155	returnVisitRecord.setIdno(patient.getIdno());
154	156	returnVisitRecord.setType(1);
	157	+ returnVisitRecord.setPcid(tkrecord.getPcid());
155	158	returnVisitRecord.setHxgroupid(rJson.getJSONObject("data").getString("groupid"));
156	159	lymsReturnVisitRecordService.save(returnVisitRecord);
157	160	}

...	...	@@ -74,6 +74,16 @@
74	74	*/
75	75	@TableField(value = "stat")
76	76	private Integer stat;
	77	+ /**
	78	+ * 回访医生dlogin
	79	+ */
	80	+ @TableField(value = "retdlogin")
	81	+ private String retDlogin;
	82	+ /**
	83	+ * 病例id
	84	+ */
	85	+ @TableField(value = "pcid")
	86	+ private Integer pcid;
77	87
78	88	@TableField(exist = false)
79	89	private static final long serialVersionUID = 1L;

...	...	@@ -22,10 +22,10 @@
22	22	private Integer id;
23	23
24	24	/**
25		- * 回访医生dlogin组
	25	+ * 回访医生dlogin
26	26	*/
27		- @TableField(value = "dlogins")
28		- private String dlogins;
	27	+ @TableField(value = "dlogin")
	28	+ private String dlogin;
29	29
30	30	/**
31	31	* 科室id
...	...	@@ -62,6 +62,11 @@
62	62	*/
63	63	@TableField(value = "update_time")
64	64	private Date updateTime;
	65	+ /**
	66	+ * 病例id
	67	+ */
	68	+ @TableField(value = "pcid")
	69	+ private Integer pcid;
65	70
66	71	@TableField(exist = false)
67	72	private static final long serialVersionUID = 1L;
...	...	@@ -79,7 +84,7 @@
79	84	}
80	85	LymsReturnVisitRecord other = (LymsReturnVisitRecord) that;
81	86	return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
82		- && (this.getDlogins() == null ? other.getDlogins() == null : this.getDlogins().equals(other.getDlogins()))
	87	+ && (this.getDlogin() == null ? other.getDlogin() == null : this.getDlogin().equals(other.getDlogin()))
83	88	&& (this.getDpid() == null ? other.getDpid() == null : this.getDpid().equals(other.getDpid()))
84	89	&& (this.getIdno() == null ? other.getIdno() == null : this.getIdno().equals(other.getIdno()))
85	90	&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
...	...	@@ -93,7 +98,7 @@
93	98	final int prime = 31;
94	99	int result = 1;
95	100	result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
96		- result = prime * result + ((getDlogins() == null) ? 0 : getDlogins().hashCode());
	101	+ result = prime * result + ((getDlogin() == null) ? 0 : getDlogin().hashCode());
97	102	result = prime * result + ((getDpid() == null) ? 0 : getDpid().hashCode());
98	103	result = prime * result + ((getIdno() == null) ? 0 : getIdno().hashCode());
99	104	result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
...	...	@@ -110,7 +115,7 @@
110	115	sb.append(" [");
111	116	sb.append("Hash = ").append(hashCode());
112	117	sb.append(", id=").append(id);
113		- sb.append(", dlogins=").append(dlogins);
	118	+ sb.append(", dlogin=").append(dlogin);
114	119	sb.append(", dpid=").append(dpid);
115	120	sb.append(", idno=").append(idno);
116	121	sb.append(", type=").append(type);

...	...	@@ -36,7 +36,7 @@
36	36	private Integer did;
37	37
38	38	/**
39		- * 诊断id
	39	+ * 病例id
40	40	*/
41	41	@TableField(value = "pcid")
42	42	private Integer pcid;
...	...	@@ -96,5 +96,12 @@
96	96	*/
97	97	@TableField(exist = false)
98	98	private Integer type;
	99	+
	100	+ /**
	101	+ * 回访医生dlogin
	102	+ */
	103	+ @TableField(exist = false)
	104	+ private String retDlogin;
	105	+
99	106	}