Merge branch 'master' of http://116.62.18.175:6699/r/smartor

liusheng

13 小时以前 e4872d9fdd9f277eacc518459418cb406570b99a

Merge branch 'master' of http://116.62.18.175:6699/r/smartor

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

@@ -121,14 +121,8 @@
    @Log(title = "患者满意度", businessType = BusinessType.INSERT)
    @PostMapping("/batchinsert")
    public AjaxResult batchinsert(@RequestBody List<PatSatisfaction> patSatisfaction) {
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        for (PatSatisfaction patSatisfaction1 : patSatisfaction) {
            patSatisfaction1.setCreateBy(user.getNickName());
            patSatisfaction1.setOrgid(user.getOrgid());
            patSatisfactionService.insertPatSatisfaction(patSatisfaction1);
        }
        return toAjax(1);
        Integer row = patSatisfactionService.batchInsert(patSatisfaction);
        return toAjax(row);
    }

    /**

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

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

    @PostMapping("/dealSubtaskDeadline")
    public AjaxResult dealSubtaskDeadline(@RequestParam("orgid") String orgid, @RequestParam("day") Integer day) {
        // ç«‹å³è¿”回，后台异步执行
        ryTask.dealSubtaskDeadline(orgid, day);
        return AjaxResult.success("【dealSubtaskDeadline】同步任务已启动，天数为" + day + "天，请稍后查看结果");
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/sso/SSOController.java

@@ -14,12 +14,18 @@
import com.ruoyi.system.service.ISysUserService;
import com.smartor.domain.SSOTokenResponse;
import com.smartor.domain.SSOUserInfo;
import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.ServiceSubtaskVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.impl.ServiceSubtaskServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.http.client.SimpleClientHttpRequestFactory;

import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
@@ -32,9 +38,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.*;

/**
 * SSO单点登录控制器
@@ -93,6 +97,9 @@
    private ISysConfigService sysConfigService;

    private final RestTemplate restTemplate;

    @Autowired
    private IServiceSubtaskService serviceSubtaskService;

    public SSOController() {
        // é…ç½®RestTemplate超时
@@ -188,6 +195,9 @@
    @GetMapping("ssoGoServiceSubtaskList")
    public RedirectView ssoGoServiceSubtaskList(@RequestParam(value = "code", required = false) String code,
                                                @RequestParam(value = "sfzh", required = false) String sfzh) {
        // é‡å®šå‘地址对象(重定向地址
        RedirectView redirectView = new RedirectView();

        log.info("收到ssoGoServiceSubtaskList请求，开始重定向到授权服务器,code = {}, sfzh = {}",code, sfzh);
        String path = sysConfigService.selectConfigByKey("sys.qddz");
        String redirectUri = "https://9.208.2.190:8092/prod-api/sso/ssoLoginLyra";
@@ -196,11 +206,21 @@
        String clientSecret = "suifangxt";
        String scope = "openid";

        ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
        subtask.setSfzh(sfzh);
        subtask.setSort(0);
        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskService.selectServiceSubtaskList(subtask);
        ServiceSubtask serviceSubtask = null;
        if(CollectionUtils.isNotEmpty(serviceSubtaskList)){
            serviceSubtask = serviceSubtaskList.get(0);
        }else {
            redirectView.setUrl(path + "/login?error=sso_failed");
            return redirectView;
        }

//        String authorizeUrl = lyraPath + "/mediinfo-lyra-authserver/connect/authorize";
        String accessTokenUrl = lyraPath + "/mediinfo-lyra-authserver/connect/token";
        String userInfoUrl =  lyraPath + "/mediinfo-lyra-authserver/connect/userinfo";
        // é‡å®šå‘地址对象(重定向地址
        RedirectView redirectView = new RedirectView();
        try {
            SSOTokenResponse accessToken = getAccessTokenLyra(code, accessTokenUrl, clientId, clientSecret, redirectUri,true);
            log.info("获取到的token：" + accessToken);
@@ -223,8 +243,14 @@
                return buildRedirect(path + "/login");
            }

            String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid +
                     "&sfzh=" + sfzh + "&orgname=null&ZuHuID=null&deptCode=null";
            String voiceType = (StringUtils.isNotEmpty(serviceSubtask.getType())
                    && serviceSubtask.getType().equals("1")) ? "1" : "0";
            String redirectUrl = path + "/loginSSO?token=" + loginToken +
                    "&orgid=" + orgid + "&campusid=" + serviceSubtask.getCampusid() +
                    "&taskid=" + serviceSubtask.getTaskid() + "&patid=" + serviceSubtask.getPatid() +
                    "&id=" + serviceSubtask.getId() + "&voiceType=" + voiceType +
                    "&visitCount=" + serviceSubtask.getVisitCount() + "&sfzh=" + sfzh +
                    "&orgname=null&ZuHuID=null&deptCode=null";
            log.info("【SSO登录】重定向地址：{}", redirectUrl);
            return buildRedirect(redirectUrl);


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

@@ -2,6 +2,7 @@

import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
@@ -220,18 +221,18 @@
        ajax.put("user", user);
        ajax.put("roles", roles);
        ajax.put("permissions", permissions);
        List<SysUserDept> sysUserDeptKSs = null;
        List<SysUserDept> sysUserDeptBQs = null;
        List<SysDept> sysDeptKSs = null;
        List<SysDept> sysDeptBQs = null;
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(user.getUserId());
        sysUserDept.setDeptType("1");
        sysUserDept.setOrgid(user.getOrgid());
        sysUserDept.setCampusid(user.getCampusid());
        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongDepts", sysUserDeptKSs);
        sysDeptKSs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
        ajax.put("belongDepts", sysDeptKSs);
        sysUserDept.setDeptType("2");
        sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongWards", sysUserDeptBQs);
        sysDeptBQs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
        ajax.put("belongWards", sysDeptBQs);

        return ajax;
    }

 ruoyi-common/src/main/java/com/ruoyi/common/utils/ArrayListUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package com.ruoyi.common.utils;

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

public class ArrayListUtils {

    /**
     * æ ¹æ®ID将两个List拆分为：仅List1独有、仅List2独有、两者共有
     *
     * @param list1 åˆ—表1
     * @param list2 åˆ—表2
     * @param idExtractor ID提取函数
     * @return Map包含三个Key: "onlyIn1", "onlyIn2", "common"
     */
    public static <T, K> Map<String, List<T>> splitListsById(List<T> list1, List<T> list2, Function<T, K> idExtractor) {
        // 1. æå–ID集合，用于快速判断存在性
        Set<K> ids1 = list1.stream().map(idExtractor).collect(Collectors.toSet());
        Set<K> ids2 = list2.stream().map(idExtractor).collect(Collectors.toSet());

        // 2. è®¡ç®—ID层面的差集和交集
        Set<K> onlyIn1Ids = new HashSet<>(ids1);
        onlyIn1Ids.removeAll(ids2); // List1独有的ID

        Set<K> onlyIn2Ids = new HashSet<>(ids2);
        onlyIn2Ids.removeAll(ids1); // List2独有的ID

        Set<K> commonIds = new HashSet<>(ids1);
        commonIds.retainAll(ids2); // å…±æœ‰çš„ID

        // 3. æ ¹æ®ID过滤原始对象列表
        List<T> onlyIn1 = list1.stream()
                .filter(item -> onlyIn1Ids.contains(idExtractor.apply(item)))
                .collect(Collectors.toList());

        List<T> onlyIn2 = list2.stream()
                .filter(item -> onlyIn2Ids.contains(idExtractor.apply(item)))
                .collect(Collectors.toList());

        // æ³¨æ„ï¼šå…±æœ‰éƒ¨åˆ†é€šå¸¸åˆå¹¶ä¸¤ä¸ªåˆ—表中的元素，或者只取其中一个。
        // è¿™é‡Œç­–略是：保留list1和list2中所有ID重合的对象（如果业务要求去重或合并对象属性，需额外处理）
        List<T> common = new ArrayList<>();
        common.addAll(list1.stream()
                .filter(item -> commonIds.contains(idExtractor.apply(item)))
                .collect(Collectors.toList()));
//        common.addAll(list2.stream()
//                .filter(item -> commonIds.contains(idExtractor.apply(item)))
//                .collect(Collectors.toList()));

        Map<String, List<T>> result = new HashMap<>();
        result.put("onlyIn1", onlyIn1);
        result.put("onlyIn2", onlyIn2);
        result.put("common", common);

        return result;
    }
}

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java

