From ba69dcfe19d7718449f45b3aba8e9fc75ed93025 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 15 四月 2025 15:56:14 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchiveReq.java | 4
/dev/null | 45 ---------------
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 10 +-
smartor/src/main/java/com/smartor/domain/ServiceTask.java | 8 +-
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 7 ++
smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java | 18 ++---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 18 +----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 12 ++++
ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java | 5 +
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 2
11 files changed, 50 insertions(+), 83 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 18f26e3..ffc424c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -174,6 +174,9 @@
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
// PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ patArchive.setOrgid(user.getOrgid());
if (CollectionUtils.isEmpty(patArchive.getLeavehospitaldistrictcodes()) || patArchive.getLeavehospitaldistrictcodes().size() == 0) {
patArchive.setLeavehospitaldistrictcodes(null);
}
@@ -198,6 +201,9 @@
@PostMapping("/exportPatInfo")
public void exportPpatInfo(HttpServletResponse response, @RequestBody PatArchiveReq patArchive) {
startPage();
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ patArchive.setOrgid(user.getOrgid());
List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
if (!CollectionUtils.isEmpty(patArchives)) {
for (int i = 0; i < patArchives.size(); i++) {
@@ -215,6 +221,9 @@
@PostMapping("/getPatientInfo")
public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ patArchiveReq.setOrgid(user.getOrgid());
if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
patArchiveReq.setLeavehospitaldistrictcodes(null);
}
@@ -238,6 +247,9 @@
@PostMapping("/getPatientInfoQC")
public TableDataInfo getPatientInfoQC(@RequestBody PatArchiveReq patArchiveReq) {
PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ patArchiveReq.setOrgid(user.getOrgid());
if (CollectionUtils.isEmpty(patArchiveReq.getLeavehospitaldistrictcodes()) || patArchiveReq.getLeavehospitaldistrictcodes().size() == 0) {
patArchiveReq.setLeavehospitaldistrictcodes(null);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
index cb5b2d1..fd5a522 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -28,7 +28,7 @@
*/
@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級(宸茬粡鎹㈡垚service_subtask)")
@RestController
-@RequestMapping("/smartor/svysingle")
+//@RequestMapping("/smartor/svysingle")
public class SvyTaskSingleController extends BaseController {
@Autowired
private ISvyTaskSingleService svyTaskSingleService;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
index 66c4cee..e495d45 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
@@ -4,7 +4,10 @@
* 鍙戦�佺被鍨嬫灇涓�
*/
public enum ServiceTaskTypeEnum {
- 浣撴闅忚("9", "浣撴闅忚"), 鍖绘妧闅忚("10", "鍖绘妧闅忚");
+
+ 鐩戞祴璇勪及("1", "鐩戞祴璇勪及"), 鍑洪櫌闅忚("2", "鍑洪櫌闅忚"), 闂ㄨ瘖闅忚("3", "闂ㄨ瘖闅忚"), 瀹ｆ暀鍏虫��("4", "瀹ｆ暀鍏虫��"), 澶嶈瘖绠＄悊("5", "澶嶈瘖绠＄悊"),
+ 婊℃剰搴﹁皟鏌�("6", "婊℃剰搴﹁皟鏌�"), 鎮ｈ�呮姤鍛�("7", "鎮ｈ�呮姤鍛�"), 鍏朵粬閫氱煡("8", "鍏朵粬閫氱煡"), 浣撴闅忚("9", "浣撴闅忚"), 鍖绘妧闅忚("10", "鍖绘妧闅忚"),
+ 褰卞儚涓撶闅忚("11", "褰卞儚涓撶闅忚"), 蹇冪數涓撶闅忚("12", "蹇冪數涓撶闅忚"), 涓撶闅忚("13", "涓撶闅忚");
private String code;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
deleted file mode 100644
index 4b54b76..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.ruoyi.common.enums;
-
-/**
- * 鍙戦�佺被鍨嬫灇涓�
- */
-public enum TaskTypeEnum {
- 浣撴闅忚("8", "浣撴闅忚"), 蹇冪數涓撶闅忚("9", "蹇冪數涓撶闅忚"), 褰卞儚涓撶闅忚("10", "褰卞儚涓撶闅忚");
-
-
- private String code;
- private String desc;
-
- TaskTypeEnum(String code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public static String getDescByCode(String desc) {
- TaskTypeEnum[] organEnums = values();
- for (int i = 0; i < organEnums.length; i++) {
- TaskTypeEnum organEnum = organEnums[i];
- if (organEnum.getDesc().equals(desc)) {
- return organEnum.getCode();
- }
- }
- return "0";
- }
-
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index ac3c39f..ef73cfd 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -97,7 +97,9 @@
}
// 淇敼 SQL
- if (originalSql.toUpperCase().contains("WHERE")) {
+ if (originalSql.toUpperCase().contains("ORGID =")) {
+ return originalSql;
+ } else if (originalSql.toUpperCase().contains("WHERE")) {
// 鍦ㄥ凡鏈� WHERE 鍚庢坊鍔� orgid 鏉′欢
if (originalSql.toUpperCase().contains("(SELECT")) {
int i = originalSql.toUpperCase().lastIndexOf("WHERE");
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index 05ef4c7..c04f347 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -18,9 +18,9 @@
* @author ls
* @date 2023-06-14
*/
-@ApiModel(value = "PatArchiveReq" , description = "鎮ｈ�呮。妗堣姹傚璞�")
+@ApiModel(value = "PatArchiveReq", description = "鎮ｈ�呮。妗堣姹傚璞�")
@Data
-public class PatArchiveReq {
+public class PatArchiveReq extends BaseEntity {
/**
* 濮撳悕
*/
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index dd43a3c..9c26ef1 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -149,15 +149,15 @@
/**
* 浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)
*/
- @Excel(name = "浠诲姟绫诲瀷(0閫氱煡銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧鈥︹��)")
- @ApiModelProperty(value = "浠诲姟绫诲瀷(0閫氱煡銆�1瀹ｆ暀銆�2闂ㄨ瘖銆�3鍑洪櫌銆�4澶嶈瘖銆�5浣撴銆�6闂嵎銆�7鍖绘妧銆�8浣撴闅忚銆�9褰卞儚涓撶闅忚銆�10蹇冪數涓撶闅忚鈥︹��)")
+ @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級锛�)")
private String type;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10鍖绘妧闅忚")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚")
private String serviceType;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index 4b08307..e781050 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -165,17 +165,17 @@
private Date checktime;
/**
- * 浠诲姟绫诲瀷:1銆佺洃娴嬭瘎浼�;2銆佸嚭闄㈤殢璁�;3銆侀棬璇婇殢璁�
+ * 浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶 2锛岄棶鍗凤紱3锛岄�氱煡锛�
*/
- @Excel(name = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
- @ApiModelProperty(value = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
+ @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶 2锛岄棶鍗凤紱3锛岄�氱煡锛�")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶 2锛岄棶鍗凤紱3锛岄�氱煡锛�")
private String type;
/**
* 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
*/
@Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷 : 1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10锛屽奖鍍忎笓绉戦殢璁� 11銆佸績鐢典笓绉戦殢璁匡紝 12涓撶闅忚")
private String serviceType;
/**
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
index b921ee8..71d0d8c 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
@@ -8,16 +8,16 @@
/**
* 鎸囨爣閫夐」搴揗apper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2023-12-14
*/
@Mapper
-public interface IvrLibaTargetMapper
+public interface IvrLibaTargetMapper
{
/**
* 鏌ヨ鎸囨爣閫夐」搴�
- *
+ *
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 鎸囨爣閫夐」搴�
*/
@@ -25,17 +25,15 @@
/**
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
- *
+ *
* @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 鎸囨爣閫夐」搴撻泦鍚�
*/
public List<IvrLibaTarget> selectIvrLibaTargetList(IvrLibaTarget ivrLibaTarget);
- public List<IvrLibaTargetVO> targetInfo(IvrLibaTarget ivrLibaTarget);
-
/**
* 鏂板鎸囨爣閫夐」搴�
- *
+ *
* @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
@@ -43,7 +41,7 @@
/**
* 淇敼鎸囨爣閫夐」搴�
- *
+ *
* @param ivrLibaTarget 鎸囨爣閫夐」搴�
* @return 缁撴灉
*/
@@ -51,7 +49,7 @@
/**
* 鍒犻櫎鎸囨爣閫夐」搴�
- *
+ *
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
@@ -59,7 +57,7 @@
/**
* 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
- *
+ *
* @param targetIDs 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 4b7c681..c3b371c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -1,7 +1,5 @@
package com.smartor.service.impl;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,22 +7,15 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.HospTypeEnum;
import com.ruoyi.common.enums.ServiceTaskTypeEnum;
-import com.ruoyi.common.enums.TaskTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
-import com.ruoyi.common.utils.http.HttpEntity;
-import com.ruoyi.common.utils.http.HttpUtils;
import com.smartor.common.LyraTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.BaseOrganizationMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IServiceTaskService;
import com.smartor.service.ISvyTaskSingleService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -248,14 +239,13 @@
if (StringUtils.isNotEmpty(serviceTaskVO.getServicetype()))
type = ServiceTaskTypeEnum.getDescByCode(serviceTaskVO.getServicetype());
serviceSubtask.setServiceType(type);
- String tasktype = "-1";
- if (StringUtils.isNotEmpty(serviceTaskVO.getTasktype()))
- tasktype = TaskTypeEnum.getDescByCode(serviceTaskVO.getTasktype());
- serviceSubtask.setType(tasktype);
+ //绗笁鏂逛紶杩囨潵鐨勶紝鐩存帴缁熶竴瀹氫负闂嵎
+ serviceSubtask.setType("2");
serviceSubtask.setLabelstatus(serviceTaskVO.getTaskstate());
serviceSubtask.setTaskName(serviceTaskVO.getTaskname());
serviceSubtask.setTaskDesc(serviceTaskVO.getTaskdesc());
- serviceSubtask.setPreachform(serviceTaskVO.getExemode());
+ //绗笁鏂逛紶杩囨潵鐨勶紝鐩存帴缁熶竴瀹氫负"浜哄伐"
+ serviceSubtask.setPreachform("1");
serviceSubtask.setCreateBy(serviceTaskVO.getCreateBy());
serviceSubtask.setCreateTime(serviceTaskVO.getCreateTime());
serviceSubtask.setOperatorNo(serviceTaskVO.getOperatorno());
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index d742b33..fef487e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -474,6 +474,7 @@
LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
<where>
a.del_flag = 0
+ and a.orgid = #{orgid}
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
@@ -550,6 +551,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="pid != null and pid != ''">and a.id = #{id}</if>
@@ -674,6 +676,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -761,6 +764,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -860,6 +864,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="pid != null and pid != ''">and a.id = #{id}</if>
@@ -966,6 +971,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -1053,6 +1059,7 @@
<where>
d.del_flag != 1
AND a.del_flag != 1
+ and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
--
Gitblit v1.9.3