1.省立同德的满意度功能处理 2.省立同德、南华采集时间缩短 3.给保存问卷接口，加一下防止重复提前的注解@RepeatSubmit 4.省立同德新增...

liusheng

9 小时以前 2013ea208bc8fa12fb6f8d22497f2a8b5f69855f

1.省立同德的满意度功能处理
2.省立同德、南华采集时间缩短
3.给保存问卷接口，加一下防止重复提前的注解@RepeatSubmit
4.省立同德新增“报备科室责任人”字段
5.登陆接口加“用户类型”字段，不影响当前登陆逻辑

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -120,8 +121,8 @@
    @ApiOperation("患者问题结果记录 (外链)")
    @PostMapping("/saveQuestionAnswer")
    public AjaxResult saveQuestionAnswer(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
        log.info("【saveQuestionAnswer】的入参为 param1:{},param2:{},type:{},isabnormal:{}", 
                serviceSubTaskAnswerReq.getParam1(), serviceSubTaskAnswerReq.getParam2(), 
        log.info("【saveQuestionAnswer】的入参为 param1:{},param2:{},type:{},isabnormal:{}",
                serviceSubTaskAnswerReq.getParam1(), serviceSubTaskAnswerReq.getParam2(),
                serviceSubTaskAnswerReq.getType(), serviceSubTaskAnswerReq.getIsabnormal());
        // å¼‚步处理保存逻辑，立即返回成功消息
        serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L);
@@ -130,6 +131,7 @@


    @ApiOperation("患者问题结果记录缓存(小程序外链)")
    @RepeatSubmit
    @PostMapping("/saveQuestionCacheXCH")
    public AjaxResult saveQuestionCacheXCH(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionCache-----saveQuestionCacheXCH】的入参为：{}", serviceSubTaskCacheReq);
@@ -137,6 +139,7 @@
    }

    @ApiOperation("患者问题结果保存")
    @RepeatSubmit
    @PostMapping("/savequestiondetail")
    public AjaxResult saveQuestionDetail(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionDetail-----saveQuestionCache】的prarm1：{},prarm2：{},type：{},prarm6:{}", serviceSubTaskCacheReq.getParam1(), serviceSubTaskCacheReq.getParam2(), serviceSubTaskCacheReq.getType(), serviceSubTaskCacheReq.getParam6());
@@ -191,6 +194,7 @@


    @ApiOperation("患者满意度结果记录(外链)")
    @RepeatSubmit
    @PostMapping("/saveMYDQuestionAnswer")
    public AjaxResult saveMYDQuestionAnswer(@RequestBody ServiceSubTaskMYDAnswerReq serviceSubTaskAnswerReq) {
        log.info("【saveQuestionCache-----saveMYDQuestionAnswer】的入参为：{}", serviceSubTaskAnswerReq);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -24,10 +24,8 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserDeptService;
import com.smartor.domain.*;
import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.ServiceSubtaskVO;
import com.smartor.domain.VO.TransferDeptVO;
import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
@@ -191,59 +189,6 @@
    }

    /**
     * å¸¦Redis缓存的统计查询，供patItem和patItemCount共用，条件不变时直接命中缓存
     */
    private Map<String, Object> getPatItemCountWithCache(ServiceSubtaskEntity serviceSubtaskEntity) {
        Map<String, Object> map = new HashMap<>();
        LoginUser loginUser = getLoginUser();
        Long userId = null;
        if (ObjectUtils.isNotEmpty(loginUser) && ObjectUtils.isNotEmpty(loginUser.getUser())) {
            userId = loginUser.getUser().getUserId();
        }
        if (serviceSubtaskEntity.getSendstateView() != null) {
            //            1：待随访（1 è¢«é¢†å–、2 å¾…发送、3 å·²å‘送、5 å‘送失败、7、超时）；2：已完成（ 6 å·²å®Œæˆï¼‰ã€3：无需随访（4 ä¸æ‰§è¡Œï¼‰
            if (serviceSubtaskEntity.getSendstateView() == 1)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
            if (serviceSubtaskEntity.getSendstateView() == 2)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
            if (serviceSubtaskEntity.getSendstateView() == 3)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
        }
        if (ObjectUtils.isNotEmpty(userId)) {
            Map<String, Object> redisMap = redisCache.getCacheObject(userId + "patItemCount");
            Boolean redisFlag = false;
            if (MapUtils.isNotEmpty(redisMap)) {
                ServiceSubtaskEntity oldCondition = (ServiceSubtaskEntity) redisMap.get("searchCondition");
                if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
                    redisFlag = true;
                    map = redisMap;
                    redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
                }
            }
            if (!redisFlag) {
                map = serviceSubtaskService.patItemCount(serviceSubtaskEntity);
                map.put("searchCondition", serviceSubtaskEntity);
                redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
            }
        } else {
            map = serviceSubtaskService.patItemCount(serviceSubtaskEntity);
        }
        return map;
    }

    /**
     * æ¯”较两个ServiceSubtaskVO的查询条件是否一致
     * ä½¿ç”¨åå°„比较所有字段，排除分页参数和无关字段
     */
    private boolean isSameCondition(ServiceSubtaskEntity oldCondition, ServiceSubtaskEntity newCondition) {
        // ä½¿ç”¨ReflectUtils的通用方法比较，排除分页参数等无关字段
        return ReflectUtils.equalsAllFields(oldCondition, newCondition,
                // æŽ’除的字段：分页参数、序列化ID、时间戳等
                "pageNum", "pageSize", "serialVersionUID", "createBy", "createTime", "updateBy", "updateTime", "searchValue", "params");
    }


    /**
     * å¯¼å‡ºå•ä¸€ä»»åŠ¡åˆ—表
     */
    //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@@ -275,17 +220,11 @@
                    serviceSubtaskExport.setEndDay(endDay);
                }
            }

            if (StringUtils.isNotEmpty(serviceSubtaskVO.getServiceType()) && serviceSubtaskVO.getServiceType().equals("2")) {
                //获取serviceSubtaskList中的所有taskid
                List<Long> taskIds = serviceSubtaskList.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
                serviceSubtaskDetailRatioExports = serviceSubtaskService.statQuestionOption(taskIds, serviceSubtaskVO.getStartOutHospTime(), serviceSubtaskVO.getEndOutHospTime());
            } else if (StringUtils.isNotEmpty(serviceSubtaskVO.getServiceType()) && serviceSubtaskVO.getServiceType().equals("6")) {
                //满意度统计 ï¼ˆé€šè¿‡ subtask çš„ id åŽ»ç»Ÿè®¡ï¼‰
                List<Long> subtaskIds = serviceSubtaskList.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
                serviceSubtaskDetailRatioExports = serviceSubtaskService.statQuestionOptionBySubtaskIds(subtaskIds, serviceSubtaskVO.getStartOutHospTime(), serviceSubtaskVO.getEndOutHospTime());
            }

            QuestionResultVO questionResultVO = new QuestionResultVO();
            questionResultVO.setServiceType(serviceSubtaskVO.getServiceType());
            questionResultVO.setEndOutHospTime(serviceSubtaskVO.getEndOutHospTime());
            questionResultVO.setStartOutHospTime(serviceSubtaskVO.getStartOutHospTime());
            serviceSubtaskDetailRatioExports = serviceSubtaskService.getDetailRatio(questionResultVO, serviceSubtaskList);
        }


@@ -478,6 +417,8 @@
        if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
        if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
        serviceSubtask.setCampusid(user.getCampusid());
        serviceSubtask.setCreateBy(user.getNickName());
        serviceSubtask.setUpdateBy(user.getNickName());
        return success(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
    }

@@ -996,11 +937,12 @@
        return AjaxResult.success("【collectHISDaysBefore】同步任务已启动，天数为" + day + "天，请稍后查看结果");
    }


    @PostMapping("/syncMedOperForShiyi")
    public AjaxResult syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
        // ç«‹å³è¿”回，后台异步执行
        collectHISService.syncOper(startTime, endTime);
        CompletableFuture.runAsync(() -> {
            collectHISService.syncOper(startTime, endTime);
        });
        return AjaxResult.success("同步任务已启动，请稍后查看结果");
    }