@@ -4,10 +4,13 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ArrayListUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.mapper.CollectHISMapper;
import com.ruoyi.quartz.service.ICollectHISService;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IPatMedOuthospService;
import lombok.extern.slf4j.Slf4j;
@@ -60,6 +63,9 @@
    private PatArchiveMapper patArchiveMapper;

    @Autowired
    private ServiceSubtaskMapper serviceSubtaskMapper;

    @Autowired
    private ThreadPoolTaskExecutor taskExecutor;

    @Autowired
@@ -67,6 +73,9 @@

    @Autowired
    private UtilsMapper utilsMapper;

    @Autowired
    private RedisCache redisCache;

    private static final long SHARDING_THRESHOLD = 5_000_000L;
    private static final String PAT_ARCHIVE_TABLE = "pat_archive";
@@ -339,6 +348,11 @@
        log.info("同步手术信息数量" + patMedOperations.size());
        for (PatMedOperation operation : patMedOperations) {
            try {
                if(ObjectUtils.isNotEmpty(operation.getCanceltime())){
                    //作废删除操作
                    cancelOper(operation);
                    continue;
                }
                Long patId = patIdHisMap.get(operation.getPatidHis());
                if (patId == null) {
                    patId = syncSinglePatient(operation.getPatidHis());
@@ -351,12 +365,12 @@
                    operation.setPatid(patId);
                }
                PatMedOperation oper = new PatMedOperation();
                oper.setOpid(operation.getOpid());
                oper.setOpreqid(operation.getOpreqid());
                List<PatMedOperation> patMedOperations1 = patMedOperationMapper.selectPatMedOperationList(oper);
                if (CollectionUtils.isNotEmpty(patMedOperations1)) {
                    operation.setId(patMedOperations1.get(0).getId());
                    operation.setUpdateTime(new Date());
                    count += patMedOperationMapper.updatePatMedOperation(patMedOperations1.get(0));
                    count += patMedOperationMapper.updatePatMedOperation(operation);
                    syncOperItem(operation);
                } else {
                    operation.setCreateTime(new Date());
@@ -370,6 +384,59 @@
        return count;
    }

    private Integer cancelOper(PatMedOperation oper){
        PatMedOperation operationVo = new PatMedOperation();
        operationVo.setOpreqid(oper.getOpreqid());
        List<PatMedOperation> operations = patMedOperationMapper.selectPatMedOperationList(operationVo);
        PatMedOperation operation = new PatMedOperation();
        if(CollectionUtils.isEmpty(operations)){
            return 0;
        }else {
            operation = operations.get(0);
        }
        log.info("手术作废id=" + operation.getId());
        PatMedOperationItem pmoi = new PatMedOperationItem();
        //获取需要出院手术随访，未处理的数据
        pmoi.setOpid(operation.getId().toString());
        List<PatMedOperationItem> patMedOperationItems
                = patMedOperationItemMapper.selectOperationItemList(pmoi);
        List<Long> operationItemIds = patMedOperationItems.stream()
                .map(PatMedOperationItem::getId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());

        //不需要服务了，需要通过patid和sendstate=1,2,3,5,7去查询一下，service_subtask里是否有正在执行的任务，
        //有的话，立即停了
        List<Long> sendstates = Arrays.asList(1L, 2L, 3L, 5L, 7L);
        List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setOrgid(operation.getOrgid());
        serviceSubtaskVO.setPatid(operation.getPatid());
        serviceSubtaskVO.setSendstates(sendstates);
        serviceSubtaskVO.setOperationItemIds(operationItemIds);
        serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        //去redis中，查询是否有subid，有的话移除cache-exist
        if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
            for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                log.info("需要移除的subId为：{}", serviceSubtask.getId().toString());
                serviceSubtask.setSendstate(4L);
                serviceSubtask.setRemark("手术撤销");
                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
                redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
                redisCache.removeElementFromList("cache-1", serviceSubtask.getId().toString());
                redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
                redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
                redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
            }
        }
        operation.setUpdateTime(new Date());
        patMedOperationMapper.updatePatMedOperation(operation);
        patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid());
        return 1;
    }

    /**
     * åŒæ­¥æ‰‹æœ¯ä¿¡æ¯
     *
@@ -377,34 +444,67 @@
     * @return
     */
    private Integer syncOperItem(PatMedOperation operation) {
        if(ObjectUtils.isNotEmpty(operation.getId())){
            operation.setOpid(operation.getId().toString());
        }
        operation.setUpdateTime(new Date());
        patMedOperationMapper.updatePatMedOperation(operation);

        Integer count = 0;
        PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
        patMedOperationItem.setOrgid(operation.getOrgid());
        if(StringUtils.isNotEmpty(operation.getOpid())){
            patMedOperationItem.setOpid(operation.getOpid());
            patMedOperationItem.setLastStartTime(operation.getLastStartTime());
            patMedOperationItem.setLastEndTime(operation.getLastEndTime());
            List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
            PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
            //patMedOperation.opReqid = patMedOperationItem.operationid
            List<PatMedOperationItem> patMedOperationItems = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(operation.getOpreqid())){
                patMedOperationItem.setOperationid(operation.getOpreqid());
                patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
            }else {
                log.info("同步手术详情信息:手术申请单ID为空!");
                return count;
            }

            PatMedOperationItem operItem = new PatMedOperationItem();
            operItem.setOperationid(operation.getOpreqid());
            List<PatMedOperationItem> patMedOperationItems1 = patMedOperationItemMapper.selectPatMedOperationItemList(operItem);

            Map<String, List<PatMedOperationItem>> maps = ArrayListUtils.splitListsById(patMedOperationItems,
                    patMedOperationItems1, PatMedOperationItem::getOperationid);
            //只在视图的数据不在本地的数据，执行新增操作
            List<PatMedOperationItem> addItems = maps.get("onlyIn1");
            //只在本地的数据不在视图的数据，执行删除操作
            List<PatMedOperationItem> delItems = maps.get("onlyIn2");
            //重叠的数据，执行更新操作 patMedOperationItems的数据
            List<PatMedOperationItem> editItems = maps.get("common");

            log.info("同步手术详情信息数量" + patMedOperationItems.size());
            for (PatMedOperationItem operationItem : patMedOperationItems) {

                try {
                for (PatMedOperationItem operationItem : addItems) {
                    operationItem.setInhospstate(operation.getInhospstate());
                    operationItem.setSerialnum(operation.getSerialnum());
                    PatMedOperationItem operItem = new PatMedOperationItem();
                    operItem.setOpid(operationItem.getOpid());
                    operItem.setOperationid(operationItem.getOperationid());
                    List<PatMedOperationItem> patMedOperationItems1 = patMedOperationItemMapper.selectPatMedOperationItemList(operItem);
                    if (CollectionUtils.isNotEmpty(patMedOperationItems1)) {
                        operationItem.setId(patMedOperationItems1.get(0).getId());
                        operationItem.setUpdateTime(new Date());
                        count += patMedOperationItemMapper.updatePatMedOperationItem(operationItem);
                    } else {
                        operation.setCreateTime(new Date());
                    operationItem.setOpid(operation.getId().toString());
                    operationItem.setOperationid(operation.getOpreqid());
                    operationItem.setOpercheckFlag("0");
                    operationItem.setCreateTime(new Date());
                        count += patMedOperationItemMapper.insertPatMedOperationItem(operationItem);
                    }

                for (PatMedOperationItem operationItem : delItems) {
                    operationItem.setUpdateTime(new Date());
                    count += patMedOperationItemMapper.deletePatMedOperationItemByOperationid(operationItem.getOperationid());
                }

                for (PatMedOperationItem operationItem : editItems) {
                    operationItem.setInhospstate(operation.getInhospstate());
                    operationItem.setSerialnum(operation.getSerialnum());
                    operationItem.setOpid(operation.getId().toString());
                    operationItem.setOperationid(operation.getOpreqid());
                    operationItem.setUpdateTime(new Date());
                    count += patMedOperationItemMapper.updatePatMedOperationItemByOperationid(operationItem);
                }
                log.info("同步手术id={}详情信息数量, æ–°å¢ž{}条，删除{}条，修改{}条", operation.getId(), addItems.size(), delItems.size(), editItems.size());
                } catch (Exception ex) {
                    log.info("同步手术详情信息:" + ex.getMessage());
                }
            }

//            try {

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

@@ -1771,33 +1771,50 @@
     * å¤„理超时随访任务
     * @return
     */
    public void dealSubtaskDeadline(Integer deadlineDay){

    public void dealSubtaskDeadline(String orgid, Integer deadlineDay){
        //获取任务信息
        ServiceTask st = new ServiceTask();
        st.setDelFlag("0");
        st.setLongTask(1);
        st.setNexttaskflag("1");
        st.setOrgid(orgid);
        List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
        for (ServiceTask serviceTask : serviceTasks) {
            deadlineDay = -deadlineDay;
        Date deadline = DateUtils.addDays(new Date(), deadlineDay);
        //通过任务ID拿到患者信息,并且随访时间得是今天之前的
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
            serviceSubtaskVO.setOrgid(orgid);
        serviceSubtaskVO.setSendstate(7L);
            //只扫描首次随访的
        serviceSubtaskVO.setVisitCount(1);
            serviceSubtaskVO.setTaskid(serviceTask.getTaskid());
        serviceSubtaskVO.setEndOutHospTime(deadline);
        List<ServiceSubtask> serviceSubtaskList
                = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
        log.info("【dealSubtaskDeadline】获取到{}个超时任务", serviceSubtaskList.size());
            log.info("【dealSubtaskDeadline】获取到{}个超时任务, taskid={}", serviceSubtaskList.size(), serviceTask.getTaskid());
        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                PatMedInhosp patMedInhospVo = new PatMedInhosp();
                patMedInhospVo.setOrgid(serviceSubtask.getOrgid());
                patMedInhospVo.setInhospid(serviceSubtask.getInhospid());
                List<PatMedInhosp> patMedInhospList = iPatMedInhospService.selectPatMedInhospList(patMedInhospVo);
            PatMedInhosp patMedInhosp = new PatMedInhosp();
            patMedInhosp.setInhospid(serviceSubtask.getInhospid());
            List<PatMedInhosp> patMedInhospList = iPatMedInhospService.selectPatMedInhospList(patMedInhosp);

            if (patMedInhospList.size() > 0) {
                serviceSubtask.setIsVisitAgain(2);
                serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";患者再入院了" : "患者再入院了");
                serviceSubtask.setSendstate(4L);
                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                //return "无需再次随访，患者再入院了";
                if (!patMedInhospList.isEmpty()) {
                    patMedInhosp = patMedInhospList.get(0);
            }else {
                continue;
            }
                if(ObjectUtils.isEmpty(serviceTask.getNexttaskid())){
                    continue;
                }
                ServiceTask nextServiceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceTask.getNexttaskid());
                PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
                String config = configService.selectConfigByKey("visit.early.day");
                Integer type = 1;

            //新增再次随访任务
            ServiceSubtask serviceSubtaskAgain = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtask.class);
                ServiceSubtask serviceSubtaskAgain = iPatMedInhospService.boxedServiceSubtask(nextServiceTask,
                        patMedInhosp, patArchive, config, type);
            serviceSubtaskAgain.setId(null);
            serviceSubtaskAgain.setUpid(serviceSubtask.getId().intValue());
            serviceSubtaskAgain.setVisitCount(serviceSubtask.getVisitCount() + 1);
@@ -1810,11 +1827,11 @@
            int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain);
            if (i == 1) {
                //再次随访任务创建成功后，原任务改为失败状态
                serviceSubtask.setIsVisitAgain(2);
                serviceSubtask.setSendstate(5L);
                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
            }
        }
    }
    }

}

 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml

