sync: service_subtask 科室病区字段重命名对齐

陈昶聿

4 天以前 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19

sync: service_subtask 科室病区字段重命名对齐

将 smartor_ls_merge 分支对 service_subtask 字段的使用同步到 master：
- deptcode/deptname 改为 leaveldeptcode/leaveldeptname（出院科室）
- 原 sendlimitabegin/aend/pbegin/pend 复用为 hospitaldistrictcode/name、deptcode/name（在院维度）
- 同步实体、Mapper resultMap/CRUD/统计查询及 Java 访问器

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -314,9 +314,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
//                                sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
@@ -352,9 +352,9 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -391,9 +391,9 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String url = "";
@@ -599,9 +599,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -619,9 +619,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -643,9 +643,9 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1329,10 +1329,10 @@

                        SysDept sysDeptVo = new SysDept();
                        List<SysDept> sysDepts = new ArrayList<>();
                        if (ObjectUtils.isNotEmpty(serviceSubtask.getDeptcode())) {
                        if (ObjectUtils.isNotEmpty(serviceSubtask.getLeaveldeptcode())) {
                            sysDeptVo.setDeptType("1");
                            sysDeptVo.setOrgid(serviceSubtask.getOrgid());
                            sysDeptVo.setDeptCode(serviceSubtask.getDeptcode());
                            sysDeptVo.setDeptCode(serviceSubtask.getLeaveldeptcode());
                            sysDeptService.selectDeptList(sysDeptVo);
                        } else if (ObjectUtils.isNotEmpty(serviceSubtask.getLeavehospitaldistrictcode())) {
                            sysDeptVo.setDeptType("2");

 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java

@@ -208,32 +208,32 @@
    private Date createTimeNew;

    /**
     * 上午开始发送时间限制
     * 在院病区编码（原 sendlimitabegin 列复用而来）
     */
    @Excel(name = " 上午开始发送时间限制 ")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;
    @Excel(name = " 在院病区编码 ")
    @ApiModelProperty(value = "在院病区编码")
    private String hospitaldistrictcode;

    /**
     * 上午结束发送时间限制
     * 在院病区名称（原 sendlimitaend 列复用而来）
     */
    @Excel(name = " 上午结束发送时间限制 ")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;
    @Excel(name = " 在院病区名称 ")
    @ApiModelProperty(value = "在院病区名称")
    private String hospitaldistrictname;

    /**
     * 下午开始发送时间限制
     * 在院科室编码（原 sendlimitpbegin 列复用而来）
     */
    @Excel(name = " 下午开始发送时间限制 ")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;
    @Excel(name = " 在院科室编码 ")
    @ApiModelProperty(value = "在院科室编码")
    private String deptcode;

    /**
     * 下午结束发送时间限制
     * 在院科室名称（原 sendlimitpend 列复用而来）
     */
    @Excel(name = " 下午结束发送时间限制 ")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;
    @Excel(name = " 在院科室名称 ")
    @ApiModelProperty(value = "在院科室名称")
    private String deptname;

    /**
     * 晚上开始发送时间限制
@@ -312,11 +312,11 @@
    private Date pulltime;

    /**
     * 部门code
     * 出院科室编码（原 deptcode 列，已改名 leaveldeptcode）
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;
    @Excel(name = "  出院科室编码")
    @ApiModelProperty(value = "出院科室编码")
    private String leaveldeptcode;

    /**
     * 医生编码
@@ -508,11 +508,11 @@
    private String patguid;

    /**
     * 科室名称
     * 出院科室名称（原 deptname 列，已改名 leaveldeptname）
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;
    @Excel(name = "出院科室名称")
    @ApiModelProperty(value = "出院科室名称")
    private String leaveldeptname;

    /**
     * 就诊日期

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskExportVO.java

@@ -172,32 +172,32 @@
    private Date senddate;

    /**
     * 上午开始发送时间限制
     * 在院病区编码（原 sendlimitabegin 列复用而来）
     */
    @Excel(name = " 上午开始发送时间限制 ")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;
    @Excel(name = " 在院病区编码 ")
    @ApiModelProperty(value = "在院病区编码")
    private String hospitaldistrictcode;

    /**
     * 上午结束发送时间限制
     * 在院病区名称（原 sendlimitaend 列复用而来）
     */
    @Excel(name = " 上午结束发送时间限制 ")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;
    @Excel(name = " 在院病区名称 ")
    @ApiModelProperty(value = "在院病区名称")
    private String hospitaldistrictname;

    /**
     * 下午开始发送时间限制
     * 在院科室编码（原 sendlimitpbegin 列复用而来）
     */
    @Excel(name = " 下午开始发送时间限制 ")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;
    @Excel(name = " 在院科室编码 ")
    @ApiModelProperty(value = "在院科室编码")
    private String deptcode;

    /**
     * 下午结束发送时间限制
     * 在院科室名称（原 sendlimitpend 列复用而来）
     */
    @Excel(name = " 下午结束发送时间限制 ")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;
    @Excel(name = " 在院科室名称 ")
    @ApiModelProperty(value = "在院科室名称")
    private String deptname;

    /**
     * 晚上开始发送时间限制
@@ -271,11 +271,11 @@
    private Date pulltime;

    /**
     * 部门code
     * 出院科室编码（原 deptcode 列，已改名 leaveldeptcode）
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;
    @Excel(name = "  出院科室编码")
    @ApiModelProperty(value = "出院科室编码")
    private String leaveldeptcode;

    /**
     * 医生编码
@@ -434,11 +434,11 @@
    private Long patid;

    /**
     * 科室名称
     * 出院科室名称（原 deptname 列，已改名 leaveldeptname）
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;
    @Excel(name = "出院科室名称")
    @ApiModelProperty(value = "出院科室名称")
    private String leaveldeptname;

    /**
     * 就诊日期

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java

@@ -213,32 +213,32 @@
    private Date createTimeNew;

    /**
     * 上午开始发送时间限制
     * 在院病区编码（原 sendlimitabegin 列复用而来）
     */
    @Excel(name = " 上午开始发送时间限制 ")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;
    @Excel(name = " 在院病区编码 ")
    @ApiModelProperty(value = "在院病区编码")
    private String hospitaldistrictcode;

    /**
     * 上午结束发送时间限制
     * 在院病区名称（原 sendlimitaend 列复用而来）
     */
    @Excel(name = " 上午结束发送时间限制 ")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;
    @Excel(name = " 在院病区名称 ")
    @ApiModelProperty(value = "在院病区名称")
    private String hospitaldistrictname;

    /**
     * 下午开始发送时间限制
     * 在院科室编码（原 sendlimitpbegin 列复用而来）
     */
    @Excel(name = " 下午开始发送时间限制 ")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;
    @Excel(name = " 在院科室编码 ")
    @ApiModelProperty(value = "在院科室编码")
    private String deptcode;

    /**
     * 下午结束发送时间限制
     * 在院科室名称（原 sendlimitpend 列复用而来）
     */
    @Excel(name = " 下午结束发送时间限制 ")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;
    @Excel(name = " 在院科室名称 ")
    @ApiModelProperty(value = "科室名称（入院维度）")
    private String deptname;

    /**
     * 晚上开始发送时间限制
@@ -325,11 +325,11 @@
    private Date pulltime;

    /**
     * 部门code
     * 出院科室编码（原 deptcode 列，已改名 leaveldeptcode）
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;
    @Excel(name = "  出院科室编码")
    @ApiModelProperty(value = "出院科室编码")
    private String leaveldeptcode;

    /**
     * 医生编码
@@ -515,11 +515,11 @@
    private String patguid;

    /**
     * 科室名称
     * 出院科室名称（原 deptname 列，已改名 leaveldeptname）
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;
    @Excel(name = "出院科室名称")
    @ApiModelProperty(value = "出院科室名称")
    private String leaveldeptname;

    /**
     * 就诊日期

 smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java

@@ -223,32 +223,32 @@
    private Date senddate;

    /**
     * 上午开始发送时间限制
     * 在院病区编码（原 sendlimitabegin 列复用而来）
     */
    @Excel(name = " 上午开始发送时间限制 ")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;
    @Excel(name = " 在院病区编码 ")
    @ApiModelProperty(value = "在院病区编码")
    private String hospitaldistrictcode;

    /**
     * 上午结束发送时间限制
     * 在院病区名称（原 sendlimitaend 列复用而来）
     */
    @Excel(name = " 上午结束发送时间限制 ")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;
    @Excel(name = " 在院病区名称 ")
    @ApiModelProperty(value = "在院病区名称")
    private String hospitaldistrictname;

    /**
     * 下午开始发送时间限制
     * 在院科室编码（原 sendlimitpbegin 列复用而来）
     */
    @Excel(name = " 下午开始发送时间限制 ")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;
    @Excel(name = " 在院科室编码 ")
    @ApiModelProperty(value = "在院科室编码")
    private String deptcode;

    /**
     * 下午结束发送时间限制
     * 在院科室名称（原 sendlimitpend 列复用而来）
     */
    @Excel(name = " 下午结束发送时间限制 ")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;
    @Excel(name = " 在院科室名称 ")
    @ApiModelProperty(value = "在院科室名称")
    private String deptname;

    /**
     * 晚上开始发送时间限制
@@ -351,17 +351,24 @@
    private Long bhsms;

    /**
     * 部门code
     * 出院科室编码（原 deptcode 列，已改名 leaveldeptcode）
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;
    @Excel(name = "  出院科室编码")
    @ApiModelProperty(value = "出院科室编码")
    private String leaveldeptcode;
    /**
     * 部门code
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code集合")
    @ApiModelProperty(value = "离院部门code集合")
    private List<String> leaveldeptcodes;

    /**
     * 在院部门code
     */
    @Excel(name = "在院部门code")
    @ApiModelProperty(value = "在院部门code")
    private List<String> deptcodes;

    /**
     * 标签状态
@@ -556,11 +563,11 @@
    private String diagname;

    /**
     * 科室名称
     * 出院科室名称（原 deptname 列，已改名 leaveldeptname）
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;
    @Excel(name = "出院科室名称")
    @ApiModelProperty(value = "出院科室名称")
    private String leaveldeptname;
//
//    /**
//     * 就诊日期
@@ -604,6 +611,12 @@
    private List<String> leavehospitaldistrictcodes;

    /**
     * 在院病区集合
     */
    @ApiModelProperty(value = "在院病区集合")
    private List<String> hospitaldistrictcodes;

    /**
     * 出院病区名称
     */
    @ApiModelProperty(value = "出院病区名称")

 smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java

@@ -248,32 +248,32 @@
    private Date senddate;

    /**
     * 上午开始发送时间限制
     * 在院病区编码（原 sendlimitabegin 列复用而来）
     */
    @Excel(name = " 上午开始发送时间限制 ")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;
    @Excel(name = " 在院病区编码 ")
    @ApiModelProperty(value = "在院病区编码")
    private String hospitaldistrictcode;

    /**
     * 上午结束发送时间限制
     * 在院病区名称（原 sendlimitaend 列复用而来）
     */
    @Excel(name = " 上午结束发送时间限制 ")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;
    @Excel(name = " 在院病区名称 ")
    @ApiModelProperty(value = "在院病区名称")
    private String hospitaldistrictname;

    /**
     * 下午开始发送时间限制
     * 在院科室编码（原 sendlimitpbegin 列复用而来）
     */
    @Excel(name = " 下午开始发送时间限制 ")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;
    @Excel(name = " 在院科室编码 ")
    @ApiModelProperty(value = "在院科室编码")
    private String deptcode;

    /**
     * 下午结束发送时间限制
     * 在院科室名称（原 sendlimitpend 列复用而来）
     */
    @Excel(name = " 下午结束发送时间限制 ")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;
    @Excel(name = " 在院科室名称 ")
    @ApiModelProperty(value = "在院科室名称")
    private String deptname;

    /**
     * 晚上开始发送时间限制
@@ -371,17 +371,24 @@
    private Long bhsms;

    /**
     * 部门code
     * 出院科室编码（原 deptcode 列，已改名 leaveldeptcode）
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;
    @Excel(name = "  出院科室编码")
    @ApiModelProperty(value = "出院科室编码")
    private String leaveldeptcode;
    /**
     * 离院部门code集合
     */
    @Excel(name = "离院部门code集合")
    @ApiModelProperty(value = "离院部门code集合")
    private List<String> leaveldeptcodes;

    /**
     * 部门code
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code集合")
    private List<String> leaveldeptcodes;
    private List<String> deptcodes;

    /**
     * 标签状态
@@ -575,11 +582,11 @@
    private String diagname;

    /**
     * 科室名称
     * 出院科室名称（原 deptname 列，已改名 leaveldeptname）
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;
    @Excel(name = "出院科室名称")
    @ApiModelProperty(value = "出院科室名称")
    private String leaveldeptname;
//
//    /**
//     * 就诊日期
@@ -623,6 +630,12 @@
    private List<String> leavehospitaldistrictcodes;

    /**
     * 在院病区集合（对应 hospitaldistrictcode 列，2026-11 与 VO 对齐后补上）
     */
    @ApiModelProperty(value = "在院病区集合")
    private List<String> hospitaldistrictcodes;

    /**
     * 出院病区名称
     */
    @ApiModelProperty(value = "出院病区名称")

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -1103,14 +1103,14 @@
        serviceSubtask.setInhospid(patMedInhosp1.getInhospid());
        serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
        serviceSubtask.setDrname(patMedInhosp1.getDrname());
        serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
        serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
        serviceSubtask.setLeaveldeptcode(patMedInhosp1.getLeaveldeptcode());
        serviceSubtask.setLeaveldeptname(patMedInhosp1.getLeaveldeptname());
        serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
        serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
        if (type == 4 || type == 5) {
            //设置入院的
            serviceSubtask.setDeptcode(patMedInhosp1.getDeptcode());
            serviceSubtask.setDeptname(patMedInhosp1.getDeptname());
            serviceSubtask.setLeaveldeptcode(patMedInhosp1.getDeptcode());
            serviceSubtask.setLeaveldeptname(patMedInhosp1.getDeptname());
            serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getHospitaldistrictcode());
            serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getHospitaldistrictname());
        }