@@ -1010,4 +952,59 @@
        ryTask.dealSubtaskDeadline(orgid, day);
        return AjaxResult.success("【dealSubtaskDeadline】同步任务已启动，天数为" + day + "天，请稍后查看结果");
    }
    /**
     * å¸¦Redis缓存的统计查询，供patItem和patItemCount共用，条件不变时直接命中缓存
     */
    private Map<String, Object> getPatItemCountWithCache(ServiceSubtaskEntity serviceSubtaskEntity) {
        Map<String, Object> map = new HashMap<>();
        LoginUser loginUser = getLoginUser();
        Long userId = null;
        if (ObjectUtils.isNotEmpty(loginUser) && ObjectUtils.isNotEmpty(loginUser.getUser())) {
            userId = loginUser.getUser().getUserId();
        }
        if (serviceSubtaskEntity.getSendstateView() != null) {
            //            1：待随访（1 è¢«é¢†å–、2 å¾…发送、3 å·²å‘送、5 å‘送失败、7、超时）；2：已完成（ 6 å·²å®Œæˆï¼‰ã€3：无需随访（4 ä¸æ‰§è¡Œï¼‰
            if (serviceSubtaskEntity.getSendstateView() == 1)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
            if (serviceSubtaskEntity.getSendstateView() == 2)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
            if (serviceSubtaskEntity.getSendstateView() == 3)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
        }
        if (ObjectUtils.isNotEmpty(userId)) {
            Map<String, Object> redisMap = redisCache.getCacheObject(userId + "patItemCount");
            Boolean redisFlag = false;
            if (MapUtils.isNotEmpty(redisMap)) {
                ServiceSubtaskEntity oldCondition = (ServiceSubtaskEntity) redisMap.get("searchCondition");
                if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
                    redisFlag = true;
                    map = redisMap;
                    redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
                }
            }
            if (!redisFlag) {
                map = serviceSubtaskService.patItemCount(serviceSubtaskEntity);
                map.put("searchCondition", serviceSubtaskEntity);
                redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
            }
        } else {
            map = serviceSubtaskService.patItemCount(serviceSubtaskEntity);
        }
        return map;
    }


    /**
     * æ¯”较两个ServiceSubtaskVO的查询条件是否一致
     * ä½¿ç”¨åå°„比较所有字段，排除分页参数和无关字段
     */
    private boolean isSameCondition(ServiceSubtaskEntity oldCondition, ServiceSubtaskEntity newCondition) {
        // ä½¿ç”¨ReflectUtils的通用方法比较，排除分页参数等无关字段
        return ReflectUtils.equalsAllFields(oldCondition, newCondition,
                // æŽ’除的字段：分页参数、序列化ID、时间戳等
                "pageNum", "pageSize", "serialVersionUID", "createBy", "createTime", "updateBy", "updateTime", "searchValue", "params");
    }



}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java

@@ -6,10 +6,14 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.domain.VO.QuestionResultVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskDetailService;
import com.smartor.service.IServiceSubtaskService;
import io.swagger.annotations.Api;
@@ -19,6 +23,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;

@@ -192,4 +197,41 @@
        map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
        return map;
    }


    /**
     * æŸ¥è¯¢æ‚£è€…随访信息
     */
    @ApiOperation("省立同德满意度数据统计")
    @PostMapping("/sltaMydTotalByScore")
    public Map<String, Object> sltaMydTotal(@RequestBody QuestionResultVO questionResultVO) {
        List<ServiceSubtaskRes> serviceSubtaskResList = null;
        ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
        serviceSubtaskEntity.setServiceType(questionResultVO.getServiceType());
        serviceSubtaskEntity.setEndOutHospTime(questionResultVO.getEndOutHospTime());
        serviceSubtaskEntity.setStartOutHospTime(questionResultVO.getStartOutHospTime());
        serviceSubtaskEntity.setDeptOrDistrict(questionResultVO.getDeptOrDistrict());
        serviceSubtaskEntity.setLeavehospitaldistrictcodes(questionResultVO.getLeavehospitaldistrictcodes());
        if (serviceSubtaskEntity != null) {
            List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.getServiceSubtasks(serviceSubtaskEntity);
            serviceSubtaskResList = DtoConversionUtils.sourceToTarget(serviceSubtasks, ServiceSubtaskRes.class);
        }
        List<ServiceSubtaskDetailRatioExport> detailList = serviceSubtaskService.getDetailRatio(questionResultVO, serviceSubtaskResList);

        // æŒ‰ questiontext åˆ†ç»„后转换为 QuestionResultVO
        List<QuestionResultDTO> result = new ArrayList<>();
        if (!detailList.isEmpty()) {
            Map<String, List<ServiceSubtaskDetailRatioExport>> groupedMap = detailList.stream()
                    .collect(Collectors.groupingBy(ServiceSubtaskDetailRatioExport::getQuestiontext));

            groupedMap.forEach((questionText, exportList) -> {
                QuestionResultDTO questionResultDTO = new QuestionResultDTO();
                questionResultDTO.setQeustionText(questionText);
                questionResultDTO.setSubtaskDetailRatioExportList(exportList);
                result.add(questionResultDTO);
            });
        }

        return success(result);
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java

@@ -4,11 +4,9 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.DTO.DetailTraceDealDTO;
import com.smartor.domain.ServiceSubtaskDetailTrace;
import com.smartor.domain.VO.DetailTraceDealVO;
import com.smartor.domain.VO.SatisfactionExceptConfigQuestionReqVO;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -79,7 +79,7 @@
            //通用密码：Hrs#当前年月日*
            token = loginService.getTokenWN(loginBody.getUsername());
        } else {
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid(), loginBody.getUserType());
        }
        ajax.put(Constants.TOKEN, token);
        return ajax;
