From ec6b75cfebe87ad118aba001708e686bf28e2fde Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 八月 2026 20:57:04 +0800
Subject: [PATCH] 1.新增同德药品采集、宣教功能 2.处理新华采集BUG 3.新增service_subtask的院区ID 4.采集同德的入院申请单信息 5.给出院表新增药品字段、入院申请单字段

---
 smartor/src/main/java/com/smartor/domain/PatMedInhosp.java |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index dd55132..1b59924 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -301,7 +301,7 @@
      * 绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
     @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
-    private String  deptcheckFlag;
+    private String deptcheckFlag;
     /**
      * 鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
@@ -324,7 +324,7 @@
      * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
      */
     @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
-    private String  inDeptcheckFlag;
+    private String inDeptcheckFlag;
 
     /**
      * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
@@ -390,7 +390,7 @@
     /**
      * 鍑哄叆闄㈡爣璇�
      */
-    @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌  1鍑洪櫌  ")
+    @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌  1鍑洪櫌 2 杞  3 棰勫叆闄�")
     private Integer cry;
 
     /**
@@ -511,4 +511,65 @@
     @ApiModelProperty("闄㈠尯")
     @Excel(name = " 闄㈠尯 ")
     private String campusid;
+
+    /**
+     * 灏辫瘖鏉ユ簮ID
+     */
+    @ApiModelProperty("灏辫瘖鏉ユ簮ID")
+    @Excel(name = " 灏辫瘖鏉ユ簮ID ")
+    private String encounterSourceId;
+
+    /**
+     * 閲嶈鎬ф爣璁扮紪鐮�
+     * 鏋氫妇绫诲瀷锛欼mportFlagEnum
+     * FH0165.98 - 鐗圭害浜哄憳
+     * FH0165.99 - 绂讳紤浜哄憳
+     * FH0165.03 - 鏃�
+     * FH0165.02 - 鏃ラ棿璇婄枟
+     * FH0165.01 - 鏃ラ棿鎵嬫湳
+     */
+    @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮�", example = "FH0165.01")
+    @Excel(name = " 閲嶈鎬ф爣璁扮紪鐮� ")
+    private String importanceFlagCode;
+
+    /**
+     * 绱ф�ョ▼搴︾紪鐮�
+     * 鏋氫妇绫诲瀷锛欵mergencyLevelEnum
+     * FH0164.01 - 鐩爣
+     * FH0164.02 - 鎬ュ嵄閲�
+     * FH0164.03 - 鎷╂湡
+     * FH0164.04 - 鍩虹
+     */
+    @ApiModelProperty(value = "绱ф�ョ▼搴︾紪鐮�", example = "FH0164.01")
+    @Excel(name = " 绱ф�ョ▼搴︾紪鐮� ")
+    private String emergencyLevelCode;
+
+    /**
+     * '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�
+     */
+    @ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
+    @Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
+    private String inhospMydFlag;
+
+    /**
+     * 鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊
+     */
+    @ApiModelProperty("鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+    @Excel(name = "鑽搧缂栫爜,澶氫釜鐢�,鍒嗗壊")
+    private String medicalCode;
+
+    /**
+     * 鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊
+     */
+    @ApiModelProperty("鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+    @Excel(name = "鑽搧鍚嶇О,澶氫釜鐢�,鍒嗗壊")
+    private String medicalName;
+
+    /**
+     * 鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊
+     */
+    @ApiModelProperty("鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+    @Excel(name = "鑽搧鍏徃,澶氫釜鐢�,鍒嗗壊")
+    private String medicalCompany;
+
 }

--
Gitblit v1.9.3