@@ -1216,8 +1216,8 @@
        serviceSubtask.setInhospid(patMedInhosp1.getInhospid());
        serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
        serviceSubtask.setDrname(patMedInhosp1.getDrname());
        serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
        serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
        serviceSubtask.setLeaveldeptcode(patMedInhosp1.getLeaveldeptcode());
        serviceSubtask.setLeaveldeptname(patMedInhosp1.getLeaveldeptname());
        serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
        serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
        serviceSubtask.setLeaveicd10code(patMedInhosp1.getLeaveicd10code());

 smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java

@@ -196,8 +196,8 @@
//        serviceSubtask.setInhospid(patMedOperation1.getInhospid());
        serviceSubtask.setDrcode(patMedOperation1.getDrcode());
        serviceSubtask.setDrname(patMedOperation1.getDrname());
        serviceSubtask.setDeptcode(patMedOperation1.getDeptcode());
        serviceSubtask.setDeptname(patMedOperation1.getDeptname());
        serviceSubtask.setLeaveldeptcode(patMedOperation1.getDeptcode());
        serviceSubtask.setLeaveldeptname(patMedOperation1.getDeptname());
        serviceSubtask.setTemplateid(serviceTask.getTemplateid());
        serviceSubtask.setTemplatename(serviceTask.getTemplatename());
        serviceSubtask.setPatid(patArchive.getId());

 smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java

