Pārlūkot izejas kodu

修改登记列表查询。修改exams表的study_id字段为studies_id,引起的字段不存在问题。

gengjunfang 1 mēnesi atpakaļ
vecāks
revīzija
dd9667f8af

+ 0 - 225
src/main/java/com/zskk/pacsonline/modules/exam/entity/Exam.java

@@ -1,225 +0,0 @@
-package com.zskk.pacsonline.modules.exam.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 检查表
- * </p>
- *
- * @author system
- * @since 2025-11-27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("exam")
-@Schema(description = "检查实体")
-public class Exam implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID(雪花算法生成)
-     */
-    @Schema(description = "主键ID")
-    @TableId(value = "id", type = IdType.ASSIGN_UUID)
-    private String  id;
-
-    /**
-     * 检查时间
-     */
-    @TableField("exam_datetime")
-    @Schema(description = "检查时间", example = "2025-11-27T10:30:00")
-    @NotNull(message = "检查时间不能为空")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date examDatetime;
-
-    /**
-     * 检查索引
-     */
-    @TableField("study_id")
-    @Schema(description = "检查索引", example = "STUDY_001")
-    @NotBlank(message = "检查索引不能为空")
-    @Size(max = 64, message = "检查索引长度不能超过64个字符")
-    private String studyId;
-
-    /**
-     * 患者索引
-     */
-    @TableField("patient_id")
-    @Schema(description = "患者索引", example = "1001")
-    @NotNull(message = "患者索引不能为空")
-    private Long patientId;
-
-    /**
-     * 患者号
-     */
-    @TableField("accession_num")
-    @Schema(description = "患者号", example = "ACC_001")
-    @Size(max = 64, message = "患者号长度不能超过64个字符")
-    private String accessionNum;
-
-    /**
-     * 检查日期(非空,用于分区)
-     */
-    @TableField("study_date")
-    @Schema(description = "检查日期", example = "2025-11-27")
-    @NotNull(message = "检查日期不能为空")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date studyDate;
-
-    /**
-     * 检查时间
-     */
-    @TableField("study_time")
-    @Schema(description = "检查时间", example = "10:30:00")
-    @Size(max = 20, message = "检查时间长度不能超过20个字符")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String studyTime;
-
-    /**
-     * 检查类型
-     */
-    @TableField("exam_class")
-    @Schema(description = "检查类型", example = "CT")
-    @Size(max = 16, message = "检查类型长度不能超过16个字符")
-    private String examClass;
-
-    /**
-     * 机构索引
-     */
-    @TableField("institution_id")
-    @Schema(description = "机构索引", example = "1001")
-    private String institutionId;
-
-    /**
-     * 设备名称
-     */
-    @TableField("device_name")
-    @Schema(description = "设备名称", example = "Siemens CT Scanner")
-    @Size(max = 128, message = "设备名称长度不能超过128个字符")
-    private String deviceName;
-
-    /**
-     * 患者号
-     */
-    @TableField("patient_num")
-    @Schema(description = "患者号", example = "P001")
-    @Size(max = 64, message = "患者号长度不能超过64个字符")
-    private String patientNum;
-
-    /**
-     * 检查部位
-     */
-    @TableField("body_part")
-    @Schema(description = "检查部位", example = "胸部")
-    @Size(max = 128, message = "检查部位长度不能超过128个字符")
-    private String bodyPart;
-
-    /**
-     * 患者姓名
-     */
-    @TableField("name")
-    @Schema(description = "患者姓名", example = "张三")
-    @Size(max = 100, message = "患者姓名长度不能超过100个字符")
-    private String name;
-
-    /**
-     * 手机号
-     */
-    @TableField("phone")
-    @Schema(description = "手机号", example = "13800138000")
-    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
-    private String phone;
-
-    /**
-     * 生日
-     */
-    @TableField("birthday")
-    @Schema(description = "生日", example = "1990-01-01")
-    private Date birthday;
-
-    /**
-     * 身份证号
-     */
-    @TableField("card_num")
-    @Schema(description = "身份证号", example = "110101199001011234")
-    @Size(max = 32, message = "身份证号长度不能超过32个字符")
-    private String cardNum;
-
-    /**
-     * 检查序列号
-     */
-    @TableField("studyid")
-    @Schema(description = "检查序列号", example = "STUDY_001")
-    @Size(max = 64, message = "检查序列号长度不能超过64个字符")
-    private String studyid;
-
-    /**
-     * studyuid
-     */
-    @TableField("studyuid")
-    @Schema(description = "studyuid", example = "1.2.3.4.5.6.7.8.9")
-    @NotBlank(message = "studyuid不能为空")
-    @Size(max = 128, message = "studyuid长度不能超过128个字符")
-    private String studyuid;
-
-    /**
-     * 患者性别: 0-未知,1-男,2-女
-     */
-    @TableField("sex")
-    @Schema(description = "患者性别", example = "1")
-    private Integer sex;
-
-    /**
-     * 检查时年龄
-     */
-    @TableField("age")
-    @Schema(description = "检查时年龄", example = "35岁")
-    @Size(max = 16, message = "年龄描述长度不能超过16个字符")
-    private String age;
-
-    /**
-     * 存储节点
-     */
-    @TableField("node_type")
-    @Schema(description = "存储节点", example = "node1")
-    @Size(max = 32, message = "存储节点长度不能超过32个字符")
-    private String nodeType;
-
-    /**
-     * 入库时间
-     */
-    @TableField("create_time")
-    @Schema(description = "入库时间", example = "2025-11-27T10:00:00")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    @Schema(description = "更新时间", example = "2025-11-27T10:00:00")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-}

+ 0 - 1
src/main/java/com/zskk/pacsonline/modules/register/controller/RegisterController.java

@@ -22,7 +22,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;

+ 1 - 1
src/main/java/com/zskk/pacsonline/modules/register/mapper/xml/RegisterMapper.xml

@@ -82,7 +82,7 @@
             e.exam_datetime,
             e.exam_status,
             e.institution_id,
-            e.study_id,
+            e.studies_id   as study_id,
             e.application_doctor AS clin_doctors_name,
             r.register_name
         FROM