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/ServiceTaskmedical.java |  164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 164 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskmedical.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskmedical.java
new file mode 100644
index 0000000..c664243
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskmedical.java
@@ -0,0 +1,164 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 浠诲姟鑽搧鍏宠仈瀵硅薄 service_taskmedical
+ *
+ * @author lihu
+ * @date 2026-07-29
+ */
+@Data
+@ApiModel("浠诲姟鑽搧鍏宠仈")
+public class ServiceTaskmedical extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty("鑷ID")
+    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 鍖婚櫌鏈烘瀯ID
+     */
+    @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
+    @Excel(name = "鍖婚櫌鏈烘瀯ID")
+    private String orgid;
+
+    /**
+     * 浠诲姟id
+     */
+    @ApiModelProperty("浠诲姟id")
+    @Excel(name = "浠诲姟id")
+    private Long taskId;
+
+    /**
+     * 浠诲姟鍚嶇О
+     */
+    @ApiModelProperty("浠诲姟鍚嶇О")
+    @Excel(name = "浠诲姟鍚嶇О")
+    private String taskName;
+
+    /**
+     * 鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸
+     */
+    @ApiModelProperty("鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸")
+    @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細  0锛氫笉鏄�    1锛氭槸")
+    private Long longtask;
+
+    /**
+     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+     */
+    @ApiModelProperty("鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+    private String serviceType;
+
+    /**
+     * 鐤剧梾id
+     */
+    @ApiModelProperty("鐤剧梾id")
+    @Excel(name = "鐤剧梾id")
+    private Long icd10id;
+
+    /**
+     * 鑽搧缂栫爜
+     */
+    @ApiModelProperty("鑽搧缂栫爜")
+    @Excel(name = "鑽搧缂栫爜")
+    private String medicalCode;
+
+    /**
+     * 鑽搧鍚嶇О
+     */
+    @ApiModelProperty("鑽搧鍚嶇О")
+    @Excel(name = "鑽搧鍚嶇О")
+    private String medicalName;
+
+    /**
+     * 鑽搧鍘傚
+     */
+    @ApiModelProperty("鑽搧鍘傚")
+    @Excel(name = "鑽搧鍘傚")
+    private String medicalCompany;
+
+    /**
+     * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+     */
+    @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
+     */
+    @ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
+    @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty("涓婁紶鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadTime;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * 鐖禛UID
+     */
+    @ApiModelProperty("鐖禛UID")
+    @Excel(name = "鐖禛UID")
+    private String pguid;
+
+    /**
+     * 鐖禝D
+     */
+    @ApiModelProperty("鐖禝D")
+    @Excel(name = "鐖禝D")
+    private Long pid;
+
+    /**
+     * 鐥呭尯缂栧彿
+     */
+    @ApiModelProperty("鐥呭尯缂栧彿")
+    @Excel(name = "鐥呭尯缂栧彿")
+    private String wardCode;
+
+    /**
+     * 鐥呭尯鍚嶇О
+     */
+    @ApiModelProperty("鐥呭尯鍚嶇О")
+    @Excel(name = "鐥呭尯鍚嶇О")
+    private String wardName;
+
+    /**
+     * 绉戝缂栧彿
+     */
+    @ApiModelProperty("绉戝缂栧彿")
+    @Excel(name = "绉戝缂栧彿")
+    private String deptCode;
+
+    /**
+     * 绉戝鍚嶇О
+     */
+    @ApiModelProperty("绉戝鍚嶇О")
+    @Excel(name = "绉戝鍚嶇О")
+    private String deptName;
+
+}
+

--
Gitblit v1.9.3