From b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 24 五月 2024 16:33:49 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
index 19688b9..22bd3ce 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.Date;
+
/**
* 鍒拌鎿嶄綔dto
* @USER: fhx
@@ -13,7 +15,15 @@
/** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
/** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
- private String loginRoleId;
+ private String opRoleId;
+
+
+ /** 棰勭害id */
+ private String appointmentId;
+ /** 鐢ㄦ埛id */
+ private String userId;
+ /** 闂ㄥ簵id */
+ private String shopId;
/** 鍒拌璁㈠崟id */
private String id;
@@ -24,8 +34,12 @@
private String doctorId;
/** 鍒嗚瘖鎶ゅ＋id */
private String nurseId;
- /** */
- private Integer type;
+ /** 鍒拌绫诲瀷(VisitRecord) */
+ private Integer arrivalType;
+ /** 鍒板簵鏃堕棿 */
+ private Date arrivalTime;
+// /** */
+// private Integer type;
/** 鐘舵�� */
private Integer status;
/** 绛夊緟鏃堕棿 */
@@ -43,4 +57,10 @@
/** 椤圭洰json瀛楃 */
private String projectJson;
+ //鎵爜鍏紬鍙峰埌璁夸娇鐢ㄥ弬鏁�
+ /** 鍒拌鐮佺紪鍙�(CodeNoData) */
+ private String codeNo;
+ /** 鏄惁闇�瑕佸鐞嗚繑鍥炲叕浼楀彿閫氱煡娑堟伅鏂囨 */
+ private boolean isGzhNoticeMsg = false;
+
}
--
Gitblit v1.8.0