From bdd39fac56c367b36d6c41ef2cd5c9f35926013f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 15:07:50 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 f921814..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
@@ -34,6 +34,10 @@
private String corpUserId;
/** 娲诲姩鏃ユ湡id */
private String activityDayId;
+ /** 闈㈣瘖鎴块棿id */
+ private String comRoomId;
+ /** 娌荤枟鎴块棿id */
+ private String treatRoomId;
/** 娣诲姞妯″紡(Appointment) */
@@ -88,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;
@@ -139,4 +144,15 @@
// 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