From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊

---
 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
index a15203e..27e25c4 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
@@ -4,6 +4,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 鐢ㄦ埛绉戝鍏崇郴杞崲浣跨敤
@@ -15,6 +16,8 @@
     private Integer type;
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
+    /**闂ㄥ簵鏍囪瘑*/
+    private String shopId;
     /**鐐硅瘖鏃堕棿寮�濮�*/
     private Date startTime;
     /**鐐硅瘖鏃堕棿缁撴潫*/
@@ -25,6 +28,16 @@
     private String operatorRemark;
     /**绉戝鍏崇郴Json*/
     private List<UserDoctorRoomItemDto> roomList;
+    /**
+     * 绉戝鍏崇郴瀛樺偍绫诲瀷:
+     * 0鎸夋�荤殑鍏崇郴瀛樺偍鎴愪竴鏉$偣璇�
+     * 1鎸夊尰鐢熷垎寮�瀛樺偍鎴愪袱鏉$偣璇�
+     * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉慉鍖荤敓->鐐硅瘖C鍖荤敓  瀛樺偍涓�鏉�
+     * 娉ㄥ皠绉慉鍖荤敓->鐐硅瘖B鍖荤敓 鐨偆绉態鍖荤敓->鐐硅瘖C鍖荤敓  瀛樺偍涓ゆ潯
+     * */
+    private Integer roomType = 0 ;
+    /**鍖荤敓鏍囪瘑,鍏宠仈鏍囪瘑*/
+    private Map<String,String> roomTypeMap;
 
     /**鎿嶄綔浜轰俊鎭�*/
     private String opId;

--
Gitblit v1.8.0