代码提交

liusheng

15 小时以前 c24d16a37523a49080392610357872ce580cbc38

 ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/support/VisitSubtaskFactory.java

@@ -119,14 +119,24 @@
        d.setHospno(inhosp.getInhospno());
        d.setDrcode(inhosp.getDrcode());
        d.setDrname(inhosp.getDrname());
        d.setDeptcode(inhosp.getLeaveldeptcode());
        d.setDeptname(inhosp.getLeaveldeptname());
        d.setLeaveldeptcode(inhosp.getLeaveldeptcode());
        d.setLeaveldeptname(inhosp.getLeaveldeptname());
        d.setLeavehospitaldistrictcode(inhosp.getLeavehospitaldistrictcode());
        d.setLeavehospitaldistrictname(inhosp.getLeavehospitaldistrictname());
        // ---- 原 L1128-1134：type 4/5 改用入院维度 ----
        if (type != null && (type == 4 || type == 5)) {
        // ---- 2026-11 新增：在院维度落「复用列」 ----
        //   背景：service_subtask 的 deptcode/deptname 改名 leaveldeptcode/leaveldeptname，
        //         原 sendlimitabegin/aend、sendlimitpbegin/pend 四个空列复用为
        //         hospitaldistrictcode/name（在院病区）、deptcode/name（在院科室）。
        //   口径：出院维度仍按原写法落 leavel*（下面 type 4/5 的覆盖也保持原样，落库位置不变），
        //         这里只是把 pat_med_inhosp 的「在院科室 / 在院病区」额外存一份，便于按在院维度统计。
            d.setDeptcode(inhosp.getDeptcode());
            d.setDeptname(inhosp.getDeptname());
        d.setHospitaldistrictcode(inhosp.getHospitaldistrictcode());
        d.setHospitaldistrictname(inhosp.getHospitaldistrictname());
        // ---- 原 L1128-1134：type 4/5 改用入院维度 ----
        if (type != null && (type == 4 || type == 5)) {
            d.setLeaveldeptcode(inhosp.getDeptcode());
            d.setLeaveldeptname(inhosp.getDeptname());
            d.setLeavehospitaldistrictcode(inhosp.getHospitaldistrictcode());
            d.setLeavehospitaldistrictname(inhosp.getHospitaldistrictname());
        }
@@ -266,8 +276,13 @@
        d.setInhospid(inhosp.getInhospid());
        d.setDrcode(inhosp.getDrcode());
        d.setDrname(inhosp.getDrname());
        d.setDeptcode(inhosp.getLeaveldeptcode());
        d.setDeptname(inhosp.getLeaveldeptname());
        d.setLeaveldeptcode(inhosp.getLeaveldeptcode());
        d.setLeaveldeptname(inhosp.getLeaveldeptname());
        // 2026-11：入院/在院维度落「复用列」（口径同 boxedServiceSubtask）
        d.setDeptcode(inhosp.getDeptcode());
        d.setDeptname(inhosp.getDeptname());
        d.setHospitaldistrictcode(inhosp.getHospitaldistrictcode());
        d.setHospitaldistrictname(inhosp.getHospitaldistrictname());
        d.setLeavehospitaldistrictcode(inhosp.getLeavehospitaldistrictcode());
        d.setLeavehospitaldistrictname(inhosp.getLeavehospitaldistrictname());
        // ---- 原 L1242-1251 ----