@@ -826,6 +826,7 @@
        o.paname,
        o.opreqid,
        o.opreqcode,
        o.canceltime,
        o.opsstatus,
        o.optypecode,
        o.optypename,
@@ -887,7 +888,7 @@
        o.nurse_name ,
        o.check_flag ,
        o.long_task_reason,
        o.opid ,
        null as opid ,
        o.opcode ,
        o.opdesc,
        o.oplevelcode ,
@@ -897,6 +898,9 @@
        where 1=1
        <if test="orgid != null and orgid != ''">
            AND o.orgid = #{orgid}
        </if>
        <if test="opreqid != null and opreqid != ''">
            AND o.opreqid = #{opreqid}
        </if>
        <if test="lastStartTime != null and lastStartTime != ''">
            and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
@@ -910,7 +914,7 @@
            resultMap="PatMedOperationItemResult">
        select
               oi.operationid,
               oi.opid,
               null as opid,
               oi.opcode,
               oi.opdesc,
               oi.main_flag,
@@ -940,6 +944,9 @@
        <if test="opid != null and opid != ''">
            AND oi.opid = #{opid}
        </if>
        <if test="operationid != null and operationid != ''">
            AND oi.operationid = #{operationid}
        </if>
        <if test="lastStartTime != null and lastStartTime != ''">
            and oi.last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
        </if>

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -291,7 +291,7 @@
        and d.del_flag = 0
        and ud.del_flag = 0
        <if test="orgid != null">and d.orgid = #{orgid} and ud.orgid = #{orgid}</if>
        <if test="campusid != null">and d.campusid = #{campusid} and ud.campusid = #{campusid}</if>
        <if test="campusid != null">and d.campusid = #{campusid}</if>
        <if test="userId != null">and ud.user_id = #{userId}</if>
        <if test="deptType != null and deptType != ''">and d.dept_type = #{deptType}</if>
    </select>

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

