From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/visitOrder/VisitOrderDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 26a7e1e..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
@@ -34,6 +36,8 @@
private String nurseId;
/** 鍒拌绫诲瀷(VisitRecord) */
private Integer arrivalType;
+ /** 鍒板簵鏃堕棿 */
+ private Date arrivalTime;
// /** */
// private Integer type;
/** 鐘舵�� */
@@ -53,5 +57,10 @@
/** 椤圭洰json瀛楃 */
private String projectJson;
+ //鎵爜鍏紬鍙峰埌璁夸娇鐢ㄥ弬鏁�
+ /** 鍒拌鐮佺紪鍙�(CodeNoData) */
+ private String codeNo;
+ /** 鏄惁闇�瑕佸鐞嗚繑鍥炲叕浼楀彿閫氱煡娑堟伅鏂囨 */
+ private boolean isGzhNoticeMsg = false;
}
--
Gitblit v1.8.0