代码提交

liusheng

11 小时以前 c24d16a37523a49080392610357872ce580cbc38

 ruoyi-common/src/main/java/com/ruoyi/common/core/service/dto/VisitSubtaskDraft.java

@@ -58,6 +58,17 @@
    private Long inhospid;
    /** 住院流水号 */
    private String serialnum;
    /**
     * 就诊编号 —— 落库到 {@code service_subtask.hospno}（"对应的 outhospno、inhospno"）。
     * <p>
     * 出院链路的取值是 {@code pat_med_inhosp.inhospno}（门诊链路是
     * {@code pat_med_outhosp.outhospno}，见 {@link OuthospSubtaskDraft}）。
     * <p>
     * ⚠️ 这个字段原先只存在于 {@link OuthospSubtaskDraft}，而出院的
     * {@code addSubTaskByRule} 链路从不设它 → {@code service_subtask.hospno} 一直落空。
     * 现在提到父类，两条链路共用同一个载体。
     */
    private String hospno;

    // ==================== 医护（原 patMedInhosp） ====================
    /** 责任护士ID */
@@ -74,10 +85,20 @@
    private String managementDoctorCode;

    // ==================== 科室/病区（原 patMedInhosp，type 4/5 会改写） ====================
    /** 科室编码（type 1/2/3 取 leave 维度；type 4/5 取入院维度） */
    // 2026-11：service_subtask 的 deptcode/deptname 列改名为 leaveldeptcode/leaveldeptname，
    //          原 sendlimit* 空闲列复用为「在院维度」的 hospitaldistrictcode/name（在院病区）、deptcode/name（在院科室）。
    /** 出院科室编码（落 service_subtask.leaveldeptcode；原字段名 deptcode） */
    private String leaveldeptcode;
    /** 出院科室名称（落 service_subtask.leaveldeptname；原字段名 deptname） */
    private String leaveldeptname;
    /** 在院科室编码（落 service_subtask.deptcode） */
    private String deptcode;
    /** 科室名称 */
    /** 在院科室名称（落 service_subtask.deptname） */
    private String deptname;
    /** 在院病区编码（落 service_subtask.hospitaldistrictcode） */
    private String hospitaldistrictcode;
    /** 在院病区名称（落 service_subtask.hospitaldistrictname） */
    private String hospitaldistrictname;
    /** 离院病区编码（type 4/5 取入院病区） */
    private String leavehospitaldistrictcode;
    /** 离院病区名称 */
@@ -352,6 +373,14 @@
        this.serialnum = serialnum;
    }

    public String getHospno() {
        return hospno;
    }

    public void setHospno(String hospno) {
        this.hospno = hospno;
    }

    public String getNurseId() {
        return nurseId;
    }
@@ -400,6 +429,22 @@
        this.managementDoctorCode = managementDoctorCode;
    }

    public String getLeaveldeptcode() {
        return leaveldeptcode;
    }

    public void setLeaveldeptcode(String leaveldeptcode) {
        this.leaveldeptcode = leaveldeptcode;
    }

    public String getLeaveldeptname() {
        return leaveldeptname;
    }

    public void setLeaveldeptname(String leaveldeptname) {
        this.leaveldeptname = leaveldeptname;
    }

    public String getDeptcode() {
        return deptcode;
    }
@@ -416,6 +461,22 @@
        this.deptname = deptname;
    }

    public String getHospitaldistrictcode() {
        return hospitaldistrictcode;
    }

    public void setHospitaldistrictcode(String hospitaldistrictcode) {
        this.hospitaldistrictcode = hospitaldistrictcode;
    }

    public String getHospitaldistrictname() {
        return hospitaldistrictname;
    }

    public void setHospitaldistrictname(String hospitaldistrictname) {
        this.hospitaldistrictname = hospitaldistrictname;
    }

    public String getLeavehospitaldistrictcode() {
        return leavehospitaldistrictcode;
    }