@@ -488,10 +488,10 @@
            serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
        serviceSubtask.setDrcode(patMedOuthosp.getDrcode());
        serviceSubtask.setDrname(patMedOuthosp.getDrname());
        serviceSubtask.setDeptcode(patMedOuthosp.getDeptcode());
        serviceSubtask.setLeaveldeptcode(patMedOuthosp.getDeptcode());
        serviceSubtask.setInhospid(patMedOuthosp.getId());
        serviceSubtask.setHospno(patMedOuthosp.getOuthospno());
        serviceSubtask.setDeptname(patMedOuthosp.getDeptname());
        serviceSubtask.setLeaveldeptname(patMedOuthosp.getDeptname());
        serviceSubtask.setTemplateid(serviceTask.getTemplateid());
        serviceSubtask.setTemplatename(serviceTask.getTemplatename());
        serviceSubtask.setPatid(patArchive.getId());
@@ -660,7 +660,7 @@
                patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
            serviceSubtaskEntity0.setInhospids(inhospids);
        }else {
            serviceSubtaskEntity0.setDeptcode(deptcode);
            serviceSubtaskEntity0.setLeaveldeptcode(deptcode);
        }

        serviceSubtaskEntity0.setSort(0);
@@ -683,7 +683,7 @@
                serviceSubtask1.setVisitDeptCode(serviceSubtask0.getVisitDeptCode());
                serviceSubtask1.setVisitDeptName(serviceSubtask0.getVisitDeptName());
                //新任务科室是当前出院科室
                serviceSubtask1.setDeptcode(patMedOuthosp.getDeptcode());
                serviceSubtask1.setLeaveldeptcode(patMedOuthosp.getDeptcode());
                serviceSubtask1.setCreateTime(new Date());
                serviceSubtask1.setUpdateTime(new Date());
                serviceSubtask1.setFinishtime(null);
