v0.2

openhis-server/core-common/src/main/java/com/core/common/constant/CacheConstants.java

@@ -41,6 +41,11 @@ public class CacheConstants {
      */
     public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
 
+    /**
+     * 登录上次勾选的租户
+     */
+    public static final String LOGIN_SELECTED_TENANT = "login_selected_tenant:";
+
     /**
      * 超出上限，排番失败（时间：{}，KEY：{}
      */

openhis-server/core-common/src/main/java/com/core/common/constant/Constants.java

@@ -163,7 +163,7 @@ public class Constants {
     /**
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
      */
-    public static final String[] JOB_WHITELIST_STR = {"com.core.quartz.task"};
+    public static final String[] JOB_WHITELIST_STR = {"com.openhis.quartz.task"};
 
     /**
      * 定时任务违规的字符

openhis-server/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java

@@ -7,20 +7,24 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
-import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.Excel.ColumnType;
 import com.core.common.annotation.Excel.Type;
 import com.core.common.annotation.Excels;
 import com.core.common.core.domain.BaseEntity;
 import com.core.common.xss.Xss;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author system
  */
 @Data
@@ -79,18 +83,23 @@ public class SysUser extends BaseEntity {
     /** 部门对象 */
     @Excels({@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
         @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)})
+    @TableField(exist = false)
     private SysDept dept;
 
     /** 角色对象 */
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /** 角色组 */
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /** 岗位组 */
+    @TableField(exist = false)
     private Long[] postIds;
 
     /** 角色ID */
+    @TableField(exist = false)
     private Long roleId;
 
     /** 租户ID */
@@ -99,6 +108,18 @@ public class SysUser extends BaseEntity {
     /** 删除标识 */
     private String deleteFlag;
 
+    /**
+     * 科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(exist = false)
+    private Long orgId;
+    /**
+     * 科室名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
     public SysUser() {
 
     }

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginBody.java

@@ -26,6 +26,11 @@ public class LoginBody {
      */
     private String uuid;
 
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
     public String getUsername() {
         return username;
     }
@@ -57,4 +62,12 @@ public class LoginBody {
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
 }

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java

@@ -6,6 +6,7 @@ import java.util.Set;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.core.common.core.domain.entity.SysUser;
 
@@ -78,11 +79,21 @@ public class LoginUser implements UserDetails {
      */
     private Long orgId;
 
+    /**
+     * 所属医院id
+     */
+    private Long hospitalId;
+
     /**
      * 参与者id
      */
     private Long practitionerId;
 
+    /**
+     * option JSON串
+     */
+    private JSONObject optionJson;
+
     /**
      * 用户信息
      */

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUserExtend.java

@@ -12,6 +12,10 @@ public class LoginUserExtend {
      * 机构/科室id
      */
     private Long orgId;
+    /**
+     * 科室名称
+     */
+    private String orgName;
 
     /**
      * 参与者id

openhis-server/core-common/src/main/java/com/core/common/utils/DateUtils.java

@@ -256,6 +256,19 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         }
     }
 
+    /**
+     * 判断日期是否为未来时间
+     *
+     * @param date Date 类型的日期
+     * @return 是/否
+     */
+    public static boolean isFuture(Date date) {
+        // 获取当前时间
+        Date currentDate = Calendar.getInstance().getTime();
+        // 检查传入的日期是否在当前时间之后
+        return date.after(currentDate);
+    }
+
     /**
      * 从身份证号码中提取生日
      *

openhis-server/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java

@@ -110,7 +110,7 @@ public class HttpUtils {
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
             conn.setRequestProperty("Accept-Charset", "utf-8");
-            conn.setRequestProperty("contentType", "utf-8");
+            conn.setRequestProperty("contentType", "json");
             conn.setDoOutput(true);
             conn.setDoInput(true);
             out = new PrintWriter(conn.getOutputStream());

openhis-server/core-common/src/main/java/com/core/common/utils/http/OldHisHttpUtils.java

@@ -1,21 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.core.common.utils.http;
-
-/**
- * 老系统http请求工具类
- *
- * @author SunJQ
- * @date 2024-12-30
- */
-public class OldHisHttpUtils {
-    public static String oldHisHttpPost() {
-
-        String s1 = HttpUtils.sendPost("http://localhost:8080/myareahisnyb/gfChargeRatio/gfsum", "");
-
-        System.out.println(s1);
-        return s1;
-    }
-
-}