@@ -124,12 +124,14 @@
//    @IpWhitelist
    @GetMapping("/SSOLogin")
    public RedirectView SSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String systype, String orgid, String userName, String token) {
      log.info("SSOLogin的入参，campusid：{},  deptId:{},  systype:{},  orgid:{},  userName:{},  token:{}",campusid,deptId,systype,orgid,userName,token);
        if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
            throw new BaseException("参数不能为空");
        }
        String path = null;
        if (StringUtils.isEmpty(systype)) path = sysConfigService.selectConfigByKey("sys.qddz");
        else path = sysConfigService.selectConfigByKey("sys.qddz.yd");
        log.info("qddz的查询值为，path：{}",path);

        if (StringUtils.isEmpty(path)) {
            throw new BaseException("请配置前端地址");

 ruoyi-admin/src/main/resources/application-xh.yml

@@ -192,7 +192,7 @@
#本 åœ° çŸ­ä¿¡è¯·æ±‚地址(这个服务是我们自己写的)
#xhsmsPath: http://192.168.2.13:8092/sendSms
#新华短信请求地址(这个服务是我们自己写的)
xhsmsPath: http://192.16.4.220:8092/sendSms
xhsmsPath: http://192.16.4.220:8092/sms
#帐号
xhsmsAccount: 911124
#接口密码

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -81,7 +81,7 @@
     * @param uuid     å”¯ä¸€æ ‡è¯†
     * @return ç»“æžœ
     */
    public String login(String username, String password, String code, String uuid, String orgid, String campusid) {
    public String login(String username, String password, String code, String uuid, String orgid, String campusid, String userType) {
        boolean captchaEnabled = configService.selectCaptchaEnabled();
        // éªŒè¯ç å¼€å…³
        if (captchaEnabled) {
@@ -91,7 +91,7 @@
        Authentication authentication = null;
        try {
            if (StringUtils.isEmpty(campusid)) campusid = "1";
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password);
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid + "&" + userType, password);
            AuthenticationContextHolder.setContext(authenticationToken);
            // è¯¥æ–¹æ³•ä¼šåŽ»è°ƒç”¨UserDetailsServiceImpl.loadUserByUsername
            authentication = authenticationManager.authenticate(authenticationToken);

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

@@ -395,7 +395,7 @@
                    iIcd10Service.queryAddIcd10();
                }

                // nhfy/sltd回溯30天分段采集判断（每段最多7天）
                // nhfy/sltd回溯30天分段采集判断（每段最多4天）
                boolean isBackfill = (active.trim().equals("nhfy") || active.trim().equals("sltd")) && StringUtils.isNotBlank(todayZeroStr);
                if (isBackfill) {
                    DateTimeFormatter dateFmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -403,7 +403,7 @@
                    LocalDate segEndDate = todayZero.toLocalDate();
                    int segCount = 0;
                    while (!segStart.isAfter(segEndDate)) {
                        LocalDate segEnd = segStart.plusDays(6);
                        LocalDate segEnd = segStart.plusDays(3);
                        if (segEnd.isAfter(segEndDate)) {
                            segEnd = segEndDate;
                        }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -182,14 +183,16 @@
        String[] split = userName.split("&");
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
        if (Objects.isNull(sysUser)) return sysUser;
        //这里只卡用户类型为“患者”的
        if (sysUser.getUserType().equals("患者") && StringUtils.isNotEmpty(split[3]) && !split[3].equals("null") && !sysUser.getUserType().equals(split[3].trim()))
            throw new BaseException("当前用户类型与登录用户类型不一致");

        boolean isAdmin = StringUtils.isNotEmpty(split[0]) && "admin".equals(split[0]);
        IUserExtInfoService userExtInfoService = SpringUtils.getBean(IUserExtInfoService.class);
        Executor executor = SpringUtils.getBean("threadPoolTaskExecutor");

        // === å¹¶è¡ŒæŸ¥è¯¢: ç”¨æˆ·æœºæž„信息 + éƒ¨é—¨åˆ—表 ===
        CompletableFuture<Map<String, String>> orgInfoFuture = CompletableFuture.supplyAsync(() ->
                userExtInfoService.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[2]), executor);
        CompletableFuture<Map<String, String>> orgInfoFuture = CompletableFuture.supplyAsync(() -> userExtInfoService.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[2]), executor);

        CompletableFuture<List<SysDept>> deptsFuture;
        if (isAdmin) {
@@ -341,10 +344,7 @@

        //获取当前登陆人的机构和院�?
        IUserExtInfoService userExtInfoService2 = SpringUtils.getBean(IUserExtInfoService.class);
        Map<String, String> userOrgInfo2 = userExtInfoService2.getUserOrgInfo(
                sysUser.getUserId().toString(),
                split[1],
                split[3]);
        Map<String, String> userOrgInfo2 = userExtInfoService2.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[3]);
        if (!userOrgInfo2.isEmpty()) {
            sysUser.setOrgid(userOrgInfo2.get("orgid"));
            sysUser.setCampusid(userOrgInfo2.get("campusid"));

 smartor/src/main/java/com/smartor/domain/DTO/QuestionResultDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.smartor.domain.DTO;

import com.ruoyi.common.core.domain.BaseEntity;
import com.smartor.domain.ServiceSubtaskDetailRatioExport;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * é—®å·ç»“æžœ
 *
 * @author ruoyi
 * @date 2024-02-02
 */

@ApiModel(value = "QuestionResultDTO", description = "问卷结果")
@Data
public class QuestionResultDTO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * é—®å·é¢˜ç›®
     */
    @ApiModelProperty(value = "问卷题目")
    private String qeustionText;

    /**
     * é—®å·ç»“果集合
     */
    @ApiModelProperty(value = "问卷结果集合")
    private List<ServiceSubtaskDetailRatioExport> subtaskDetailRatioExportList;


}

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

@@ -372,6 +372,20 @@
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

//    /**
//     * é—®é¢˜ç»“果（给“值类型”是文本或者数值用的）
//     */

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

@@ -359,6 +359,23 @@
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;


    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;



    /**
     * é—®é¢˜é€‰é¡¹
     */

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

@@ -392,6 +392,20 @@
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

    /**
     * è¯æœ¯é€‰é¡¹
     */
    @ApiModelProperty(value = "话术选项")

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

@@ -331,7 +331,7 @@
     */
    @ApiModelProperty(value = "入院病区长期任务，是否处理：0 æœªå¤„理   1 å¤„理成功    2 å¤„理失败 ")
    private String inWardcheckFlag;
    

    /**
     * è¯å“å®£æ•™é•¿æœŸä»»åŠ¡ï¼Œæ˜¯å¦å¤„理：0 æœªå¤„理   1 å¤„理
     */
@@ -396,7 +396,7 @@
    /**
     * å‡ºå…¥é™¢æ ‡è¯†
     */
    @ApiModelProperty("出入院标识：0入院  1出院 2 è½¬ç§‘  3 é¢„入院")
    @ApiModelProperty("出入院标识：0入院  1出院 2 è½¬ç§‘  3 é¢„入院  4.满意度")
    private Integer cry;

    /**

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

@@ -1,15 +1,13 @@
package com.smartor.domain;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

import java.util.Date;
import java.util.List;

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_tasksingle
@@ -595,7 +593,7 @@
    /**
     * æ‚£è€…来源
     */
    @ApiModelProperty(value = "患者来源：0本地患者表    1外部患者表")
    @ApiModelProperty(value = "任务病人的来源：0：医院患者；1：外部患者  2:导入患者")
    private String patfrom;

    /**

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

@@ -35,6 +35,15 @@
    @Excel(name = "比例")
    private String ratio;

    @Excel(name = "分数")
    private String score;

    @ApiModelProperty(value = "问题类型（1.单选 2多选 3问答 4填空  5其它）")
    private String valueType;

    @Excel(name = "选项")
    private String targetvalue;

    @Excel(name = "任务名称")
    private String taskname;


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

@@ -370,13 +370,68 @@
    private String dutyDeptPersonCode;

    @Excel(name = "报备科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "报备科室名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "报备科室责任人名称（如果多个科室用逗号分割）")
    private String reportDeptPersonName;

    @Excel(name = "报备科室编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室编码（如果多个科室用逗号分割）")
    private String circulationDeptCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室名称（如果多个科室用逗号分割）")
    private String circulationDeptName;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转说明")
    @ApiModelProperty(value = "流转说明")
    private String circulationExplain;
    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转时间")
    @ApiModelProperty(value = "流转时间")
    private Date circulationTime;

    /**
     * æµè½¬çŠ¶æ€ï¼š0不流转（默认） 1流转
     */
    @Excel(name = "流转状态：0不流转（默认） 1流转")
    @ApiModelProperty(value = "流转状态：0不流转（默认） 1流转")
    private String circulationStatus;


    @Excel(name = "流转人姓名")
    @ApiModelProperty(value = "流转人姓名")
    private String circulationPersonName;

    @Excel(name = "流转人编码")
    @ApiModelProperty(value = "流转人编码")
    private String circulationPersonCode;
}


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

@@ -19,6 +19,14 @@
@Data
public class ServiceSubtaskExport extends BaseEntity {
    private static final long serialVersionUID = 1L;
//
//    /**
//     * ç§‘室名称
//     */
//    @Excel(name = "主键")
//    @ApiModelProperty(value = "主键")
//    private Long id;


    /**
     * ç§‘室名称

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

@@ -315,6 +315,20 @@
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

    /**
     * é—®åˆ¸é¢˜ç›®åˆ†ç±»ID集合
     */
    @ApiModelProperty("满意度意见异常（只针对文本）")

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

@@ -331,6 +331,22 @@
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;


    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;


    @Excel(name = "分类ID集合")
    @ApiModelProperty(value = "分类ID集合")
    private List<Long> categoryids;

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

@@ -279,6 +279,19 @@
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;
    /**
     * é—®åˆ¸é¢˜ç›®åˆ†ç±»ID集合
     */
    @ApiModelProperty("满意度意见异常（只针对文本）")

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

@@ -359,11 +359,25 @@
    @ApiModelProperty(value = "报备科室名称（如果多个科室用逗号分割）")
    private String reportDeptPersonName;

    @Excel(name = "报备科室编码（如果多个科室用逗号分割）")
    @Excel(name = "报备科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

    /**
     * é—®åˆ¸é¢˜ç›®åˆ†ç±»ID集合
     */
    @ApiModelProperty("满意度意见异常（只针对文本）")

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

@@ -99,5 +99,61 @@
    @Excel(name = "报备科室编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "报备科室责任人编码（如果多个科室用逗号分割）")
    private String reportDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人编码（如果多个科室用逗号分割）")
    private String circulationDeptPersonCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室责任人名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室责任人名称（如果多个科室用逗号分割）")
    private String circulationDeptPersonName;

    /**
     * æµè½¬ç§‘室责任人编码 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室编码（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室编码（如果多个科室用逗号分割）")
    private String circulationDeptCode;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转科室名称（如果多个科室用逗号分割）")
    @ApiModelProperty(value = "流转科室名称（如果多个科室用逗号分割）")
    private String circulationDeptName;

    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转说明")
    @ApiModelProperty(value = "流转说明")
    private String circulationExplain;
    /**
     * æµè½¬ç§‘室责任人名称 (如果多个科室用逗号分割)
     */
    @Excel(name = "流转时间")
    @ApiModelProperty(value = "流转时间")
    private Date circulationTime;

    /**
     * æµè½¬çŠ¶æ€ï¼š0不流转（默认） 1流转
     */
    @Excel(name = "流转状态：0不流转（默认） 1流转")
    @ApiModelProperty(value = "流转状态：0不流转（默认） 1流转")
    private Integer circulationStatus;

    @Excel(name = "流转人姓名")
    @ApiModelProperty(value = "流转人姓名")
    private String circulationPersonName;

    @Excel(name = "流转人编码")
    @ApiModelProperty(value = "流转人编码")
    private String circulationPersonCode;
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.smartor.domain.VO;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.util.List;

/**
 * é—®é¢˜ç»“æžœDTO
 *
 * @author ruoyi
 * @date 2024-02-02
 */

@ApiModel(value = "QuestionResultVO", description = "问题结果VO")
@Data
public class QuestionResultVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * ç§‘室与病区的查询是or还是and:   1:and(默认)(离院病区与离院科室组合)     2:or(离院病区与离院科室组合)    3:and(离院病区与随访科室组合)   4:or(离院病区与随访科室组合)
     */
    @ApiModelProperty(value = "科室与病区的查询是or还是and:   1:and(默认)(离院病区与离院科室组合)     2:or(离院病区与离院科室组合)    3:and(离院病区与随访科室组合)   4:or(离院病区与随访科室组合)")
    private String deptOrDistrict = "1";

    /**
     *
     */
    @ApiModelProperty(value = "主键id")
    private Long subId;

    /**
     * å‡ºé™¢ç—…区编号
     */
    @ApiModelProperty(value = "出院病区集合(必填)")
    private List<String> leavehospitaldistrictcodes;


    /**
     * ä¸»é”®id集合
     */
    @ApiModelProperty(value = "主键id集合")
    private List<Long> subIdList;


    /**
     * å¼€å§‹å‡ºé™¢æ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始出院日期")
    private Date startOutHospTime;

    /**
     * ç»“束出院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束出院日期")
    private Date endOutHospTime;


    /**
     * é—®é¢˜å†…容
     */
    @ApiModelProperty(value = "问题内容")
    private String questionContent;

    /**
     * åˆ†æ•°æŸ¥è¯¢å¼€å§‹
     */
    @ApiModelProperty(value = "分数查询开始")
    private Double startScore;

    /**
     * åˆ†æ•°æŸ¥è¯¢ç»“束
     */
    @ApiModelProperty(value = "分数查询结束")
    private Double endScore;

    /**
     * æœåŠ¡ç±»åž‹(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)
     */
    @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访  11，影像专科随访  12、心电专科随访， 13专科随访)")
    @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访  11，影像专科随访  12、心电专科随访， 13专科随访)")
    private String serviceType;

    @ApiModelProperty(value = "问题类型（1.单选 2多选 3问答 4填空  5其它）")
    private String valueType;
}

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

@@ -292,6 +292,20 @@
    @ApiModelProperty(value = "完成时间")
    private Date finishtime;

    /**
     * å®Œæˆæ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间(开始查询)")
    private Date finishtimeStart;

    /**
     * å®Œæˆæ—¶é—´(结束查询)
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间(结束查询)")
    private Date finishtimeEnd;


    /**
     * å°±è¯Šè®°å½•ç¼–号

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

@@ -307,6 +307,19 @@
    @ApiModelProperty(value = "完成时间")
    private Date finishtime;

    /**
     * å®Œæˆæ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间(开始查询)")
    private Date finishtimeStart;

    /**
     * å®Œæˆæ—¶é—´(结束查询)
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间(结束查询)")
    private Date finishtimeEnd;

    /**
     * å°±è¯Šè®°å½•ç¼–号

 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java

@@ -78,14 +78,12 @@
     * @param scheduleId è®¡åˆ’主键
     * @param loopCount  è½®æ¬¡ï¼ˆ0=首轮）
     */
    public int countActiveByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId,
                                              @Param("loopCount") Long loopCount);
    public int countActiveByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId, @Param("loopCount") Long loopCount);

    /**
     * ä»»åŠ¡ç»„（appltype=5）：拉取某一轮次的全部 subtask（用于克隆到下一轮）。
     */
    public List<ServiceSubtask> selectByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId,
                                                          @Param("loopCount") Long loopCount);
    public List<ServiceSubtask> selectByScheduleIdAndLoop(@Param("scheduleId") Long scheduleId, @Param("loopCount") Long loopCount);

    /**
     * éšè®¿åŠæ—¶çŽ‡ï¼šåº”随访时间<实际随访时间
@@ -259,21 +257,21 @@
    /**
     * ç»Ÿè®¡é—®é¢˜çš„选项的百分比
     *
     * @param taskIds           ä»»åŠ¡ ID åˆ—表 (用于服务类型 2)
     * @param startOutHospTime  
     * @param endOutHospTime    
     * @param taskIds          ä»»åŠ¡ ID åˆ—表 (用于服务类型 2)
     * @param startOutHospTime
     * @param endOutHospTime
     * @return
     */
    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime);
    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType);

    /**
     * æ ¹æ®å­ä»»åŠ¡ ID ç»Ÿè®¡é—®é¢˜çš„选项的百分比（用于满意度统计 serviceType=6）
     *
     * @param subtaskIds        å­ä»»åŠ¡ ID åˆ—表 (只能单个 taskid ä¸‹çš„所有子任务 id)
     * @param startOutHospTime  
     * @param endOutHospTime    
     * @param subtaskIds       å­ä»»åŠ¡ ID åˆ—表 (只能单个 taskid ä¸‹çš„所有子任务 id)
     * @param startOutHospTime
     * @param endOutHospTime
     * @return
     */
    List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(@Param("subtaskIds") List<Long> subtaskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime);
    List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(@Param("subtaskIds") List<Long> subtaskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime, @Param("scoreStart") Double scoreStart, @Param("scoreEnd") Double scoreEnd, @Param("questiontext") String questiontext, @Param("valueType") String valueType);

}

 smartor/src/main/java/com/smartor/mapper/SvyLibTemplateScriptMapper.java

