代码提交

liusheng

3 天以前 919038323f4148c1bc5bf1962903e2f865dd90be

 ruoyi-task/src/main/java/com/ruoyi/task/api/contract/VisitTaskCreateApiImpl.java

@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.ServiceSubtask;
import com.ruoyi.task.domain.ServiceTask;
@@ -269,13 +270,25 @@
        e.setDrname(d.getDrname());
        e.setManagementDoctor(d.getManagementDoctor());
        e.setManagementDoctorCode(d.getManagementDoctorCode());
        // 2026-11：deptcode/deptname 列已改名 leaveldeptcode/leaveldeptname（出院维度），
        //          原 sendlimit* 四个空列复用为 hospitaldistrictcode/name（在院病区）、deptcode/name（在院科室）。
        e.setLeaveldeptcode(d.getLeaveldeptcode());
        e.setLeaveldeptname(d.getLeaveldeptname());
        // ⚠️ 这 4 列只有「出院随访」会填值（VisitSubtaskFactory 从 pat_med_inhosp 取），
        //    门诊/手术/扫码/答卷等路径的草稿里仍是 null —— 与改造前这些列不写的效果一致。
        e.setDeptcode(d.getDeptcode());
        e.setDeptname(d.getDeptname());
        e.setHospitaldistrictcode(d.getHospitaldistrictcode());
        e.setHospitaldistrictname(d.getHospitaldistrictname());
        e.setLeavehospitaldistrictcode(d.getLeavehospitaldistrictcode());
        e.setLeavehospitaldistrictname(d.getLeavehospitaldistrictname());
        e.setLeaveicd10code(d.getLeaveicd10code());
        e.setLeavediagname(d.getLeavediagname());
        e.setDiagname(d.getDiagname());
        // 2026-11：重要性标记编码（日间手术/日间诊疗/无…），来自 pat_med_inhosp.importance_flag_code。
        // 只有「出入院随访」链路会填值（VisitSubtaskFactory）；门诊/手术等草稿里为 null →
        // insert 的条件列直接跳过，与改造前这些列不写的效果一致。
        e.setImportanceFlagCode(d.getImportanceFlagCode());
        e.setTemplateid(d.getTemplateid());
        e.setTemplatename(d.getTemplatename());
        e.setLibtemplateid(d.getLibtemplateid());
@@ -334,8 +347,7 @@
        //    见 OuthospSubtaskDraft 的类注释。
        // ------------------------------------------------------------------
        if (d instanceof com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) {
            com.ruoyi.common.core.service.dto.OuthospSubtaskDraft o =
                    (com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) d;
            com.ruoyi.common.core.service.dto.OuthospSubtaskDraft o = (com.ruoyi.common.core.service.dto.OuthospSubtaskDraft) d;
            // hospno 已上提到父类 VisitSubtaskDraft（上面统一映射过了），这里不再重复
            // 只有父类没有的字段才在这里补映射（其余如 sendname/sfzh/phone/sex/age 父类已有）
            e.setAdmindate(o.getAdmitdate());