From dff9cfc66cdcb547578d99af6f5080dbdf902183 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 19:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java | 17 ++++++++++++++---
1 files changed, 14 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..26a7e1e 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
@@ -13,7 +13,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 +32,10 @@
private String doctorId;
/** 鍒嗚瘖鎶ゅ＋id */
private String nurseId;
- /** */
- private Integer type;
+ /** 鍒拌绫诲瀷(VisitRecord) */
+ private Integer arrivalType;
+// /** */
+// private Integer type;
/** 鐘舵�� */
private Integer status;
/** 绛夊緟鏃堕棿 */
@@ -43,4 +53,5 @@
/** 椤圭洰json瀛楃 */
private String projectJson;
+
}
--
Gitblit v1.8.0