@@ -699,7 +699,7 @@
//            serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());
//            serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
//            serviceSubtaskEntity.setPatid(patid);
//            serviceSubtaskEntity.setDeptcode(deptcode);
//            serviceSubtaskEntity.setLeaveldeptcode(deptcode);
//            serviceSubtaskEntity.setSort(0);
//            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
//            if(!CollectionUtils.isEmpty(serviceSubtaskList)){

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -652,8 +652,8 @@
                serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
                if (CollectionUtils.isNotEmpty(patMedInhospList)) {
                    serviceSubtask.setHospType("2");
                    serviceSubtask.setDeptname(patMedInhospList.get(0).getDeptname());
                    serviceSubtask.setDeptcode(patMedInhospList.get(0).getDeptcode());
                    serviceSubtask.setLeaveldeptname(patMedInhospList.get(0).getDeptname());
                    serviceSubtask.setLeaveldeptcode(patMedInhospList.get(0).getDeptcode());
                    serviceSubtask.setLeavehospitaldistrictcode(patMedInhospList.get(0).getLeavehospitaldistrictcode());
                    serviceSubtask.setLeavehospitaldistrictname(patMedInhospList.get(0).getLeavehospitaldistrictname());
                    serviceSubtask.setDrname(patMedInhospList.get(0).getDrname());
@@ -666,8 +666,8 @@
                    serviceSubtask.setHospType("1");
                    serviceSubtask.setAdmindate(patMedOuthosps.get(0).getAdmitdate());
                    serviceSubtask.setHospno(patMedOuthosps.get(0).getOuthospno());
                    serviceSubtask.setDeptname(patMedOuthosps.get(0).getDeptname());
                    serviceSubtask.setDeptcode(patMedOuthosps.get(0).getDeptcode());
                    serviceSubtask.setLeaveldeptname(patMedOuthosps.get(0).getDeptname());
                    serviceSubtask.setLeaveldeptcode(patMedOuthosps.get(0).getDeptcode());
                    serviceSubtask.setDrname(patMedOuthosps.get(0).getDrname());
                    serviceSubtask.setDrcode(patMedOuthosps.get(0).getDrcode());
                    serviceSubtask.setServiceType("14");
@@ -683,7 +683,7 @@
                }
                if (StringUtils.isNotEmpty(dealDept)) {
                    //投诉建议的处理部门
                    serviceSubtask.setDeptcode(dealDept);
                    serviceSubtask.setLeaveldeptcode(dealDept);
                    serviceSubtask.setServiceType("15");
                }
                serviceSubtask.setSubmit(1L);

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -348,8 +348,8 @@
                patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
                patTaskRelevance.setPatid(serviceSubtask1.getPatid());
                patTaskRelevance.setSendStatus(serviceSubtask1.getSendstate());
                patTaskRelevance.setDeptcode(serviceSubtask1.getDeptcode());
                patTaskRelevance.setDeptName(serviceSubtask1.getDeptname());
                patTaskRelevance.setDeptcode(serviceSubtask1.getLeaveldeptcode());
                patTaskRelevance.setDeptName(serviceSubtask1.getLeaveldeptname());
                patTaskRelevance.setLeavehospitaldistrictcode(serviceSubtask1.getLeavehospitaldistrictcode());
                patTaskRelevance.setLeavehospitaldistrictname(serviceSubtask1.getLeavehospitaldistrictname());
                patTaskRelevance.setInhosptime(serviceSubtask1.getInhosptime());
@@ -369,8 +369,8 @@
                patTaskRelevance.setTelcode(serviceSubtask1.getPhone());
                patTaskRelevance.setFinishtime(serviceSubtask1.getFinishtime());
                patTaskRelevance.setAddr(serviceSubtask1.getAddr());
                patTaskRelevance.setDeptName(serviceSubtask1.getDeptname());
                patTaskRelevance.setDeptcode(serviceSubtask1.getDeptcode());
                patTaskRelevance.setDeptName(serviceSubtask1.getLeaveldeptname());
                patTaskRelevance.setDeptcode(serviceSubtask1.getLeaveldeptcode());
                patTaskRelevance.setBedNo(serviceSubtask1.getBedNo());
                patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
                patTaskRelevance.setPatid(serviceSubtask1.getPatid());
@@ -924,8 +924,8 @@
                    visitDeptCode = requestDeptCode;
                    visitDeptName = requestDeptName;
                } else {
                    visitDeptCode = serviceSubtask.getDeptcode();
                    visitDeptName = serviceSubtask.getDeptname();
                    visitDeptCode = serviceSubtask.getLeaveldeptcode();
                    visitDeptName = serviceSubtask.getLeaveldeptname();
                }
                if (StringUtils.isEmpty(visitDeptCode)) {
                    log.error("再次随访任务创建失败，本科室随访未找到随访科室, subTaskId = {}", serviceSubtask.getId());
@@ -1164,8 +1164,8 @@
                    visitDeptCode = fallbackDeptCode;
                    visitDeptName = serviceSubtask.getVisitDeptName();
                } else {
                    visitDeptCode = serviceSubtask.getDeptcode();
                    visitDeptName = serviceSubtask.getDeptname();
                    visitDeptCode = serviceSubtask.getLeaveldeptcode();
                    visitDeptName = serviceSubtask.getLeaveldeptname();
                }
            }
            ServiceSubtask serviceSubtaskAgain = patMedInhospService.boxedServiceSubtask(nextServiceTask,
@@ -1589,11 +1589,11 @@
                    serviceSubtask.setSendstate(2L);
                    String subtaskDeptCode = patTaskRelevance.getDeptcode();
                    if (StringUtils.isEmpty(subtaskDeptCode) && StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                        // service_subtask.deptcode 为单值字段，不能写入任务的多科室拼接串，取第一个科室兜底
                        // service_subtask.leaveldeptcode 为单值字段，不能写入任务的多科室拼接串，取第一个科室兜底
                        subtaskDeptCode = serviceTaskVO.getDeptcode().split(",")[0].trim();
                    }
                    serviceSubtask.setDeptcode(subtaskDeptCode);
                    serviceSubtask.setDeptname(StringUtils.isNotEmpty(patTaskRelevance.getDeptName()) ? patTaskRelevance.getDeptName() : serviceTaskVO.getDeptname());
                    serviceSubtask.setLeaveldeptcode(subtaskDeptCode);
                    serviceSubtask.setLeaveldeptname(StringUtils.isNotEmpty(patTaskRelevance.getDeptName()) ? patTaskRelevance.getDeptName() : serviceTaskVO.getDeptname());
                    serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
                    serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
                    serviceSubtask.setType(serviceTaskVO.getType());
@@ -1965,10 +1965,10 @@
                    serviceSubtask.setAddr(patTaskRelevance.getAddr());
                    serviceSubtask.setPatid(patTaskRelevance.getPatid());
                    serviceSubtask.setOpenid(patTaskRelevance.getOpenid());
                    serviceSubtask.setDeptcode(patTaskRelevance.getDeptcode());
                    serviceSubtask.setLeaveldeptcode(patTaskRelevance.getDeptcode());
                    serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
                    serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
                    serviceSubtask.setDeptname(patTaskRelevance.getDeptName());
                    serviceSubtask.setLeaveldeptname(patTaskRelevance.getDeptName());
                    serviceSubtask.setType(serviceTaskVO.getType());
                    serviceSubtask.setCreateTime(DateUtils.getNowDate());
                    serviceSubtask.setDrname(patTaskRelevance.getDrname());
@@ -3463,7 +3463,7 @@
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getManagementDoctorCode()).orElse("Unknown")));
                break;
            case "deptcode":
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeaveldeptcode()).orElse("Unknown")));
                break;
            case "leavehospitaldistrictcode":
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
@@ -3622,7 +3622,7 @@
            if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
                collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
            } else {
                collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
                collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeaveldeptname()).orElse("Unknown")));
            }
        }
        List<ServiceSubtaskCount> joySubCount = serviceSubtaskMapper.getSfStatisticsJoy(serviceSubtaskCountReq);
