From 586a386b2d779e94002c8099ff62271b0e684d88 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 06 五月 2026 11:35:19 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/domain/PatMedInhosp.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index ee5065a..14ec743 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -79,6 +79,12 @@
     private String hospitaldistrictcode;
 
     /**
+     * 闄㈠尯缂栧彿闆嗗悎
+     */
+    @ApiModelProperty(value = "闄㈠尯缂栧彿闆嗗悎")
+    private List<String> hospitaldistrictcodeList;
+
+    /**
      * 闄㈠尯鍚嶇О
      */
     @ApiModelProperty(value = "闄㈠尯鍚嶇О")
@@ -118,6 +124,11 @@
      */
     @ApiModelProperty(value = "鍏ラ櫌绉戝浠g爜")
     private String deptcode;
+    /**
+     * 鍏ラ櫌绉戝浠g爜
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝浠g爜闆嗗悎")
+    private List<String> deptcodeList;
 
     /**
      * 鍏ラ櫌绉戝鍚嶇О
@@ -196,9 +207,9 @@
     private String drname;
 
     /**
-     * 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢
+     * 鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢
      */
-    @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢")
+    @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢")
     private Long schemestatus;
 
     /**
@@ -278,14 +289,14 @@
     /**
      * 浣忛櫌鏍囪瘑锛� 0锛氬湪闄�  1锛氬嚭闄�    2锛氳浆绉�
      */
-    @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄�  1锛氬嚭闄�    2锛氳浆绉�")
+    @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄�  1锛氬嚭闄�    2锛氳浆绉�  3寰呭叆闄�")
     private String inhospstate;
 
     /**
      * 绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
     @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
-    private String deptcheckFlag;
+    private String  deptcheckFlag;
     /**
      * 鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
@@ -298,6 +309,18 @@
     private String diagcheckFlag;
 
     /**
+     * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String  inDeptcheckFlag;
+
+    /**
+     * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String inWardcheckFlag;
+
+    /**
      * 骞撮緞
      */
     @ApiModelProperty(value = "骞撮緞")

--
Gitblit v1.9.3