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/ServiceSubtaskCount.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
index 90e48f1..fa24dc7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java
@@ -32,10 +32,16 @@
     private Long count;
 
     @ApiModelProperty(value = "濉啓婊℃剰搴︽暟閲�")
-    private Long joyCount;
+    private Integer joyCount;
 
     @ApiModelProperty(value = "鎵�鏈夋弧鎰忓害鏁伴噺")
-    private Long joyAllCount;
+    private Integer joyAllCount;
+
+    @ApiModelProperty(value = "婊℃剰搴︽瘮渚�")
+    private String joyTotal;
+
+    @ApiModelProperty(value = "婊℃剰搴﹀悕绉�")
+    private String joyName;
 
     public ServiceSubtaskCount(String month, Long serviceType, Long count) {
         this.serviceType = serviceType;

--
Gitblit v1.9.3