Merge remote-tracking branch 'origin/master'

liusheng

2025-04-25 5fe107b01e611e03034efbb76b97c3faae539f6b

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

@@ -50,23 +50,22 @@
            aBoolean = serviceExternalService.generalInterface(dataMap);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("serviceExternal---addDeptInfo出异常了：{}", e.getMessage());
            log.error("serviceExternal---generalInterface出异常了：{}", e.getMessage());
            aBoolean = false;
        }
        return returnParam(aBoolean, dataMap);
    }

    /**
     * 新增任务
     * 新增体检任务进子任务
     */
    @ApiOperation("新增任务")
    @ApiOperation("新增体检任务进子任务")
    @PostMapping("/generalInterfaceAddTask")
    public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceSubtask) {
        ServiceTaskInfo serviceTaskVO = null;
    public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
        log.error("------serviceTaskInfo的值为：{}", serviceTaskInfo);
        Integer res = 0;
        try {
            serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceTaskInfo.class);
            res = svyTaskSingleService.insertTaskInfo(serviceTaskVO);
            res = svyTaskSingleService.insertTaskInfo(serviceTaskInfo);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("serviceExternal---generalInterfaceAddTask出异常了：{}", e.getMessage());
@@ -81,6 +80,7 @@
    @ApiOperation("360患者信息获取")
    @PostMapping("/query360PatInfo")
    public Map query360PatInfo(@RequestBody ServiceQueryInfo serviceQueryInfo) {
        log.error("------serviceQueryInfo的入参为：{}", serviceQueryInfo);
        Map map = null;
        try {
            map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
@@ -230,6 +230,23 @@
    }

    /**
     * 新增出院登记信息
     */
    @ApiOperation("新增预出院登记信息")
    @PostMapping("/addPreOutHospInfo")
    public Map<String, Object> addPreOutHospInfo(@RequestBody Map dataMap) {
        Boolean aBoolean = true;
        try {
            aBoolean = serviceExternalService.addPreOutHospInfo(dataMap);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("serviceExternal---addPreOutHospInfo：{}", e.getMessage());
            aBoolean = false;
        }
        return returnParam(aBoolean, dataMap);
    }

    /**
     * 新增完成接诊信息
     */
    @ApiOperation("新增完成接诊信息")