@@ -8,6 +8,7 @@
import lombok.Data;

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

/**
 * æ‚£è€…满意度对象 pat_satisfaction
@@ -155,6 +156,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    @ApiModelProperty(value = "主键Id集合")
    private List<Long> ids;

    /**
     * pageNum
     */

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

@@ -799,4 +799,10 @@
//    @Excel(name = " å‘送状态 1 è¢«é¢†å–(在任务中是新建，在服务中是被领取)  2 å¾…发送  3 å·²å‘送  4 ä¸æ‰§è¡Œ  5 å‘送失败 6 å·²å®Œæˆ\") ")
    @ApiModelProperty(value = "页面展示状态 ï¼š1：待随访（1 è¢«é¢†å–、2 å¾…发送、3 å·²å‘送、5 å‘送失败、7、超时）；2：已完成（ 6 å·²å®Œæˆï¼‰ã€3：无需随访（4 ä¸æ‰§è¡Œï¼‰")
    private Long sendstateView;

    @ApiModelProperty(value = "手术记录id å¯¹åº”pat_med_operation_item.id")
    private Long operationItemId;

    @ApiModelProperty(value = "手术记录id集合")
    private List<Long> operationItemIds;
}

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

@@ -53,6 +53,14 @@
    public int updatePatMedOperationItem(PatMedOperationItem patMedOperationItem);

    /**
     * ä¿®æ”¹æ‚£è€…检查检验记录子
     *
     * @param patMedOperationItem æ‚£è€…检查检验记录子
     * @return ç»“æžœ
     */
    public int updatePatMedOperationItemByOperationid(PatMedOperationItem patMedOperationItem);

    /**
     * åˆ é™¤æ‚£è€…检查检验记录子
     *
     * @param id æ‚£è€…检查检验记录子主键
@@ -77,6 +85,22 @@
    public int deleteHardPatMedOperationItemByOpId(String opid);

    /**
     * åˆ é™¤æ‚£è€…检查检验记录子
     *
     * @param operationid æ‚£è€…检查检验记录子主键
     * @return ç»“æžœ
     */
    public int deletePatMedOperationItemByOperationid(Long operationid);

    /**
     * åˆ é™¤æ‚£è€…检查检验记录子
     *
     * @param opid æ‚£è€…检查检验记录子主键
     * @return ç»“æžœ
     */
    public int deleteSoftPatMedOperationItemByOpId(String opid);

    /**
     * æŸ¥è¯¢æ‚£è€…检查检验记录子列表
     *
     * @param patMedOperationItem æ‚£è€…检查检验记录子

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

@@ -40,6 +40,14 @@
    public int insertPatSatisfaction(PatSatisfaction patSatisfaction);

    /**
     * æ‰¹é‡æ–°å¢žæ‚£è€…满意度
     *
     * @param patSatisfactions æ‚£è€…满意度
     * @return ç»“æžœ
     */
    public int batchInsert(List<PatSatisfaction> patSatisfactions);

    /**
     * ä¿®æ”¹æ‚£è€…满意度
     *
     * @param patSatisfaction æ‚£è€…满意度

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

@@ -119,6 +119,12 @@
    public Boolean addOperationInfo(@RequestBody Map dataMap);

    /**
     * æ’¤é”€æ‰‹æœ¯ä¿¡æ¯
     */
    public Boolean cancelOperationInfo(@RequestBody Map dataMap);


    /**
     * æ–°å¢žåŒ»ç–—组医生
     */
    public Boolean addMedicalTeam(Map dataMap);

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

