From 891401eebaa5446bb54f23a46a326a40619e1733 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 07 五月 2024 17:22:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-0506电子签修改' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 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 2ad7dd7..009a006 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
@@ -32,6 +34,10 @@
private String corpUserId;
/** 娲诲姩鏃ユ湡id */
private String activityDayId;
+ /** 闈㈣瘖鎴块棿id */
+ private String comRoomId;
+ /** 娌荤枟鎴块棿id */
+ private String treatRoomId;
/** 娣诲姞妯″紡(Appointment) */
@@ -76,6 +82,8 @@
private String zlTimeJson;
/** 璁惧鏃堕棿json瀛楃涓� */
private String deviceTimeJson;
+ /** 鐢熸棩鏃ユ湡(yyyy-MM-dd) */
+ private String birthday;
/** 寮�濮嬫棩鏈�(yyyy-MM-dd) */
private String arriveDate;
@@ -84,26 +92,27 @@
/** 缁撴潫鏃堕棿 */
private String endTime;
- /** 鏁烽夯鏃堕暱(鍒�) */
- private Integer palsyDuration;
- /** 绛夊緟鏃堕暱(鍒�) */
- private Integer waitDuration;
+
/** 瀹為檯闈㈣瘖鏃堕暱(鍒�) */
private Integer realMzTime;
/** 绛夊緟鏃堕暱(鍒�) */
private Integer waitTime;
-
-
+ private Integer waitDuration;
/** 娌熼�氭椂闀�(鍒�) */
private Integer gtTime;
+ private Integer comDuration;
/** 闈㈣瘖鏃堕暱(鍒�) */
private Integer mzTime;
+ private Integer docComDuration;
/** 楹绘暦鏃堕暱(鍒�) */
private Integer mfTime;
+ private Integer palsyDuration;
/** 鏈墠鏃堕暱(鍒�) */
private Integer sqTime;
+ private Integer readyDuration;
/** 娌荤枟鏃堕暱(鍒�) */
private Integer zlTime;
+ private Integer treatDuration;
/** 鍖荤敓娌荤枟鏃堕暱(鍒�) */
private Integer doctorZlTime;
@@ -124,12 +133,26 @@
/** 鐪熷疄楹绘暦鏃堕暱 */
private Integer realPalsyDuration;
- /** 缂栬緫棰勭害 - 鏄惁鏃ユ湡鏈夊彉鍖�(0鍚�1鏄�) */
- private Integer isDayChange;
- /** 缂栬緫棰勭害 - 鏄惁椤圭洰鏈夊彉鍖�(0鍚�1鏄�) */
- private Integer isProjectChange;
- /** 缂栬緫棰勭害 - 鏄惁鍖荤敓鏈夊彉鍖�(0鍚�1鏄�) */
- private Integer isChangeDoctor;
- /** 缂栬緫棰勭害 - 鏄惁鏃堕棿鏈夊彉鍖�(0鍚�1鏄�) */
- private Integer isChangeTime;
+ /** 鍙栨秷棰勭害鍑瘉鏂囦欢璺緞 */
+ private String annexUrl;
+
+// /** 缂栬緫棰勭害 - 鏄惁鏃ユ湡鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isDayChange;
+// /** 缂栬緫棰勭害 - 鏄惁椤圭洰鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isProjectChange;
+// /** 缂栬緫棰勭害 - 鏄惁鍖荤敓鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isChangeDoctor;
+// /** 缂栬緫棰勭害 - 鏄惁鏃堕棿鏈夊彉鍖�(0鍚�1鏄�) */
+// private Integer isChangeTime;
+
+
+ /** 鍚庡彴鎿嶄綔棰勭害锛氭椂闀垮瓧娈佃祴鍊肩粺涓�瀛楁 */
+ public void timeFill(){
+ this.mzTime = this.docComDuration;
+ this.gtTime = this.comDuration;
+ this.mfTime = this.palsyDuration;
+ this.sqTime = this.readyDuration;
+ this.waitTime = this.waitDuration;
+ this.zlTime = treatDuration;
+ }
}
--
Gitblit v1.8.0