@@ -3643,7 +3643,7 @@
                if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())) {
                    ss.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
                } else if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getDeptcodes())) {
                    ss.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
                    ss.setLeaveldeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
                }
            }

@@ -3803,8 +3803,8 @@
        } else {
            //格式化为两位小数的百分比
            DecimalFormat percentFormat = new DecimalFormat("##.##%");
            serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
            serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
            serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getLeaveldeptname());
            serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
            serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
            serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
            serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
@@ -4194,8 +4194,8 @@
        ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
        //格式化为两位小数的百分比
        DecimalFormat percentFormat = new DecimalFormat("##.##%");
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getLeaveldeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
        serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
        serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
        serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
@@ -4369,8 +4369,8 @@
        ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
        //格式化为两位小数的百分比
        DecimalFormat percentFormat = new DecimalFormat("##.##%");
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getLeaveldeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
        serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
        serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
        serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
@@ -4537,8 +4537,8 @@
        ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
        //格式化为两位小数的百分比
        DecimalFormat percentFormat = new DecimalFormat("##.##%");
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getLeaveldeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
        serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
        serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
        serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
@@ -4642,8 +4642,8 @@
        ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
        //格式化为两位小数的百分比
        DecimalFormat percentFormat = new DecimalFormat("##.##%");
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getDeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
        serviceSubtaskStatistic.setDeptname(serviceSubtaskList.get(0).getLeaveldeptname());
        serviceSubtaskStatistic.setDeptcode(serviceSubtaskList.get(0).getLeaveldeptcode());
        serviceSubtaskStatistic.setLeavehospitaldistrictname(serviceSubtaskList.get(0).getLeavehospitaldistrictname());
        serviceSubtaskStatistic.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
        serviceSubtaskStatistic.setDrcode(serviceSubtaskList.get(0).getDrcode());
@@ -5268,7 +5268,7 @@
        List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
        switch (groupKey) {
            case "deptcode":
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeaveldeptcode()).orElse("Unknown")));
                break;
            case "drcode":
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
@@ -5795,7 +5795,7 @@
            diagname.setPhone(subtask.getPhone());
            diagname.setNurseName(subtask.getNurseName());
            diagname.setDrname(subtask.getDrname());
            diagname.setDeptname(subtask.getDeptname());
            diagname.setDeptname(subtask.getLeaveldeptname());
            diagname.setLeavehospitaldistrictname(subtask.getLeavehospitaldistrictname());
            diagname.setTemplatename(subtask.getTemplatename());
            diagname.setPreachform(subtask.getPreachform());
@@ -6968,8 +6968,8 @@
//        serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
//        serviceSubtask.setDrname(patMedInhosp1.getDrname());
        if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")) {
            serviceSubtask.setDeptcode(serviceTaskdept.getDeptCode());
            serviceSubtask.setDeptname(serviceTaskdept.getDeptName());
            serviceSubtask.setLeaveldeptcode(serviceTaskdept.getDeptCode());
            serviceSubtask.setLeaveldeptname(serviceTaskdept.getDeptName());
        } else {
            serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
            serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());

 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java

@@ -210,7 +210,7 @@
                patTaskRelevance.setSfzh(serviceSubtask1.getSfzh());
                patTaskRelevance.setPhone(serviceSubtask1.getPhone());
                patTaskRelevance.setAddr(serviceSubtask1.getAddr());
                patTaskRelevance.setDeptName(serviceSubtask1.getDeptname());
                patTaskRelevance.setDeptName(serviceSubtask1.getLeaveldeptname());
                patTaskRelevance.setBedNo(serviceSubtask1.getBedNo());
                patTaskRelevance.setDiagname(serviceSubtask1.getLeavediagname());
                patTaskRelevance.setPatid(serviceSubtask1.getPatid());
@@ -280,8 +280,8 @@
        serviceSubtask.setAdmindate(serviceTaskVO.getVisittime());
        serviceSubtask.setRoomno(serviceTaskVO.getRoomno());
        serviceSubtask.setBedNo(serviceTaskVO.getBedno());
        serviceSubtask.setDeptname(serviceTaskVO.getDeptname());
        serviceSubtask.setDeptcode(serviceTaskVO.getDeptcode());
        serviceSubtask.setLeaveldeptname(serviceTaskVO.getDeptname());
        serviceSubtask.setLeaveldeptcode(serviceTaskVO.getDeptcode());
        serviceSubtask.setSendstate(6L);
        serviceSubtask.setVisitTime(serviceTaskVO.getVisittime());
        serviceSubtask.setCreateTime(new Date());

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml

@@ -201,8 +201,8 @@
            ssd.targetid,
            ssd.template_type,
            ssd.lib_templateid,
            sd.deptcode,
            sd.deptname,
            sd.leaveldeptcode AS deptcode,
            sd.leaveldeptname AS deptname,
            sd.leavehospitaldistrictcode,
            sd.leavehospitaldistrictname
        from service_subtask_detail ssd
@@ -229,7 +229,7 @@
            </foreach>
        </if>
        <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
            and sd.deptcode in
            and sd.leaveldeptcode in
            <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
                #{leaveldeptcode}
            </foreach>

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -27,7 +27,7 @@
        <result property="recordid" column="recordid"/>
        <result property="exrecallcount" column="exrecallcount"/>
        <result property="pulltime" column="pulltime"/>
        <result property="deptcode" column="deptcode"/>
        <result property="leaveldeptcode" column="leaveldeptcode"/>
        <result property="labelstatus" column="labelstatus"/>
        <result property="delFlag" column="del_flag"/>
        <result property="updateBy" column="update_by"/>
@@ -54,6 +54,11 @@
        <result property="leaveicd10code" column="leaveicd10code"/>
        <result property="leavediagname" column="leavediagname"/>
        <result property="diagname" column="diagname"/>
        <result property="leaveldeptname" column="leaveldeptname"/>
        <!-- 2026-11：原 sendlimit* 四个空闲列复用为「在院维度」（hospitaldistrict* = 在院病区，deptcode/name = 在院科室） -->
        <result property="hospitaldistrictcode" column="hospitaldistrictcode"/>
        <result property="hospitaldistrictname" column="hospitaldistrictname"/>
        <result property="deptcode" column="deptcode"/>
        <result property="deptname" column="deptname"/>
        <result property="admindate" column="admindate"/>
        <result property="roomno" column="roomno"/>
@@ -211,7 +216,7 @@
               recordid,
               exrecallcount,
               pulltime,
               deptcode,
               leaveldeptcode,
               labelstatus,
               del_flag,
               update_by,
@@ -234,6 +239,10 @@
               sendname,
               roomno,
               admindate,
               leaveldeptname,
               hospitaldistrictcode,
               hospitaldistrictname,
               deptcode,
               deptname,
               stop_state,
               leavehospitaldistrictcode,
@@ -497,7 +506,7 @@
                </foreach>
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                AND deptcode IN
                AND leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -519,7 +528,7 @@
                OR
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size() > 0">
                deptcode IN
                leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -575,8 +584,8 @@
        <if test="recordid != null ">and recordid = #{recordid}</if>
        <if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
        <if test="pulltime != null ">and pulltime = #{pulltime}</if>
        <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
        <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
        <if test="leaveldeptcode != null  and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
        <if test="leaveldeptname != null  and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
        <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
        <if test="isupload != null ">and isupload = #{isupload}</if>
        <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -662,7 +671,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -761,8 +770,8 @@
        <if test="recordid != null ">and recordid = #{recordid}</if>
        <if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
        <if test="pulltime != null ">and pulltime = #{pulltime}</if>
        <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
        <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
        <if test="leaveldeptcode != null  and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
        <if test="leaveldeptname != null  and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
        <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
        <if test="isupload != null ">and isupload = #{isupload}</if>
        <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -838,8 +847,8 @@
        <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
        <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
        <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
        <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
        <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
        <if test="leaveldeptcode != null  and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
        <if test="leaveldeptname != null  and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
        <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
        <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">and
            leavehospitaldistrictcode = #{leavehospitaldistrictcode}
@@ -928,8 +937,8 @@
        </if>
        <if test="orgid != null and orgid != ''">AND ss.orgid = #{orgid}</if>
        <if test="campusid != null and campusid != ''">and ss.campusid = #{campusid}</if>
        <if test="deptcode != null  and deptcode != ''">and ss.deptcode = #{deptcode}</if>
        <if test="deptname != null  and deptname != ''">and ss.deptname = #{deptname}</if>
        <if test="leaveldeptcode != null  and leaveldeptcode != ''">and ss.leaveldeptcode = #{leaveldeptcode}</if>
        <if test="leaveldeptname != null  and leaveldeptname != ''">and ss.leaveldeptname = #{leaveldeptname}</if>
        <if test="isabnormal != null">and ss.isabnormal = #{isabnormal}</if>
        <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">and
            ss.leavehospitaldistrictcode = #{leavehospitaldistrictcode}
@@ -991,8 +1000,8 @@
        <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
        <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
        <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
        <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
        <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
        <if test="leaveldeptcode != null  and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
        <if test="leaveldeptname != null  and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
        <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">and
            leavehospitaldistrictcode = #{leavehospitaldistrictcode}
        </if>
@@ -1064,7 +1073,11 @@
            <if test="recordid != null">recordid,</if>
            <if test="exrecallcount != null">exrecallcount,</if>
            <if test="pulltime != null">pulltime,</if>
            <if test="deptcode != null">deptcode,</if>
            <if test="leaveldeptcode != null">leaveldeptcode,</if>
            <if test="hospitaldistrictcode != null  and hospitaldistrictcode != ''">hospitaldistrictcode,</if>
            <if test="hospitaldistrictname != null  and hospitaldistrictname != ''">hospitaldistrictname,</if>
            <if test="deptcode != null  and deptcode != ''">deptcode,</if>
            <if test="deptname != null  and deptname != ''">deptname,</if>
            <if test="labelstatus != null">labelstatus,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
@@ -1089,7 +1102,7 @@
            <if test="wechat != null  and wechat != ''">wechat,</if>
            <if test="roomno != null  and roomno != ''">roomno,</if>
            <if test="admindate != null">admindate,</if>
            <if test="deptname != null  and deptname != ''">deptname,</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">leaveldeptname,</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code,</if>
            <if test="leavediagname != null  and leavediagname != ''">leavediagname,</if>
            <if test="libtemplateid != null ">libtemplateid,</if>