@@ -300,7 +300,7 @@
                } catch (Exception e) {
                    log.error("人员入院科室处理出异常了：{}", e.getMessage());
                    patMedInhosp1.setInDeptcheckFlag("2");
                    patMedInhosp1.setLongTaskReason("人员入院科室处理出异常了：" + e.getMessage());
                    patMedInhosp1.setLongTaskReason("人员入院科室处理出异常了");
                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                }
            }
@@ -727,7 +727,7 @@
                            //再入院逻辑
                            //景宁 å‡ºé™¢é¦–次（7天）随访一定要做
                            boolean firstVisit = false;
                            if (orgId.equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
                            if (orgId.equals("47255004333112711A1001")) {
                                firstVisit = true;
                            }
                            if (!firstVisit) {
@@ -865,7 +865,7 @@
        if (CollectionUtils.isEmpty(serviceTasks)) {
            log.info("该手术对应手术等级的长期任务不存在,任务ID为：{}", taskid);
            patMedOperationItem.setOpercheckFlag("2");
            patMedOperationItem.setLongTaskReason(longTaskReason + " & è¯¥æ‰‹æœ¯å¯¹åº”手术等级的长期任务不存在,任务ID为:" + taskid);
            patMedOperationItem.setLongTaskReason(" & è¯¥æ‰‹æœ¯å¯¹åº”手术等级的长期任务不存在,任务ID为:" + taskid +";");
            patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
            return;
        } else {
@@ -971,7 +971,7 @@
                PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem();
                patMedOperationItem2.setId(patMedOperationItem.getId());
                patMedOperationItem2.setOpercheckFlag("2");
                patMedOperationItem2.setRemark("生成子任务失败 4");
                patMedOperationItem2.setLongTaskReason("生成子任务失败 4;");
                patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2);
            }
        } catch (Exception e) {
@@ -981,7 +981,7 @@
            PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem();
            patMedOperationItem2.setId(patMedOperationItem.getId());
            patMedOperationItem2.setOpercheckFlag("2");
            patMedOperationItem2.setRemark("生成子任务报错回滚 4");
            patMedOperationItem2.setLongTaskReason("生成子任务报错回滚 4;");
            patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2);
            e.printStackTrace();
        }