@@ -1,6 +1,5 @@
package com.smartor.mapper;

import com.smartor.domain.IvrLibaTemplateScript;
import com.smartor.domain.SvyLibTemplateScript;
import com.smartor.domain.SvyLibTemplateScriptVO;
import org.apache.ibatis.annotations.Mapper;

 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java

@@ -2,8 +2,10 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.*;
import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.QuestionResultVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.TransferDeptVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -53,8 +55,11 @@
     */
    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);

    public List<ServiceSubtask> getServiceSubtasks(ServiceSubtaskEntity serviceSubtaskEntity);

    /**
     * è½¬ç§»ç§‘室病区
     *
     * @param transferDeptVO
     * @return
     */
@@ -134,6 +139,16 @@
    public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallReqYQVO);

    /**
     * é—®é¢˜ç»“果占比
     *
     * @param QuestionResultVO
     * @param serviceSubtaskRes
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> getDetailRatio(QuestionResultVO questionResultVO, List<ServiceSubtaskRes> serviceSubtaskRes);


    /**
     * é›¨ç»®ä»»åŠ¡æ‹‰å–
     *
     * @return
@@ -211,15 +226,15 @@
     * @param taskIds
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime);
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);

    /**
     * æ ¹æ®å­ä»»åŠ¡ ID ç»Ÿè®¡é—®é¢˜çš„选项的百分比（用于满意度统计 serviceType=6）
     *
     * @param subtaskIds        å­ä»»åŠ¡ ID åˆ—表
     * @param subtaskIds å­ä»»åŠ¡ ID åˆ—表
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime);
    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);

    public String scanGenerateSubtask(ServiceTask serviceTaskVo);


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

@@ -199,8 +199,11 @@
                        int start = patArchiveImport.getIdcardno().length() - 6;
                        String lastSixDigits = patArchiveImport.getIdcardno().substring(start, start + 6);
                        sysUser.setUserName(lastSixDigits);
                        //密码：xh@123456
                        sysUser.setPassword("$2a$10$zja67LEWTESHutljd8bqEeRy.VgWb./8iJPpFR6VjTUa7ZYNfRRrO");
                        //原密码：xh@123456
                        //sysUser.setPassword("$2a$10$zja67LEWTESHutljd8bqEeRy.VgWb./8iJPpFR6VjTUa7ZYNfRRrO");
                        //新密码：123456
                        sysUser.setPassword("$2a$10$1CRhRCwPEqhEI4bkXYFOLu.ga0PLfDhI3pnvVQ1GX0sbHY3N/UJky");

                        sysUser.setPhonenumber(patArchiveImport.getTelcode());
                        sysUser.setUserType("患者");
                        sysUser.setDeptId(395L);

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

@@ -377,16 +377,6 @@
            log.error("将该key和value从redis中,serviceSubtask的值为--------：{}", serviceSubtask);
            if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
            //修改住院满意度状态（避免重复查询）
            if (serviceSubtask.getServiceType() != null && "6".equals(serviceSubtask.getServiceType())) {
                Long inhospid = serviceSubtask.getInhospid();
                if (inhospid != null) {
                    PatMedInhosp patMedInhosp = new PatMedInhosp();
                    patMedInhosp.setInhospMydFlag("1");
                    patMedInhosp.setInhospid(inhospid);
                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
                }
            }

            //将当前发送状态改成 9 å®Œæˆï¼ˆç¼“å­˜ preachform æŸ¥è¯¢ï¼‰
            String currentPreachform = serviceSubtask.getCurrentPreachform();
@@ -1123,6 +1113,8 @@
            subtaskDetailTrace.setDutyDeptPersonName(svyTaskTemplateScriptVO.getDutyDeptPersonName());
            subtaskDetailTrace.setReportDeptPersonCode(svyTaskTemplateScriptVO.getReportDeptPersonCode());
            subtaskDetailTrace.setReportDeptPersonName(svyTaskTemplateScriptVO.getReportDeptPersonName());
            subtaskDetailTrace.setCirculationDeptPersonCode(svyTaskTemplateScriptVO.getCirculationDeptPersonCode());
            subtaskDetailTrace.setCirculationDeptPersonName(svyTaskTemplateScriptVO.getCirculationDeptPersonName());

            Long existTraceId = existingTraceIdMap.get(subtaskDetailTrace.getScriptid());
            if (existTraceId != null) {

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

@@ -22,9 +22,11 @@
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.ScheduleSubtaskBuilder;
import com.smartor.config.PhoneUtils;
import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.domain.*;
import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.QuestionResultVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.TransferDeptVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -36,6 +38,7 @@
import org.apache.commons.lang3.ObjectUtils;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.junit.Test;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
@@ -414,26 +417,7 @@

    @Override
    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity) {
        if (serviceSubtaskEntity.getSendstateView() != null) {
            //            1：待随访（1 è¢«é¢†å–、2 å¾…发送、3 å·²å‘送、5 å‘送失败、7、超时）；2：已完成（ 6 å·²å®Œæˆï¼‰ã€3：无需随访（4 ä¸æ‰§è¡Œï¼‰
            if (serviceSubtaskEntity.getSendstateView() == 1)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
            if (serviceSubtaskEntity.getSendstateView() == 2)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
            if (serviceSubtaskEntity.getSendstateView() == 3)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
        }
        //患者获取随访任务-需要查询同个患者（身份证）所有的任务 æ™¯å®
        if (StringUtils.isNotEmpty(serviceSubtaskEntity.getOrgid()) && serviceSubtaskEntity.getOrgid().equals("47255004333112711A1001")) {
            if (ObjectUtils.isNotEmpty(serviceSubtaskEntity.getPatid())) {
                PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtaskEntity.getPatid());
                if (ObjectUtils.isNotEmpty(patArchive) && StringUtils.isNotEmpty(patArchive.getIdcardno())) {
                    serviceSubtaskEntity.setPatid(null);
                    serviceSubtaskEntity.setSfzh(patArchive.getIdcardno());
                }
            }
        }
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);
        List<ServiceSubtask> selectServiceSubtaskList = getServiceSubtasks(serviceSubtaskEntity);

        List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
@@ -469,6 +453,30 @@
            serviceSubtaskResList.add(serviceSubtaskRes);
        }
        return serviceSubtaskResList;
    }

    public List<ServiceSubtask> getServiceSubtasks(ServiceSubtaskEntity serviceSubtaskEntity) {
        if (serviceSubtaskEntity.getSendstateView() != null) {
            //            1：待随访（1 è¢«é¢†å–、2 å¾…发送、3 å·²å‘送、5 å‘送失败、7、超时）；2：已完成（ 6 å·²å®Œæˆï¼‰ã€3：无需随访（4 ä¸æ‰§è¡Œï¼‰
            if (serviceSubtaskEntity.getSendstateView() == 1)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
            if (serviceSubtaskEntity.getSendstateView() == 2)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
            if (serviceSubtaskEntity.getSendstateView() == 3)
                serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
        }
        //患者获取随访任务-需要查询同个患者（身份证）所有的任务 æ™¯å®
        if (StringUtils.isNotEmpty(serviceSubtaskEntity.getOrgid()) && serviceSubtaskEntity.getOrgid().equals("47255004333112711A1001")) {
            if (ObjectUtils.isNotEmpty(serviceSubtaskEntity.getPatid())) {
                PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtaskEntity.getPatid());
                if (ObjectUtils.isNotEmpty(patArchive) && StringUtils.isNotEmpty(patArchive.getIdcardno())) {
                    serviceSubtaskEntity.setPatid(null);
                    serviceSubtaskEntity.setSfzh(patArchive.getIdcardno());
                }
            }
        }
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);
        return selectServiceSubtaskList;
    }

    @Override
@@ -636,14 +644,19 @@
     */
    @Override
    public Map<String, Object> insertServiceSubtask(ServiceSubtask serviceSubtask) {
        List<ServiceSubtask> serviceSubtasks = null;
        //先查询一下该患者是否已经创建根据serviceType,sendstate,inhospid,patid,orgid
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setServiceType(serviceSubtask.getServiceType());
        serviceSubtaskVO.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
        serviceSubtaskVO.setPatid(serviceSubtask.getPatid());
        serviceSubtaskVO.setOrgid(serviceSubtask.getOrgid());
        serviceSubtaskVO.setCampusid(serviceSubtask.getCampusid());
        List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        //这样判断主要是为了想让新华医院的外部导入患者创建任务，也能用这个接口
        if (StringUtils.isEmpty(serviceSubtask.getPatfrom()) || !serviceSubtask.getPatfrom().equals("2")) {
            ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
            serviceSubtaskVO.setServiceType(serviceSubtask.getServiceType());
            serviceSubtaskVO.setInhospid(serviceSubtask.getInhospid());
            serviceSubtaskVO.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
            serviceSubtaskVO.setPatid(serviceSubtask.getPatid());
            serviceSubtaskVO.setOrgid(serviceSubtask.getOrgid());
            serviceSubtaskVO.setCampusid(serviceSubtask.getCampusid());
            serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        }
        RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
        String format = null;
        if (CollectionUtils.isNotEmpty(serviceSubtasks)) {
@@ -657,8 +670,27 @@
            serviceSubtask = serviceSubtask1;
        } else {
            //如果不存在，则新增
            ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
            if (ObjectUtils.isNotEmpty(serviceTask)) {
                serviceSubtask.setDeptcode(serviceTask.getDeptcode());
                serviceSubtask.setTaskDesc(serviceTask.getTaskDesc());
                serviceSubtask.setTaskName(serviceTask.getTaskName());
                serviceSubtask.setDeptname(serviceTask.getDeptname());
                serviceSubtask.setTemplatename(serviceTask.getTemplatename());
            }

            serviceSubtask.setCreateTime(DateUtils.getNowDate());
            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
            //修改住院满意度状态（避免重复查询）
            if (serviceSubtask.getServiceType() != null && "6".equals(serviceSubtask.getServiceType())) {
                Long inhospid = serviceSubtask.getInhospid();
                if (inhospid != null) {
                    PatMedInhosp patMedInhosp = new PatMedInhosp();
                    patMedInhosp.setInhospMydFlag("1");
                    patMedInhosp.setInhospid(inhospid);
                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
                }
            }
            format = getOutPath(serviceSubtask, rsaPublicKeyExample);
        }

@@ -4980,23 +5012,107 @@
    }

    @Override
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime) {
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd,String valueType) {
        //先清理一下重复数据
        List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
        if (!CollectionUtils.isEmpty(repeatIds)) {
            serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
        }
        return serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime);
        List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, scoreStart, scoreEnd, scriptContent, valueType);

        // å¤„理 targetvalue：按 & åˆ†å‰²æˆå¤šæ¡è®°å½•
        List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
        for (ServiceSubtaskDetailRatioExport export : serviceSubtaskDetailRatioExports) {
            if (StringUtils.isNotEmpty(export.getTargetvalue()) && export.getTargetvalue().contains("&")) {
                String[] values = export.getTargetvalue().split("&");
                // å¦‚果有多条目标值，拆分成多行
                for (String value : values) {
                    //先去 result ä¸­æŸ¥ä¸€ä¸‹ï¼Œæœ‰æ²¡æœ‰è¿™ä¸ª questiontext å’Œå¯¹åº”çš„ targetvalue
                    ServiceSubtaskDetailRatioExport existingExport = result.stream()
                            .filter(e -> e.getQuestiontext().equals(export.getQuestiontext())
                                    && value.trim().equals(e.getTargetvalue()))
                            .findFirst()
                            .orElse(null);
                    if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
                        //如果存在，则将 result é‡Œçš„这个问题所对应的 Targetvalue=value è¿™æ¡æ•°æ®æ›´æ–°æˆå½“前这条数据
                        if(value.equals(export.getOptionresult())) {
                            existingExport.setRatio(export.getRatio());
                            existingExport.setScore(export.getScore());
                            existingExport.setCount(export.getCount());
                            existingExport.setOptionresult(export.getOptionresult());
                        }
                    } else if (existingExport != null && !existingExport.getRatio().equals("0")) {
                        continue;
                    } else {
                        ServiceSubtaskDetailRatioExport newExport = DtoConversionUtils.sourceToTarget(export, ServiceSubtaskDetailRatioExport.class);
                        newExport.setTargetvalue(value.trim()); // targetvalue æ˜¾ç¤ºå•ä¸ªé€‰é¡¹
                        if (!value.equals(export.getOptionresult())) {
                            newExport.setOptionresult(null);
                            newExport.setCount("0");
                            newExport.setRatio("0");
                        }
                        result.add(newExport);
                    }
                }
            } else {
                // targetvalue ä¸åŒ…含 &，直接添加到结果
                result.add(export);
            }
        }

        return result;
    }

    @Override
    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime) {
    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd,String valueType) {
        //先清理一下重复数据
        List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
        if (!CollectionUtils.isEmpty(repeatIds)) {
            serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
        }
        return serviceSubtaskMapper.statQuestionOptionBySubtaskIds(subtaskIds, startOutHospTime, endOutHospTime);

        List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOptionBySubtaskIds(subtaskIds, startOutHospTime, endOutHospTime, scoreStart, scoreEnd, scriptContent,valueType);
        // å¤„理 targetvalue：按 & åˆ†å‰²æˆå¤šæ¡è®°å½•
        List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
        for (ServiceSubtaskDetailRatioExport export : serviceSubtaskDetailRatioExports) {
            if (StringUtils.isNotEmpty(export.getTargetvalue()) && export.getTargetvalue().contains("&")) {
                String[] values = export.getTargetvalue().split("&");
                // å¦‚果有多条目标值，拆分成多行
                for (String value : values) {
                    //先去 result ä¸­æŸ¥ä¸€ä¸‹ï¼Œæœ‰æ²¡æœ‰è¿™ä¸ª questiontext å’Œå¯¹åº”çš„ targetvalue
                    ServiceSubtaskDetailRatioExport existingExport = result.stream()
                            .filter(e -> e.getQuestiontext().equals(export.getQuestiontext())
                                    && value.trim().equals(e.getTargetvalue()))
                            .findFirst()
                            .orElse(null);
                    if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
                        //如果存在，则将 result é‡Œçš„这个问题所对应的 Targetvalue=value è¿™æ¡æ•°æ®æ›´æ–°æˆå½“前这条数据
                        if(value.equals(export.getOptionresult())) {
                            existingExport.setRatio(export.getRatio());
                            existingExport.setScore(export.getScore());
                            existingExport.setCount(export.getCount());
                            existingExport.setOptionresult(export.getOptionresult());
                        }
                    } else if (existingExport != null && !existingExport.getRatio().equals("0")) {
                        continue;
                    } else {
                        ServiceSubtaskDetailRatioExport newExport = DtoConversionUtils.sourceToTarget(export, ServiceSubtaskDetailRatioExport.class);
                        newExport.setTargetvalue(value.trim()); // targetvalue æ˜¾ç¤ºå•ä¸ªé€‰é¡¹
                        if (!value.equals(export.getOptionresult())) {
                            newExport.setOptionresult(null);
                            newExport.setCount("0");
                            newExport.setRatio("0");
                        }
                        result.add(newExport);
                    }
                }
            } else {
                // targetvalue ä¸åŒ…含 &，直接添加到结果
                result.add(export);
            }
        }

        return result;
    }

    /**
@@ -5684,6 +5800,28 @@
        return back;
    }


    /**
     * é—®é¢˜ç»“果占比
     *
     * @param serviceSubtaskEntity
     * @param serviceSubtaskRes
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> getDetailRatio(QuestionResultVO questionResultVO, List<ServiceSubtaskRes> serviceSubtaskRes) {
        List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
        if (StringUtils.isNotEmpty(questionResultVO.getServiceType()) && questionResultVO.getServiceType().equals("2")) {
            //获取serviceSubtaskList中的所有taskid
            List<Long> taskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
            serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, questionResultVO.getStartOutHospTime(), questionResultVO.getEndOutHospTime(), questionResultVO.getQuestionContent(), questionResultVO.getStartScore(), questionResultVO.getEndScore(),questionResultVO.getValueType());
        } else if (StringUtils.isNotEmpty(questionResultVO.getServiceType()) && questionResultVO.getServiceType().equals("6")) {
            //满意度统计 ï¼ˆé€šè¿‡ subtask çš„ id åŽ»ç»Ÿè®¡ï¼‰
            List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
            serviceSubtaskDetailRatioExports = statQuestionOptionBySubtaskIds(subtaskIds, questionResultVO.getStartOutHospTime(), questionResultVO.getEndOutHospTime(), questionResultVO.getQuestionContent(), questionResultVO.getStartScore(), questionResultVO.getEndScore(),questionResultVO.getValueType());
        }
        return serviceSubtaskDetailRatioExports;
    }

    //获取任务组信息
    private void findServiceTaskScheduleVO(ServiceTaskVO serviceTaskVO) {
        if (StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")) {

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

@@ -59,6 +59,8 @@
        <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
        <result property="reportDeptPersonCode" column="report_dept_person_name"/>
        <result property="reportDeptPersonName" column="report_dept_person_code"/>
        <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
        <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
    </resultMap>

    <sql id="selectIvrLibaTemplateScriptVo">
@@ -69,6 +71,8 @@
               duty_dept_person_code,
               report_dept_person_name,
               report_dept_person_code,
               circulation_dept_person_code,
               circulation_dept_person_name,
               dimension,
               sort,
               script_assortname,
@@ -193,6 +197,12 @@
        <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">and report_dept_person_code like concat('%', #{reportDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%', #{circulationDeptPersonName},
            '%')
        </if>
    </select>


@@ -283,6 +293,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name,</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code,</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="scriptno != null">#{scriptno},</if>
@@ -337,6 +349,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
        </trim>
    </insert>

@@ -374,6 +388,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="scriptTopic != null">script_topic = #{scriptTopic},</if>
            <if test="nextScriptno != null">next_scriptno = #{nextScriptno},</if>

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

@@ -59,6 +59,8 @@
        <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
        <result property="reportDeptPersonCode" column="report_dept_person_name"/>
        <result property="reportDeptPersonName" column="report_dept_person_code"/>
        <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
        <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
    </resultMap>

    <sql id="selectIvrTaskTemplateScriptVo">
@@ -75,6 +77,8 @@
               duty_dept_person_code,
               report_dept_person_name,
               report_dept_person_code,
               circulation_dept_person_code,
               circulation_dept_person_name,
               sort,
               ivrtext,
               script_type,
@@ -178,6 +182,14 @@
            #{reportDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%',
            #{circulationDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%',
            #{circulationDeptPersonName},
            '%')
        </if>
    </select>

    <select id="selectIvrTaskTemplateScriptByID" parameterType="Long" resultMap="IvrTaskTemplateScriptResult">
@@ -241,6 +253,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name,</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code,</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskid != null">#{taskid},</if>
@@ -295,6 +309,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
        </trim>
    </insert>

@@ -355,6 +371,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -370,7 +370,7 @@
            order by b.endtime desc
        </if>
        <if test="cry != null and cry==0">
            order by b.starttime desc
            order by b.starttime desc , b.bed_no asc
        </if>
    </select>


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

@@ -59,14 +59,33 @@
        <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
        <result property="reportDeptPersonCode" column="report_dept_person_name"/>
        <result property="reportDeptPersonName" column="report_dept_person_code"/>
        <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
        <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
        <result property="circulationDeptCode" column="circulation_dept_code"/>
        <result property="circulationDeptName" column="circulation_dept_name"/>
        <result property="circulationExplain" column="circulation_explain"/>
        <result property="circulationTime" column="circulation_time"/>
        <result property="circulationStatus" column="circulation_status"/>
        <result property="circulationPersonName" column="circulation_person_name"/>
        <result property="circulationPersonCode" column="circulation_person_code"/>

    </resultMap>

    <sql id="selectServiceSubtaskDetailTtraceVo">
        select id,
               circulation_status,
               circulation_person_name,
               circulation_person_code,
               duty_dept_person_name,
               duty_dept_person_code,
               report_dept_person_name,
               report_dept_person_code,
               circulation_dept_person_code,
               circulation_dept_person_name,
               circulation_dept_code,
               circulation_dept_name,
               circulation_explain,
               circulation_time,
               detail_id,
               is_myd_exception,
               dimension,
@@ -277,6 +296,33 @@
        <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">
            and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
        </if>
        <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">
            and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode}, '%')
        </if>
        <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">
            and circulation_dept_person_name like concat('%', #{circulationDeptPersonName}, '%')
        </if>
        <if test="circulationDeptCode != null  and circulationDeptCode != ''">
            and circulation_dept_code like concat('%', #{circulationDeptCode}, '%')
        </if>
        <if test="circulationDeptName != null  and circulationDeptName != ''">
            and circulation_dept_name like concat('%', #{circulationDeptName}, '%')
        </if>
        <if test="circulationExplain != null  and circulationExplain != ''">
            and circulation_explain like concat('%', #{circulationExplain}, '%')
        </if>
        <if test="circulationTime != null ">
            and circulation_time = #{circulationTime}
        </if>
        <if test="circulationStatus != null ">
            and circulation_status = #{circulationStatus}
        </if>
        <if test="circulationPersonName != null  and circulationPersonName != ''">
            and circulation_person_name like concat('%', #{circulationPersonName}, '%')
        </if>
        <if test="circulationPersonCode != null  and circulationPersonCode != ''">
            and circulation_person_code =#{circulationPersonCode}
        </if>
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

@@ -325,6 +371,33 @@
        </if>
        <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">
            and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
        </if>
        <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">
            and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode}, '%')
        </if>
        <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">
            and circulation_dept_person_name like concat('%', #{circulationDeptPersonName}, '%')
        </if>
        <if test="circulationDeptCode != null  and circulationDeptCode != ''">
            and circulation_dept_code like concat('%', #{circulationDeptCode}, '%')
        </if>
        <if test="circulationDeptName != null  and circulationDeptName != ''">
            and circulation_dept_name like concat('%', #{circulationDeptName}, '%')
        </if>
        <if test="circulationExplain != null  and circulationExplain != ''">
            and circulation_explain like concat('%', #{circulationExplain}, '%')
        </if>
        <if test="circulationTime != null ">
            and circulation_time = #{circulationTime}
        </if>
        <if test="circulationStatus != null ">
            and circulation_status = #{circulationStatus}
        </if>
        <if test="circulationPersonName != null  and circulationPersonName != ''">
            and circulation_person_name like concat('%', #{circulationPersonName}, '%')
        </if>
        <if test="circulationPersonCode != null  and circulationPersonCode != ''">
            and circulation_person_code =#{circulationPersonCode}
        </if>
    </select>

@@ -447,6 +520,31 @@
            </if>
            <if test="reportDeptPersonCode != null">report_dept_person_code,
            </if>
            <if test="circulationDeptPersonCode != null">circulation_dept_person_code,
            </if>
            <if test="circulationDeptPersonName != null">circulation_dept_person_name,
            </if>
            <if test="circulationDeptCode != null ">
                circulation_dept_code,
            </if>
            <if test="circulationDeptName != null">
                circulation_dept_name,
            </if>
            <if test="circulationExplain != null ">
                circulation_explain,
            </if>
            <if test="circulationTime != null ">
                circulation_time,
            </if>
            <if test="circulationStatus != null ">
                circulation_status,
            </if>
            <if test="circulationPersonName != null  and circulationPersonName != ''">
                circulation_person_name,
            </if>
            <if test="circulationPersonCode != null  and circulationPersonCode != ''">
                circulation_person_code,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="detailId != null">#{detailId},
@@ -556,6 +654,31 @@
            <if test="reportDeptPersonName != null">#{reportDeptPersonName},
            </if>
            <if test="reportDeptPersonCode != null">#{reportDeptPersonCode},
            </if>
            <if test="circulationDeptPersonCode != null">#{circulationDeptPersonCode},
            </if>
            <if test="circulationDeptPersonName != null">#{circulationDeptPersonName},
            </if>
            <if test="circulationDeptCode != null">
                #{circulationDeptCode},
            </if>
            <if test="circulationDeptName != null">
                #{circulationDeptName},
            </if>
            <if test="circulationExplain != null">
                #{circulationExplain},
            </if>
            <if test="circulationTime != null ">
                #{circulationTime},
            </if>
            <if test="circulationStatus != null ">
               #{circulationStatus},
            </if>
            <if test="circulationPersonName != null  and circulationPersonName != ''">
               #{circulationPersonName},
            </if>
            <if test="circulationPersonCode != null  and circulationPersonCode != ''">
              #{circulationPersonCode},
            </if>
        </trim>
    </insert>
@@ -725,6 +848,33 @@
            <if test="reportDeptPersonCode != null">report_dept_person_code =
                #{reportDeptPersonCode},
            </if>
            <if test="circulationDeptPersonCode != null">circulation_dept_person_code =
                #{circulationDeptPersonCode},
            </if>
            <if test="circulationDeptPersonName != null">circulation_dept_person_name =
                #{circulationDeptPersonName},
            </if>
            <if test="circulationDeptCode != null">circulation_dept_code =
                #{circulationDeptCode},
            </if>
            <if test="circulationDeptName != null">circulation_dept_name =
                #{circulationDeptName},
            </if>
            <if test="circulationExplain != null">circulation_explain =
                #{circulationExplain},
            </if>
            <if test="circulationTime != null">circulation_time =
                #{circulationTime},
            </if>
            <if test="circulationStatus != null ">
                circulation_status = #{circulationStatus},
            </if>
            <if test="circulationPersonName != null  and circulationPersonName != ''">
                circulation_person_name =#{circulationPersonName},
            </if>
            <if test="circulationPersonCode != null  and circulationPersonCode != ''">
                circulation_person_code =#{circulationPersonCode},
            </if>
        </trim>
        where id = #{id}
    </update>

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

@@ -380,6 +380,12 @@
        <if test="endSendDateTime != null">
            AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{endSendDateTime},'%y%m%d')
        </if>
        <if test="finishtimeStart != null">
            AND date_format(finishtime,'%y%m%d') &gt;= date_format(#{finishtimeStart},'%y%m%d')
        </if>
        <if test="finishtimeEnd != null">
            AND date_format(finishtime,'%y%m%d') &lt;= date_format(#{finishtimeEnd},'%y%m%d')
        </if>
        <if test="longSendTime != null">
            AND date_format(long_send_time,'%y%m%d') &lt;= date_format(#{longSendTime},'%y%m%d')
        </if>
@@ -3050,6 +3056,9 @@
        t.taskid AS taskid,
        t.task_name AS taskName,
        d.asrtext AS optionresult,
        d.score AS score,
        d.targetvalue AS targetvalue,
        d.value_type AS valueType,
        COUNT(*) AS count,
        CONCAT(ROUND(COUNT(*) * 100.0 / t2.total_count, 2), '%') AS ratio
        FROM
@@ -3065,32 +3074,53 @@
        service_task t
        INNER JOIN service_subtask s ON s.taskid = t.taskid
        INNER JOIN service_subtask_detail d ON d.sub_id = s.id
        WHERE t.taskid IN
        <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
            #{taskId}
        </foreach>
        WHERE 1=1
        <if test="taskIds != null and taskIds.size() > 0">
            AND t.taskid IN
            <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
                #{taskId}
            </foreach>
        </if>
        <if test="valueType != null">AND d.value_type = #{valueType}</if>
        <if test="scoreStart != null">AND d.score &gt;= #{scoreStart}</if>
        <if test="scoreEnd != null">AND d.score &lt;= #{scoreEnd}</if>
        <if test="questiontext != null  and questiontext != ''">and d.questiontext like concat('%', #{questiontext},
            '%')
        </if>
        and s.sendstate=6
        and d.del_flag=0
        GROUP BY
        t.taskid,
        d.questiontext
        ) t2 ON t2.taskid = t.taskid AND t2.questiontext = d.questiontext
        WHERE t.taskid IN
        <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
            #{taskId}
        </foreach>
        WHERE 1=1
        <if test="taskIds != null and taskIds.size() > 0">
            AND t.taskid IN
            <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
                #{taskId}
            </foreach>
        </if>
        <if test="valueType != null">AND d.value_type = #{valueType}</if>
        <if test="scoreStart != null">AND d.score &gt;= #{scoreStart}</if>
        <if test="scoreEnd != null">AND d.score &lt;= #{scoreEnd}</if>
        <if test="questiontext != null  and questiontext != ''">and d.questiontext like concat('%', #{questiontext},
            '%')
        </if>
        AND s.sendstate = 6
        and d.del_flag=0
      <if test="startOutHospTime != null">
        AND date_format(s.endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
    </if>
        <if test="startOutHospTime != null">
            AND date_format(s.endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
        </if>
        <if test="endOutHospTime != null">
            AND date_format(s.endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
        </if>
        GROUP BY
        t.taskid,
        d.questiontext,
        d.asrtext
        d.score,
        d.targetvalue,
        d.asrtext,
        d.value_type
        ORDER BY
        d.questiontext,
        t.taskid
@@ -3103,6 +3133,9 @@
        t.taskid AS taskid,
        t.task_name AS taskName,
        d.asrtext AS optionresult,
        d.score AS score,
        d.targetvalue AS targetvalue,
        d.value_type AS valueType,
        COUNT(*) AS count,
        CONCAT(ROUND(COUNT(*) * 100.0 / t2.total_count, 2), '%') AS ratio
        FROM
@@ -3117,20 +3150,34 @@
            service_task t
            INNER JOIN service_subtask s ON s.taskid = t.taskid
            INNER JOIN service_subtask_detail d ON d.sub_id = s.id
            WHERE s.id IN
            WHERE 1=1
            <if test="subtaskIds != null and subtaskIds.size() > 0">
            AND s.id IN
            <foreach collection="subtaskIds" item="subtaskId" open="(" separator="," close=")">
                #{subtaskId}
            </foreach>
            </if>
        <if test="valueType != null">AND d.value_type &gt;= #{valueType}</if>
        <if test="scoreStart != null">AND d.score = #{scoreStart}</if>
        <if test="scoreEnd != null">AND d.score &lt;= #{scoreEnd}</if>
        <if test="questiontext != null  and questiontext != ''">and d.questiontext like concat('%', #{questiontext}, '%')</if>
            AND s.sendstate = 6
            AND d.del_flag=0
            GROUP BY d.questiontext  -- â† å…³é”®ä¿®æ”¹ï¼šæŒ‰é¢˜ç›®åˆ†ç»„统计每个题目的总数
        ) t2 ON t2.questiontext = d.questiontext  -- â† å…³è”到当前题目
        WHERE s.id IN
            GROUP BY d.questiontext
        ) t2 ON t2.questiontext = d.questiontext
        WHERE 1=1
        <if test="subtaskIds != null and subtaskIds.size() > 0">
        AND s.id IN
        <foreach collection="subtaskIds" item="subtaskId" open="(" separator="," close=")">
            #{subtaskId}
        </foreach>
        </if>
        AND s.sendstate = 6
        AND d.del_flag=0
        <if test="valueType != null">AND d.value_type &gt;= #{valueType}</if>
        <if test="scoreStart != null">AND d.score &gt;= #{scoreStart}</if>
        <if test="scoreEnd != null">AND d.score &lt;= #{scoreEnd}</if>
        <if test="questiontext != null  and questiontext != ''">and d.questiontext like concat('%', #{questiontext}, '%')</if>
      <if test="startOutHospTime != null">
        AND date_format(s.endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
    </if>
@@ -3140,6 +3187,8 @@
        GROUP BY
        t.taskid,
        d.questiontext,
        d.score,
        d.targetvalue,
        d.asrtext
        ORDER BY
        d.questiontext,

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

@@ -56,6 +56,8 @@
        <result property="reportDeptPersonName" column="report_dept_person_code"/>
        <result property="isMydException" column="is_myd_exception"/>
        <result property="dimension" column="dimension"/>
        <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
        <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>

    </resultMap>

@@ -108,6 +110,7 @@
               script_picture,
               script_topic,
               isavailable, language, otherdata, value_type, reply, scoretype
                , circulation_dept_person_code, circulation_dept_person_name
        from svy_lib_template_script
    </sql>

@@ -192,6 +195,14 @@
            #{reportDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%',
            #{circulationDeptPersonCode},
            '%')
        </if>
        <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%',
            #{circulationDeptPersonName},
            '%')
        </if>
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

@@ -218,6 +229,14 @@
            </if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">and report_dept_person_code like concat('%',
                #{reportDeptPersonCode},
                '%')
            </if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%',
                #{circulationDeptPersonCode},
                '%')
            </if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%',
                #{circulationDeptPersonName},
                '%')
            </if>
            <if test="dimensionList == null ">and dimension IS NOT NULL </if>
@@ -284,6 +303,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name,</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code,</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="nextScriptno != null">#{nextScriptno},</if>
@@ -337,6 +358,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
        </trim>
    </insert>

@@ -396,6 +419,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -55,6 +55,8 @@
        <result property="reportDeptPersonName" column="report_dept_person_code"/>
        <result property="isMydException" column="is_myd_exception"/>
        <result property="dimension" column="dimension"/>
        <result property="circulationDeptPersonCode" column="circulation_dept_person_code"/>
        <result property="circulationDeptPersonName" column="circulation_dept_person_name"/>
    </resultMap>

    <sql id="selectSvyTaskTemplateScriptVo">
@@ -82,6 +84,7 @@
               scriptid,
               script_topic, language, categoryName, script_content, is_must, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, value_type, targetoptions, script_type, targetid, targetvalue, next_scriptno, script_result, otherdata, picture_path
                , duty_dept_person_name, duty_dept_person_code, report_dept_person_name, report_dept_person_code
                 , circulation_dept_person_code, circulation_dept_person_name
        from svy_task_template_script
    </sql>

@@ -152,6 +155,12 @@
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">and report_dept_person_code like concat('%', #{reportDeptPersonCode},
                '%')
            </if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">and circulation_dept_person_code like concat('%', #{circulationDeptPersonCode},
                '%')
            </if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">and circulation_dept_person_name like concat('%', #{circulationDeptPersonName},
                '%')
            </if>
    </select>

    <select id="selectSvyTaskTemplateScriptByID" parameterType="Long" resultMap="SvyTaskTemplateScriptResult">
@@ -212,6 +221,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code,</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name,</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code,</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code,</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskid != null">#{taskid},</if>
@@ -263,6 +274,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">#{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">#{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">#{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">#{circulationDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">#{circulationDeptPersonName},</if>
        </trim>
    </insert>

@@ -320,6 +333,8 @@
            <if test="dutyDeptPersonCode != null  and dutyDeptPersonCode != ''">duty_dept_person_code = #{dutyDeptPersonCode},</if>
            <if test="reportDeptPersonName != null  and reportDeptPersonName != ''">report_dept_person_name = #{reportDeptPersonName},</if>
            <if test="reportDeptPersonCode != null  and reportDeptPersonCode != ''">report_dept_person_code = #{reportDeptPersonCode},</if>
            <if test="circulationDeptPersonName != null  and circulationDeptPersonName != ''">circulation_dept_person_name = #{circulationDeptPersonName},</if>
            <if test="circulationDeptPersonCode != null  and circulationDeptPersonCode != ''">circulation_dept_person_code = #{circulationDeptPersonCode},</if>
        </trim>
        where id = #{d}
    </update>