@@ -1164,7 +1177,11 @@
            <if test="recordid != null">#{recordid},</if>
            <if test="exrecallcount != null">#{exrecallcount},</if>
            <if test="pulltime != null">#{pulltime},</if>
            <if test="deptcode != null">#{deptcode},</if>
            <if test="leaveldeptcode != null">#{leaveldeptcode},</if>
            <if test="hospitaldistrictcode != null  and hospitaldistrictcode != ''">#{hospitaldistrictcode},</if>
            <if test="hospitaldistrictname != null  and hospitaldistrictname != ''">#{hospitaldistrictname},</if>
            <if test="deptcode != null  and deptcode != ''">#{deptcode},</if>
            <if test="deptname != null  and deptname != ''">#{deptname},</if>
            <if test="labelstatus != null">#{labelstatus},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
@@ -1189,7 +1206,7 @@
            <if test="wechat != null  and wechat != ''">#{wechat},</if>
            <if test="roomno != null  and roomno != ''">#{roomno},</if>
            <if test="admindate != null ">#{admindate},</if>
            <if test="deptname != null  and deptname != ''">#{deptname},</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">#{leaveldeptname},</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">#{leaveicd10code},</if>
            <if test="leavediagname != null  and leavediagname != ''">#{leavediagname},</if>
            <if test="libtemplateid != null ">#{libtemplateid},</if>
@@ -1277,7 +1294,7 @@
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
            <if test="pulltime != null">pulltime = #{pulltime},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
            <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1302,7 +1319,7 @@
            <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
            <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
            <if test="admindate != null ">admindate = #{admindate},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1402,7 +1419,7 @@
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
            <if test="pulltime != null">pulltime = #{pulltime},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
            <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1427,7 +1444,7 @@
            <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
            <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
            <if test="admindate != null">admindate = #{admindate},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1509,7 +1526,7 @@
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
            <if test="pulltime != null">pulltime = #{pulltime},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
            <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1536,7 +1553,7 @@
            <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
            <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
            <if test="admindate != null">admindate = #{admindate},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1622,7 +1639,7 @@
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
            <if test="pulltime != null">pulltime = #{pulltime},</if>
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
            <if test="labelstatus != null">labelstatus = #{labelstatus},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1649,7 +1666,7 @@
            <if test="admindate != null ">admindate = #{admindate},</if>
            <if test="visitCount != null ">visit_count = #{visitCount},</if>
            <if test="isVisitAgain != null ">is_visit_again = #{isVisitAgain},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="leaveldeptname != null  and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
            <if test="leaveicd10code != null  and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
            <if test="leavediagname != null  and leavediagname != ''">leavediagname = #{leavediagname},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1758,8 +1775,8 @@
        management_doctor,
        leavehospitaldistrictcode,
        leavehospitaldistrictname,
        deptcode,
        deptname,
        leaveldeptcode,
        leaveldeptname,
        sendstate,
        preachform,
        <include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
@@ -1810,7 +1827,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -1935,7 +1952,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND b.deptcode IN
            AND b.leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2000,7 +2017,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2061,8 +2078,8 @@
        drname,
        leavehospitaldistrictcode,
        leavehospitaldistrictname,
        deptcode,
        deptname,
        leaveldeptcode,
        leaveldeptname,
        sendstate,
        preachform,
        <include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
@@ -2113,7 +2130,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2192,7 +2209,7 @@
            AND leavehospitaldistrictcode = #{leavehospitaldistrictcode}
        </if>
        <if test="deptcode != null and deptcode != ''">
            AND deptcode = #{deptcode}
            AND leaveldeptcode = #{deptcode}
        </if>
        <if test="isManuallyCalled != null">
            AND is_manually_called = #{isManuallyCalled}
@@ -2229,7 +2246,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2276,7 +2293,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2312,7 +2329,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2369,7 +2386,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND t.deptcode IN
            AND t.leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2455,7 +2472,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND ss.deptcode IN
            AND ss.leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2527,7 +2544,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND ss.deptcode IN
            AND ss.leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -2578,7 +2595,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND ss.deptcode IN
            AND ss.leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
                #{deptcode}
            </foreach>
@@ -2609,7 +2626,7 @@
            </choose>
        </if>
        <if test="statisticaltype != null and statisticaltype == 2 and deptcode != null and deptcode != ''">
            AND ss.deptcode = #{deptcode}
            AND ss.leaveldeptcode = #{deptcode}
        </if>
        <if test="statisticaltype != null and statisticaltype == 3 and taskId != null">
            AND ss.taskid = #{taskId}
@@ -2620,7 +2637,7 @@
                AND ss.leavehospitaldistrictcode = #{leavehospitaldistrictcode}
            </if>
            <if test="deptcode != null and deptcode != ''">
                AND ss.deptcode = #{deptcode}
                AND ss.leaveldeptcode = #{deptcode}
            </if>
            <if test="taskId != null">
                AND ss.taskid = #{taskId}
@@ -2710,7 +2727,7 @@
               recordid,
               exrecallcount,
               pulltime,
               deptcode,
               leaveldeptcode,
               labelstatus,
               del_flag,
               upid,
@@ -2740,7 +2757,7 @@
               admindate,
               patid,
               service_type,
               deptname,
               leaveldeptname,
               score,
               drname,
               drcode,
@@ -2800,7 +2817,7 @@
    </select>

    <select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
        SELECT deptname,
        SELECT leaveldeptname AS deptname,
        count(1) AS rc
        FROM service_subtask
        WHERE DATE_FORMAT(visit_time, '%Y-%m-%d') >= #{startDate}
@@ -2813,7 +2830,7 @@
        <if test="campusid != null and campusid != ''">
            AND campusid = #{campusid}
        </if>
        GROUP BY deptname
        GROUP BY leaveldeptname
    </select>

    <!-- 服务统计查询 - 按时间维度统计出院/门诊随访数据 -->
@@ -2864,7 +2881,7 @@
            AND campusid = #{campusid}
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
                #{deptcode}
            </foreach>
@@ -3029,7 +3046,7 @@
                </foreach>
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                AND deptcode IN
                AND leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -3051,7 +3068,7 @@
                OR
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                deptcode IN
                leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -3154,14 +3171,14 @@
                </foreach>
            </if>
            <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
                AND deptcode IN
                AND leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
                    #{leaveldeptcode}
                </foreach>
            </if>
        </if>
        <if test="deptcode != null and deptcode != ''">
            AND deptcode = #{deptcode}
        <if test="leaveldeptcode != null and leaveldeptcode != ''">
            AND leaveldeptcode = #{leaveldeptcode}
        </if>
        <if test="sendstate != null">
            AND sendstate = #{sendstate}
