From de54c5916e2540eb7d8ab9c439378afa17072d87 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 02 四月 2024 15:31:33 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
index 18ff523..f921814 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 棰勭害V2鐗坉to
  * @USER: fhx
@@ -26,6 +28,8 @@
     private String shopId;
     /** 鍖荤敓id */
     private String doctorId;
+    /** 鎶ゅ+id */
+    private String nurseId;
     /** 棰勭害椤鹃棶id */
     private String corpUserId;
     /** 娲诲姩鏃ユ湡id */
@@ -74,6 +78,8 @@
     private String zlTimeJson;
     /** 璁惧鏃堕棿json瀛楃涓� */
     private String deviceTimeJson;
+    /** 鐢熸棩鏃ユ湡(yyyy-MM-dd) */
+    private String birthday;
 
     /** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
     private String arriveDate;
@@ -122,6 +128,15 @@
     /** 鐪熷疄楹绘暦鏃堕暱 */
     private Integer realPalsyDuration;
 
+    /** 鍙栨秷棰勭害鍑瘉鏂囦欢璺緞 */
+    private String annexUrl;
 
-
+//    /** 缂栬緫棰勭害 - 鏄惁鏃ユ湡鏈夊彉鍖�(0鍚�1鏄�) */
+//    private Integer isDayChange;
+//    /** 缂栬緫棰勭害 - 鏄惁椤圭洰鏈夊彉鍖�(0鍚�1鏄�) */
+//    private Integer isProjectChange;
+//    /** 缂栬緫棰勭害 - 鏄惁鍖荤敓鏈夊彉鍖�(0鍚�1鏄�) */
+//    private Integer isChangeDoctor;
+//    /** 缂栬緫棰勭害 - 鏄惁鏃堕棿鏈夊彉鍖�(0鍚�1鏄�) */
+//    private Integer isChangeTime;
 }

--
Gitblit v1.8.0