@@ -1188,7 +1188,7 @@
            newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
        } else {
            patMedOperationItem.setOpercheckFlag("2");
            patMedOperationItem.setRemark(patMedOperationItem.getRemark() + "& è¯¥æ‚£è€…手术出院时间为空,手术详情ID为:" + patMedOperationItem.getId());
            patMedOperationItem.setLongTaskReason("该患者手术出院时间为空,手术详情ID为:" + patMedOperationItem.getId() + ";");
            patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
//            patMedInhosp1.setDeptcheckFlag("2");
//            patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& è¯¥æ‚£è€…手术出院时间为空,出院记录ID为:" + patMedInhosp1.getInhospid());
@@ -1251,7 +1251,7 @@
                        }
                        //景宁 å‡ºé™¢é¦–次（7天）随访一定要做
                        boolean firstVisit = false;
                        if (serviceSubtask1.getOrgid().equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
                        if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")) {
                            firstVisit = true;
                        }
                        if (!firstVisit) {
@@ -1324,7 +1324,7 @@
                if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
                    PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId());
                    patMedOperationItem.setOpercheckFlag("2");
                    patMedOperationItem.setLongTaskReason(patMedOperationItem.getLongTaskReason() + "所患的手术未配置长期任务;");
                    patMedOperationItem.setLongTaskReason("所患的手术未配置长期任务;");
                    patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
                } else {
                    for (ServiceTaskoper serviceTaskoper : serviceTaskopers) {

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

@@ -5,7 +5,11 @@
import java.util.*;
import java.util.stream.Collectors;

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.Arith;
import com.ruoyi.common.utils.ArrayListUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.smartor.domain.*;
@@ -19,6 +23,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.service.IPatSatisfactionService;

import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;

/**
 * æ‚£è€…满意度Service业务层处理
@@ -101,6 +107,50 @@
    }

    /**
     * æ–°å¢žæ‚£è€…满意度
     *
     * @param patSatisfactions æ‚£è€…满意度
     * @return ç»“æžœ
     */
    @Override
    public int batchInsert(List<PatSatisfaction> patSatisfactions) {
        if(CollectionUtils.isEmpty(patSatisfactions)){
            return 0;
        }
        List<Long> ids = patSatisfactions.stream().map(PatSatisfaction::getId).
                distinct().collect(Collectors.toList());
        List<PatSatisfaction> patSatisfactionsOld = new ArrayList<>();
        PatSatisfaction patSatisfactionVo = new PatSatisfaction();
        patSatisfactionVo.setIds(ids);
        patSatisfactionsOld = patSatisfactionMapper.selectPatSatisfactionList(patSatisfactionVo);
        Map<String, List<PatSatisfaction>> maps = ArrayListUtils.splitListsById(patSatisfactions,
                patSatisfactionsOld, PatSatisfaction::getId);
        //只在patSatisfactions的数据，执行新增操作
        List<PatSatisfaction> addItems = maps.get("onlyIn1");
        //只在patSatisfactionsOld的数据，执行删除操作
//        List<PatSatisfaction> delItems = maps.get("onlyIn2");
        //重叠的数据，执行更新操作
        List<PatSatisfaction> editItems = maps.get("common");
        Integer count = 0;
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        for (PatSatisfaction patSatisfaction0 : editItems) {
            patSatisfaction0.setUpdateBy(user.getNickName());
            patSatisfaction0.setUpdateTime(DateUtils.getNowDate());
            count = count + patSatisfactionMapper.updatePatSatisfaction(patSatisfaction0);
        }

        for (PatSatisfaction patSatisfaction1 : addItems) {
            patSatisfaction1.setCreateBy(user.getNickName());
            patSatisfaction1.setOrgid(user.getOrgid());
            patSatisfaction1.setCreateTime(DateUtils.getNowDate());
            patSatisfaction1.setUpdateTime(DateUtils.getNowDate());
            count = count + patSatisfactionMapper.insertPatSatisfaction(patSatisfaction1);
        }
        return count;
    }

    /**
     * ä¿®æ”¹æ‚£è€…满意度
     *
     * @param patSatisfaction æ‚£è€…满意度

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

@@ -816,10 +816,16 @@
            patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
        }

        String orgid = ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null;
        if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
            //缙云二院 ä½é™¢è®°å½•ä¸æ›´æ–°çŠ¶æ€
        }else {
        patMedInhosp1.setInhospstate("1");
        }

        if (CollectionUtils.isNotEmpty(patMedInhospList)) {
            patMedInhosp1.setUpdateTime(new Date());
            patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
            patMedInhosp1.setOrgid(orgid);
            if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
                //不需要长期任务随访
                patMedInhosp1.setFuflag("0");
@@ -832,7 +838,7 @@
                patMedInhosp1.setHospitalcode(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
                patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
                patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
                patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
                patMedInhosp1.setOrgid(orgid);
                //丽水无院区，默认值是 1
                patMedInhosp1.setCampusid("1");
                patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
@@ -1514,6 +1520,81 @@
        return true;
    }

    @Override
    public Boolean cancelOperationInfo(Map dataMap) {
        log.info("ServiceExternalServiceImpl---cancelOperationInfo的撤销的值为：{}", dataMap);

        Map yeWuXX = (Map) dataMap.get("YeWuXX");
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
        PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
        //手术撤销
        Map<String, Object> sscx = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("ShouShuCX") : null;
        ExternalOperationInfo externalOperationInfo = null;
        if (ObjectUtils.isNotEmpty(sscx))
            externalOperationInfo = BeanUtil.mapToBean(sscx, ExternalOperationInfo.class, true);
        PatMedOperation patMedOperation = new PatMedOperation();
        patMedOperation.setPatid(patArchive.getId());
        patMedOperation.setOrgid(patArchive.getOrgid());
        patMedOperation.setOpreqcode(externalOperationInfo.getShenQingDID());
        //查询一下，该患者是否已经有这些数据
        List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
        if (CollectionUtils.isNotEmpty(patMedOperations)) {
            for(PatMedOperation operation : patMedOperations){
                Long id = operation.getId();
                //如果手术撤销，直接删除该条手术信息
                if (ObjectUtils.isNotEmpty(sscx)) {
                    operation.setId(id);
                    operation.setCheckFlag("1");
                    operation.setDelFlag("1");
                    //同时去查询，是否在subtask中生成任务，如果生成出得立马删除
                    //            æ‰‹æœ¯éšè®¿
                    PatMedOperationItem pmoi = new PatMedOperationItem();
                    //获取需要出院手术随访，未处理的数据
                    pmoi.setOpid(operation.getId().toString());
                    List<PatMedOperationItem> patMedOperationItems
                            = patMedOperationItemMapper.selectOperationItemList(pmoi);
                    List<Long> operationItemIds = patMedOperationItems.stream()
                            .map(PatMedOperationItem::getId)
                            .filter(Objects::nonNull)
                            .distinct()
                            .collect(Collectors.toList());


                    //不需要服务了，需要通过patid和sendstate=1,2,3,5,7去查询一下，service_subtask里是否有正在执行的任务，
                    //有的话，立即停了
                    List<Long> sendstates = Arrays.asList(1L, 2L, 3L, 5L, 7L);
                    List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
                    ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
                    serviceSubtaskVO.setOrgid(patArchive.getOrgid());
                    serviceSubtaskVO.setPatid(patArchive.getId());
                    serviceSubtaskVO.setSendstates(sendstates);
                    serviceSubtaskVO.setOperationItemIds(operationItemIds);
                    serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
                    //去redis中，查询是否有subid，有的话移除cache-exist
                    if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                            log.info("需要移除的subId为：{}", serviceSubtask.getId().toString());
                            serviceSubtask.setSendstate(4L);
                            serviceSubtask.setRemark("手术撤销");
                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                            redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString());
                            redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString());
                            redisCache.removeElementFromList("cache-1", serviceSubtask.getId().toString());
                            redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString());
                            redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString());
                            redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString());
                        }
                    }
                    operation.setUpdateTime(new Date());
                    patMedOperationMapper.updatePatMedOperation(operation);
                    patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid());
                }
            }
        }
        return true;
    }

    //新增患者基本信息
    private PatArchive addPatArchive(ExternalInHospPatientInfo externalInHospPatientInfo, ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo, ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo) {
        Date parse = null;
@@ -2007,6 +2088,7 @@
                return true;
            case "SM_SQ_CheXiao":
                log.info("手术撤销入参类型为：{}", type);
                cancelOperationInfo(dataMap);
                return true;
            case "TJ_YW_BaoGaoXX":
                log.info("体检报告入参类型为：{}", type);

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

@@ -706,8 +706,12 @@
        patMedInhosp.setInhospstate("0");
        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
        PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask1.getPatid());

        if (patMedInhospList.size() > 0) {
        //景宁 æ–°å¢žå†æ¬¡éšè®¿ä¸èƒ½è§¦å‘患者再入院
        boolean inhospAgain = true;
        if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")) {
            inhospAgain = false;
        }
        if (patMedInhospList.size() > 0 && inhospAgain) {
            serviceSubtask1.setIsVisitAgain(2);
            serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";患者再入院了" : "患者再入院了");
            serviceSubtask1.setSendstate(4L);
@@ -2887,6 +2891,12 @@
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
                break;
            case "management_doctor_code":
                rawData = rawData.stream()
                        .peek(item -> {
                            item.setDrname(item.getManagementDoctor());
                            item.setDrcode(item.getManagementDoctorCode());
                        })
                        .collect(Collectors.toList());
                collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getManagementDoctorCode()).orElse("Unknown")));
                break;
            case "deptcode":

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

@@ -246,6 +246,7 @@
        AND a.del_flag = 0
        AND b.del_flag = 0
        AND a.idcardno IS NOT NULL
        <if test="inhospid != null">and b.inhospid = #{inhospid}</if>
        <if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') &gt;=
            date_format(#{startOutHospTime},'%y%m%d')
        </if>

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

@@ -309,6 +309,86 @@
        where id = #{id}
    </update>

    <update id="updatePatMedOperationItemByOperationid" parameterType="com.smartor.domain.PatMedOperationItem">
        update pat_med_operation_item
        <trim prefix="SET" suffixOverrides=",">
            <if test="opid != null">opid =
                #{opid},
            </if>
            <if test="opcode != null">opcode =
                #{opcode},
            </if>
            <if test="opdesc != null">opdesc =
                #{opdesc},
            </if>
            <if test="mainFlag != null">main_flag =
                #{mainFlag},
            </if>
            <if test="incitypecode != null">incitypecode =
                #{incitypecode},
            </if>
            <if test="incitypedesc != null">incitypedesc =
                #{incitypedesc},
            </if>
            <if test="oplevelcode != null">oplevelcode =
                #{oplevelcode},
            </if>
            <if test="opleveldesc != null">opleveldesc =
                #{opleveldesc},
            </if>
            <if test="opposition != null">opposition =
                #{opposition},
            </if>
            <if test="delFlag != null">del_flag =
                #{delFlag},
            </if>
            <if test="updateBy != null">update_by =
                #{updateBy},
            </if>
            <if test="updateTime != null">update_time =
                #{updateTime},
            </if>
            <if test="createBy != null">create_by =
                #{createBy},
            </if>
            <if test="createTime != null">create_time =
                #{createTime},
            </if>
            <if test="isupload != null">isupload =
                #{isupload},
            </if>
            <if test="uploadTime != null">upload_time =
                #{uploadTime},
            </if>
            <if test="orgid != null">orgid =
                #{orgid},
            </if>
            <if test="pguid != null">pguid =
                #{pguid},
            </if>
            <if test="guid != null">guid =
                #{guid},
            </if>
            <if test="pid != null">pid =
                #{pid},
            </if>
            <if test="opercheckFlag != null">opercheck_flag =
                #{opercheckFlag},
            </if>
            <if test="longTaskReason != null">long_task_reason =
                #{longTaskReason},
            </if>
            <if test="inhospstate != null">inhospstate =
                #{inhospstate},
            </if>
            <if test="serialnum != null">serialnum =
                #{serialnum},
            </if>
        </trim>
        where operationid = #{operationid}
        and opcode = #{opcode}
    </update>

    <insert id="insertPatMedOperationItems">
        insert into pat_med_operation_item
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -442,7 +522,25 @@
    <delete id="deleteHardPatMedOperationItemByOpId" parameterType="String">
        delete from pat_med_operation_item
               where opid = #{opid}
               and opercheck_flag != 1
    </delete>

    <update id="deletePatMedOperationItemByOperationid" parameterType="Long">
        update  pat_med_operation_item
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where operationid = #{operationid}
        and opercheck_flag != 1
    </update>

    <update id="deleteSoftPatMedOperationItemByOpId" parameterType="String">
        update pat_med_operation_item
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where opid = #{opid}
    </update>

    <select id="selectOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
            resultMap="PatMedOperationItemResult">
@@ -457,7 +555,7 @@
        from pat_med_operation pmo
        join pat_med_operation_item pmoi
        on pmoi.opid = pmo.opid
        left join pat_med_inhosp pmi
        join pat_med_inhosp pmi
        on pmo.serialnum = pmi.serialnum
        where
        pmo.del_flag = '0'

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

@@ -114,6 +114,13 @@
            <if test="endTime != null">
                AND date_format(update_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
            </if>
            <if test="ids != null and ids.size()>0">
                AND id IN
                <foreach collection="ids" item="idItem" open="(" separator=","
                         close=")">
                    #{idItem}
                </foreach>
            </if>
    </select>

    <select id="selectPatSatisfactionById" parameterType="Long"

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

@@ -358,6 +358,12 @@
                #{itemTaskId}
            </foreach>
        </if>
        <if test="operationItemIds != null and operationItemIds.size() > 0">
            AND operation_item_id IN
            <foreach collection="operationItemIds" item="operationItemIdItem" open="(" separator="," close=")">
                #{operationItemIdItem}
            </foreach>
        </if>
        <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
        <if test="templatename != null  and templatename != ''">and templatename like concat('%', #{templatename},
            '%')
@@ -483,6 +489,7 @@
        <if test="libtemplatename != null ">and libtemplatename = #{libtemplatename}</if>
        <if test="openid != null ">and openid = #{openid}</if>
        <if test="sendstate != null ">and sendstate = #{sendstate}</if>
        <if test="operationItemId != null ">and operation_item_id = #{operationItemId}</if>
        <if test="drname != null  and drname != ''">and drname like concat('%', #{drname}, '%')</if>
        <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
        <if test="drcode != null and drcode != ''">and (drcode = #{drcode}</if>