@@ -3225,7 +3242,7 @@
            AND date_format( visit_time, '%y%m%d' ) &lt;= date_format(#{endDate},'%y%m%d')
        </if>
        <if test="deptcodeList != null and deptcodeList.size()>0">
            and deptcode in
            and leaveldeptcode in
            <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                #{deptcode}
            </foreach>
@@ -3299,7 +3316,7 @@
                OR
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                ss.deptcode IN
                ss.leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -3347,7 +3364,7 @@
                OR
            </if>
            <if test="deptcodes != null and deptcodes.size() > 0">
                deptcode IN
                leaveldeptcode IN
                <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                         close=")">
                    #{deptcode}
@@ -3397,14 +3414,14 @@
            parameterType="com.smartor.domain.VO.ServiceSubtaskCotinueCountVO"
            resultType="java.util.Map">
        SELECT
        deptcode AS groupCode,
        deptname AS groupName,
        leaveldeptcode AS groupCode,
        leaveldeptname AS groupName,
        SUM(CASE WHEN continue_flag = 1 THEN 1 ELSE 0 END) AS noContinueCnt,
        SUM(CASE WHEN continue_flag = 2 THEN 1 ELSE 0 END) AS continueCnt
        FROM service_subtask
        WHERE del_flag = 0
        AND continue_flag IN (1, 2)
        AND deptcode IS NOT NULL AND deptcode != ''
        AND leaveldeptcode IS NOT NULL AND leaveldeptcode != ''
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>
@@ -3412,12 +3429,12 @@
            AND campusid = #{campusid}
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="code" open="(" separator="," close=")">
                #{code}
            </foreach>
        </if>
        GROUP BY deptcode, deptname
        GROUP BY leaveldeptcode, leaveldeptname
        ORDER BY groupCode
    </select>

@@ -3430,8 +3447,8 @@
                leavehospitaldistrictname AS groupName,
            </when>
            <otherwise>
                deptcode AS groupCode,
                deptname AS groupName,
                leaveldeptcode AS groupCode,
                leaveldeptname AS groupName,
            </otherwise>
        </choose>
        COUNT(*) AS totalCount,
@@ -3468,12 +3485,12 @@
            </when>
            <otherwise>
                <if test="deptcodes != null and deptcodes.size() > 0">
                    AND deptcode IN
                    AND leaveldeptcode IN
                    <foreach collection="deptcodes" item="code" open="(" separator="," close=")">
                        #{code}
                    </foreach>
                </if>
                GROUP BY deptcode, deptname
                GROUP BY leaveldeptcode, leaveldeptname
                ORDER BY groupCode
            </otherwise>
        </choose>
@@ -3620,8 +3637,8 @@
        drname,
        leavehospitaldistrictcode,
        leavehospitaldistrictname,
        deptcode,
        deptname,
        leaveldeptcode,
        leaveldeptname,
        sendstate,
        preachform,
        current_preachform,
@@ -3675,7 +3692,7 @@
            </foreach>
        </if>
        <if test="deptcodes != null and deptcodes.size() > 0">
            AND deptcode IN
            AND leaveldeptcode IN
            <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
@@ -3866,8 +3883,8 @@
        t.task_name AS taskName,
        d.asrtext AS optionresult,
        d.score AS score,
        s.deptcode AS deptcode,
        s.deptname AS deptname,
        s.leaveldeptcode AS deptcode,
        s.leaveldeptname AS deptname,
        s.leavehospitaldistrictcode AS leavehospitaldistrictcode,
        s.leavehospitaldistrictname AS leavehospitaldistrictname,
        d.targetvalue AS targetvalue,
@@ -3974,8 +3991,8 @@
        d.targetvalue,
        d.asrtext,
        t.task_name,
        s.deptcode,
        s.deptname,
        s.leaveldeptcode,
        s.leaveldeptname,
        s.leavehospitaldistrictcode,
        s.leavehospitaldistrictname,
        d.value_type
@@ -3987,7 +4004,7 @@
    <select id="statQuestionOptionByKsOrBq" resultType="com.smartor.domain.DTO.QuestionCountKsOrBqDTO"
            parameterType="com.smartor.domain.VO.QuestionCountKsOrBqVO">
        SELECT
        s.deptname AS deptname,
        IFNULL(s.leaveldeptname, s.deptname) AS deptname,
        s.leavehospitaldistrictname AS leavehospitaldistrictname,
        d.questiontext AS questionText,
        d.targetvalue AS targetvalue, -- 所有选项拼接
@@ -4017,7 +4034,7 @@
                </foreach>
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                AND deptcode IN
                AND leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -4034,7 +4051,7 @@
                </foreach>
            </if>
            <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
                OR deptcode IN
                OR leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
@@ -4069,8 +4086,8 @@
                s.leavehospitaldistrictname AS name,
            </when>
            <otherwise>
                s.deptcode AS code,
                s.deptname AS name,
                s.leaveldeptcode AS code,
                s.leaveldeptname AS name,
            </otherwise>
        </choose>
        CAST(d.score AS DECIMAL(10,4)) AS w
@@ -4123,10 +4140,10 @@
                </if>
            </when>
            <otherwise>
                AND s.deptcode IS NOT NULL AND s.deptcode &lt;&gt; ''
                AND s.deptname IS NOT NULL AND s.deptname &lt;&gt; ''
                AND s.leaveldeptcode IS NOT NULL AND s.leaveldeptcode &lt;&gt; ''
                AND s.leaveldeptname IS NOT NULL AND s.leaveldeptname &lt;&gt; ''
                <if test="deptCodes != null and deptCodes.size() > 0">
                    AND s.deptcode IN
                    AND s.leaveldeptcode IN
                    <foreach collection="deptCodes" item="deptCode" open="(" separator="," close=")">
                        #{deptCode}
                    </foreach>