From 7ac1a95f571617687dd859ff3cbf91a6f183b151 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 12 九月 2023 10:35:40 +0800
Subject: [PATCH] Merge branch 'rx-0822-咨询记录' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index d45a363..59ca0df 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -54,10 +54,8 @@
//鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
private String recommendProjectIds;
//涓婃娌荤枟鍖荤敓ID
- @JsonInclude(JsonInclude.Include.NON_NULL)
private String lastTreatDoctorId;
//涓婃娌荤枟椤圭洰json瀛楃涓� ["椤圭洰ID","椤圭洰ID"]
- @JsonInclude(JsonInclude.Include.NON_NULL)
private String lastTreatProjects;
//鍜ㄨ鏂瑰紡浠ｇ爜
private String methodCode;
@@ -68,12 +66,12 @@
private String id;
- //------------- 闈炲垵璇� 澶嶈瘖 璇︽儏杩斿洖
+ //------------- 璇︽儏杩斿洖
//娌荤枟鍖荤敓鍚嶇О
- @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String faceDoctorName;
+ //娌荤枟鍖荤敓鍚嶇О
private String treatDoctorName;
//涓婃娌荤枟鍖荤敓鍚嶇О
- @JsonInclude(JsonInclude.Include.NON_NULL)
private String lastTreatDoctorName;
//------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
@@ -108,6 +106,8 @@
//鍜ㄨ甯�
@JsonInclude(JsonInclude.Include.NON_NULL)
private String hisCorpUserId;
+ //鐢ㄦ埛椤鹃棶鍚嶇О
+ private String hisCorpUserName;
//鐢电綉鍜ㄨ甯�
@JsonInclude(JsonInclude.Include.NON_NULL)
private String internetCorpUserId;
@@ -311,6 +311,14 @@
this.satisfie = satisfie;
}
+ public String getFaceDoctorName() {
+ return faceDoctorName;
+ }
+
+ public void setFaceDoctorName(String faceDoctorName) {
+ this.faceDoctorName = faceDoctorName;
+ }
+
public String getTreatDoctorName() {
return treatDoctorName;
}
@@ -384,6 +392,14 @@
this.hisCorpUserId = hisCorpUserId;
}
+ public String getHisCorpUserName() {
+ return hisCorpUserName;
+ }
+
+ public void setHisCorpUserName(String hisCorpUserName) {
+ this.hisCorpUserName = hisCorpUserName;
+ }
+
public String getInternetCorpUserId() {
return internetCorpUserId;
}
--
Gitblit v1.8.0