From 4a32d5080ec6a2feba71667405596b35f02d2a3d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 四月 2026 13:52:22 +0800
Subject: [PATCH] 【省立同德】随访-导出调整
---
smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java | 4 ++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 21 +++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
index 0d63cca..bf85d05 100644
--- a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
+++ b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
@@ -667,24 +667,28 @@
/**
* 寮�濮嬪嚭闄㈡棩鏈�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
private Date startOutHospTime;
/**
* 寮�濮嬪彂閫佹棩鏈�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
private Date startSendDateTime;
/**
* 缁撴潫鍙戦�佹棩鏈�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
private Date endSendDateTime;
/**
* 缁撴潫鍑洪櫌鏃ユ湡
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
private Date endOutHospTime;
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c831868..d502e49 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -344,8 +344,9 @@
</if>
</if>
<if test="deptOrDistrict==2">
+ AND (1=1
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND (leavehospitaldistrictcode IN
+ AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
separator=","
close=")">
@@ -355,14 +356,15 @@
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
OR deptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close="))">
+ close=")">
#{leaveldeptcode}
</foreach>
- </if>
+ </if>)
</if>
<if test="deptOrDistrict==3">
+ AND (1=1
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND (leavehospitaldistrictcode IN
+ AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
separator=","
close=")">
@@ -370,17 +372,19 @@
</foreach>
</if>
<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
- and visit_dept_code IN
+ AND visit_dept_code IN
<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
- close="))">
+ close=")">
#{visitDeptCode}
</foreach>
</if>
+ )
</if>
<if test="deptOrDistrict==4">
+ AND (1=1
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND (leavehospitaldistrictcode IN
+ AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
separator=","
close=")">
@@ -390,10 +394,11 @@
<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
OR visit_dept_code IN
<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
- close="))">
+ close=")">
#{visitDeptCode}
</foreach>
</if>
+ )
</if>
<if test="visitTime != null">
--
Gitblit v1.9.3