From 145040df6cd381d11bbb44d083833a45795aa49d Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期一, 15 七月 2024 17:27:31 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java | 5 +++++ phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java index b9838b2..17f0d1c 100644 --- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java +++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java @@ -53,6 +53,8 @@ /**鍒涘缓浜�*/ private String createPersonName; + /**鍒涘缓浜虹被鍨� 0 绗笁鏂瑰钩鍙�(鍛樺伐淇℃伅) 1 鍚庡彴 (鍚庡彴鐢ㄦ埛淇℃伅)锛�2 绯荤粺鍒涘缓*/ + private Integer createPersonType; private List<ReturnVisitListItemProjectVo> projectList = new ArrayList<>(); diff --git a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java index 4f5ed50..2321017 100644 --- a/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java +++ b/phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitRecordFindVo.java @@ -56,6 +56,11 @@ private List<String> employeeIdList; /***绉戝鍖荤敓鏍囪瘑**/ private List<String> doctorIdList; + /**绉戝鍖荤敓鍖诲姪鏍囪瘑*/ + private String doctorAssId; + + /***绛涢�夌被鍨�:0鍏ㄩ儴,1鍥炶浜烘槸鑷繁,2鏄【闂粍,3鏄尰鐢熺粍**/ + private Integer selectType = 0; /*** 鍒涘缓浜�**/ private String createPersonName; -- Gitblit v1.8.0