From 18925965b55c103283a2fcbb161cceed41139ec6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 12 十一月 2026 17:14:20 +0800
Subject: [PATCH] /system/user/list 增加hospInfoCode\deptInfoCode 匹配
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 769e468..f4f5952 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -1,25 +1,24 @@
package com.ruoyi.common.core.domain.entity;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import javax.validation.constraints.*;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.stereotype.Component;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.*;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -47,6 +46,12 @@
*/
@ApiModelProperty(value = "his鐢ㄦ埛ID")
private String hisUserId;
+
+ /**
+ * his鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value = "his鐢ㄦ埛ID")
+ private String userCode;
/**
* 閮ㄩ棬ID
@@ -172,15 +177,27 @@
private Date loginDate;
/**
- * 闄㈠尯淇℃伅
- */
- @ApiModelProperty(value = "闄㈠尯淇℃伅")
- private String hospInfo;
- /**
* 绉戝淇℃伅
*/
@ApiModelProperty(value = "绉戝淇℃伅")
+ private String hospInfo;
+ /**
+ * 鐥呭尯淇℃伅
+ */
+ @ApiModelProperty(value = "鐥呭尯淇℃伅")
private String deptInfo;
+
+ /**
+ * 绉戝淇℃伅锛堟寜瀹屾暣 Code 鍖归厤锛�
+ */
+ @ApiModelProperty(value = "绉戝淇℃伅锛堟寜瀹屾暣 Code 鍖归厤锛�")
+ private String hospInfoCode;
+
+ /**
+ * 鐥呭尯淇℃伅锛堟寜瀹屾暣 Code 鍖归厤锛�
+ */
+ @ApiModelProperty(value = "鐥呭尯淇℃伅锛堟寜瀹屾暣 Code 鍖归厤锛�")
+ private String deptInfoCode;
/**
* 閮ㄩ棬瀵硅薄
@@ -248,9 +265,35 @@
@ApiModelProperty("绉戝闆嗗悎")
private List<Map<String, Object>> belongDepts = new ArrayList();
+ /**
+ * 婊℃剰搴﹀垎绫�
+ */
+ @ApiModelProperty("婊℃剰搴﹀垎绫伙紙闂嵎/璇煶锛�")
+ private Map<String, Object> satisfactionCategories = new HashMap<>();
+
+ /**
+ * HIS澧為噺鍚屾寮�濮嬫椂闂达紙瀵瑰簲 healthy_user.last_Update_Time锛�
+ */
+ @ApiModelProperty("鍚屾寮�濮嬫椂闂达紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String lastStartTime;
+
+ /**
+ * HIS澧為噺鍚屾缁撴潫鏃堕棿锛堝搴� healthy_user.last_Update_Time锛�
+ */
+ @ApiModelProperty("鍚屾缁撴潫鏃堕棿锛屾牸寮忥細yyyy-MM-dd HH:mm:ss")
+ private String lastEndTime;
+
public SysUser() {
+ }
+
+ public Map<String, Object> getSatisfactionCategories() {
+ return satisfactionCategories;
+ }
+
+ public void setSatisfactionCategories(Map<String, Object> satisfactionCategories) {
+ this.satisfactionCategories = satisfactionCategories;
}
public List<Map<String, Object>> getBelongWards() {
@@ -309,6 +352,51 @@
this.deptInfo = deptInfo;
}
+ public String getHospInfoCode() {
+ return this.hospInfoCode;
+ }
+
+ public void setHospInfoCode(String hospInfoCode) {
+ this.hospInfoCode = hospInfoCode;
+ }
+
+ public String getDeptInfoCode() {
+ return this.deptInfoCode;
+ }
+
+ public void setDeptInfoCode(String deptInfoCode) {
+ this.deptInfoCode = deptInfoCode;
+ }
+
+ /**
+ * 绉戝 Code 鍒楄〃锛屾敮鎸� hospInfoCode=D001,D003 杩欑閫楀彿鍒嗛殧鐨勫 Code 浼犲弬
+ */
+ @JsonIgnore
+ public List<String> getHospInfoCodeList() {
+ return splitCodes(this.hospInfoCode);
+ }
+
+ /**
+ * 鐥呭尯 Code 鍒楄〃锛屾敮鎸� deptInfoCode=W001,W003 杩欑閫楀彿鍒嗛殧鐨勫 Code 浼犲弬
+ */
+ @JsonIgnore
+ public List<String> getDeptInfoCodeList() {
+ return splitCodes(this.deptInfoCode);
+ }
+
+ private static List<String> splitCodes(String codes) {
+ if (codes == null || codes.trim().isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<String> codeList = new ArrayList<>();
+ for (String code : codes.split(",")) {
+ if (code != null && !code.trim().isEmpty()) {
+ codeList.add(code.trim());
+ }
+ }
+ return codeList;
+ }
+
public SysUser(Long userId) {
this.userId = userId;
}
--
Gitblit v1.9.3