【景宁】发送方式改执行方式

陈昶聿

4 天以前 ff11c967e36ce9d3ffa24e04e047bc92eccc3cb4

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

@@ -457,7 +457,8 @@
        SysUser user = getLoginUser().getUser();
        if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
        if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
        return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
        serviceSubtask.setCampusid(user.getCampusid());
        return success(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
    }

    @ApiOperation("患者再次随访")
@@ -584,7 +585,7 @@
                        sysUserWard.setOrgid(user.getOrgid());
                        sysUserWard.setDeptType("2");
                        List<SysUserDept> wardList = sysUserDeptService.selectSysUserDeptList(sysUserWard);
                        if(CollectionUtils.isNotEmpty(wardList)) {
                        if (CollectionUtils.isNotEmpty(wardList)) {
                            leavehospitaldistrictcodes = wardList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
                        }
                        serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
@@ -598,7 +599,7 @@
                        sysUserDept.setOrgid(user.getOrgid());
                        sysUserDept.setDeptType("1");
                        List<SysUserDept> deptList = sysUserDeptService.selectSysUserDeptList(sysUserDept);
                        if(CollectionUtils.isNotEmpty(deptList)){
                        if (CollectionUtils.isNotEmpty(deptList)) {
                            deptCodes = deptList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
                        }
                        serviceSubtaskCountReq.setDeptcodes(deptCodes);
@@ -932,10 +933,10 @@
    @PostMapping(value = "/goSfRelay")
    public AjaxResult goSfRelay(@RequestParam("taskId") Long taskId, @RequestParam("deptcode") String deptcode, @RequestParam("leavehospitaldistrictcode") String leavehospitaldistrictcode) {
        String url = localIP + ":" + req_path + "/SfRelay?taskid=" + taskId;
        if(StringUtils.isNotEmpty(deptcode)){
        if (StringUtils.isNotEmpty(deptcode)) {
            url = url + "&deptcode=" + deptcode;
        }
        if(StringUtils.isNotEmpty(leavehospitaldistrictcode)){
        if (StringUtils.isNotEmpty(leavehospitaldistrictcode)) {
            url = url + "&leavehospitaldistrictcode=" + leavehospitaldistrictcode;
        }
        return AjaxResult.success(url);
@@ -961,5 +962,4 @@
    public void syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
        collectHISService.syncOper(startTime, endTime);
    }

}