From 48d32c21519998b29f85960774a79e4c5519bdf8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 10 十月 2025 17:01:53 +0800
Subject: [PATCH] 新增随访情况
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 9 +++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 10 +++++++++-
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index d24f5ee..27c1c48 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -77,6 +77,15 @@
}
/**
+ * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
+ */
+ @GetMapping(value = "/configKeyOrg")
+ public AjaxResult getConfigKeyOrg(String configKey,String orgid)
+ {
+ return success(configService.selectConfigByKey(configKey,orgid));
+ }
+
+ /**
* 鏂板鍙傛暟閰嶇疆
*/
//@PreAuthorize("@ss.hasPermi('system:config:add')")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 69c18ee..e688230 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -638,4 +638,7 @@
*/
@ApiModelProperty(value = "缁忕鍖荤敓")
private String managementDoctor;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶,2鎮ｈ�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6鍏朵粬")
+ private String taskSituation;
}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index e3f07ff..3b71072 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -84,6 +84,7 @@
<result property="visitDeptCode" column="visit_dept_code"/>
<result property="managementDoctor" column="management_doctor"/>
<result property="managementDoctorCode" column="management_doctor_code"/>
+ <result property="taskSituation" column="task_situation"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -181,7 +182,8 @@
orgid,
visit_type,
management_doctor,
- management_doctor_code
+ management_doctor_code,
+ task_situation
from service_subtask
</sql>
@@ -585,6 +587,7 @@
<if test="visitDeptName != null">visit_dept_name,</if>
<if test="managementDoctorCode != null">management_doctor_code,</if>
<if test="managementDoctor != null">management_doctor,</if>
+ <if test="taskSituation != null">task_situation,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -668,6 +671,7 @@
<if test="visitDeptName != null">#{visitDeptName},</if>
<if test="managementDoctorCode != null">#{managementDoctorCode},</if>
<if test="managementDoctor != null">#{managementDoctor},</if>
+ <if test="taskSituation != null">#{taskSituation},</if>
</trim>
</insert>
@@ -756,6 +760,7 @@
<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where id = #{id}
</update>
@@ -845,6 +850,7 @@
<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
<where>
<if test="patid != null ">and patid = #{patid}</if>
@@ -936,6 +942,7 @@
<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -1024,6 +1031,7 @@
<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
</trim>
where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
--
Gitblit v1.9.3