From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组

---
 smartor/src/main/java/com/smartor/domain/PatMedInhosp.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index fb3bbf7..e87ed24 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -98,6 +98,11 @@
     private String icd10code;
 
     /**
+     * 鍏ラ櫌璇婃柇ICD鍊肩紪鍙烽泦鍚�
+     */
+    @ApiModelProperty(value = "鍏ラ櫌璇婃柇ICD鍊肩紪鍙烽泦鍚�")
+    private List<String> icd10codeList;
+    /**
      * 鍏ラ櫌璇婃柇鍚嶇О
      */
     @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
@@ -296,7 +301,7 @@
      * 绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
     @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
-    private String  deptcheckFlag;
+    private String deptcheckFlag;
     /**
      * 鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
@@ -309,10 +314,17 @@
     private String diagcheckFlag;
 
     /**
+     * 浠诲姟缁勶紙appltype=5锛夐杞撼鍏ユ爣璁帮細0鏈鐞�  1宸茬敓鎴愰杞�  2鏃犲尮閰�/澶辫触
+     * 鐙珛浜� dept/ward/diag check_flag锛屼笓渚涗换鍔$粍鐙珛鎵弿浣跨敤锛涘悗缁疆娆$敱 rollTaskGroupCycle 璐熻矗銆�
+     */
+    @ApiModelProperty(value = "浠诲姟缁�(appltype=5)棣栬疆绾冲叆鏍囪锛�0鏈鐞� 1宸茬敓鎴愰杞� 2鏃犲尮閰�/澶辫触")
+    private String scheduleCheckFlag;
+
+    /**
      * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
     @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
-    private String  inDeptcheckFlag;
+    private String inDeptcheckFlag;
 
     /**
      * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
@@ -499,4 +511,11 @@
     @ApiModelProperty("闄㈠尯")
     @Excel(name = " 闄㈠尯 ")
     private String campusid;
+
+    /**
+     * '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�
+     */
+    @ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
+    @Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
+    private String inhospMydFlag;
 }

--
Gitblit v1.9.3