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/ServiceTaskVO.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 174128d..ed1cb5f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -414,6 +414,27 @@
     private String icd10name;
 
     /**
+     * 鑽搧缂栫爜
+     */
+    @ApiModelProperty("鑽搧缂栫爜")
+    @Excel(name = "鑽搧缂栫爜")
+    private String medicalCode;
+
+    /**
+     * 鑽搧鍘傚
+     */
+    @ApiModelProperty("鑽搧鍘傚")
+    @Excel(name = "鑽搧鍘傚")
+    private String medicalCompany;
+
+    /**
+     * 鐤剧梾鍚嶇О
+     */
+    @ApiModelProperty("鑽搧鍚嶇О")
+    @Excel(name = "鑽搧鍚嶇О")
+    private String medicalName;
+
+    /**
      * 鎵嬫湳缂栫爜
      */
     @ApiModelProperty("鎵嬫湳缂栫爜")
@@ -434,10 +455,10 @@
     @Excel(name = "鎵嬫湳绛夌骇缂栫爜")
     private String oplevelcode;
     /**
-     * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
+     * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�
      */
-    @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
-    @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+    @ApiModelProperty("閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�  6.鎸夎嵂鍝佺紪鐮�")
+    @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷銆�5銆佹寜浠诲姟缁�")
     private String appltype;
 
     @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
@@ -452,4 +473,10 @@
     @ApiModelProperty(value = "鐤剧梾鐥呯")
     @Excel(name = " 鐤剧梾鐥呯")
     private String diagType;
+
+    /**
+     * 浠诲姟缁勮鍒掞紙appltype=5 蹇呭~锛屼富璁″垝 + 鏄庣粏鍒楄〃锛�
+     */
+    @ApiModelProperty(value = "浠诲姟缁勮鍒掞紙appltype=5 蹇呭~锛屼富璁″垝+鏄庣粏锛�")
+    private ServiceTaskScheduleVO serviceTaskScheduleVO;
 }

--
Gitblit v1.9.3