1.新增同德药品采集、宣教功能 2.处理新华采集BUG 3.新增service_subtask的院区ID 4.采集同德的入院申请单信息 5.给出院表新...

liusheng

8 天以前 ec6b75cfebe87ad118aba001708e686bf28e2fde

1.新增同德药品采集、宣教功能
2.处理新华采集BUG
3.新增service_subtask的院区ID
4.采集同德的入院申请单信息
5.给出院表新增药品字段、入院申请单字段

 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);

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.AddOrgId;
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.poi.ExcelUtil;
import com.smartor.domain.ServiceTaskmedical;
import com.smartor.service.IServiceTaskmedicalService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * ä»»åŠ¡è¯å“å…³è”Controller
 *
 * @author lihu
 * @date 2026-07-29
 */
@Api("任务药品关联")
@RestController
@RequestMapping("/smartor/taskmedical")
public class ServiceTaskmedicalController extends BaseController {
    @Autowired
    private IServiceTaskmedicalService serviceTaskmedicalService;

    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”列表
     */
    @ApiOperation("查询任务药品关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:list')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody ServiceTaskmedical serviceTaskmedical) {
        startPage();
        List<ServiceTaskmedical> list = serviceTaskmedicalService.selectServiceTaskmedicalList(serviceTaskmedical);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä»»åŠ¡è¯å“å…³è”列表
     */
    @ApiOperation("导出任务药品关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:export')")
    @Log(title = "任务药品关联", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceTaskmedical serviceTaskmedical) {
        List<ServiceTaskmedical> list = serviceTaskmedicalService.selectServiceTaskmedicalList(serviceTaskmedical);
        ExcelUtil<ServiceTaskmedical> util = new ExcelUtil<ServiceTaskmedical>(ServiceTaskmedical.class);
        util.exportExcel(response, list, "任务药品关联数据");
    }

    /**
     * èŽ·å–任务药品关联详细信息
     */
    @ApiOperation("获取任务药品关联详细信息")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(serviceTaskmedicalService.selectServiceTaskmedicalById(id));
    }

    /**
     * æ–°å¢žä»»åŠ¡è¯å“å…³è”
     */
    @ApiOperation("新增任务药品关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:add')")
    @Log(title = "任务药品关联", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceTaskmedical serviceTaskmedical) {
        return toAjax(serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical));
    }

    /**
     * ä¿®æ”¹ä»»åŠ¡è¯å“å…³è”
     */
    @ApiOperation("修改任务药品关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:edit')")
    @Log(title = "任务药品关联", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceTaskmedical serviceTaskmedical) {
        return toAjax(serviceTaskmedicalService.updateServiceTaskmedical(serviceTaskmedical));
    }

    /**
     * åˆ é™¤ä»»åŠ¡è¯å“å…³è”
     */
    @ApiOperation("删除任务药品关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskmedical:remove')")
    @Log(title = "任务药品关联", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceTaskmedicalService.deleteServiceTaskmedicalByIds(ids));
    }
}

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

@@ -635,13 +635,31 @@
        ServiceSLTDInhospReqVO serviceSLTDInhospReqVO = new ServiceSLTDInhospReqVO();
        serviceSLTDInhospReqVO.setOrgId("20001001");
        Long outpPage = 1L;
        int totalCount = 0;  // ç»Ÿè®¡æ€»å…±é‡‡é›†çš„药品数量

        while (true) {
            serviceSLTDInhospReqVO.setCurrent(outpPage);
            serviceSLTDInhospReqVO.setSize(OUTP_PAGE_SIZE);
            log.info("【dealHisData】省立同德“药品数据”采集第{}页数据", outpPage);
            Boolean b = serviceSLTDHealthcareRecordService.queryMedicationItemList(serviceSLTDInhospReqVO);
            log.info("【dealHisData】省立同德“药品数据”采集结果：{}", b);
            outpPage++;
            log.info("【dealHisData】省立同德\"药品数据\"采集第{}页数据", outpPage);

            try {
                Integer fetchedCount = serviceSLTDHealthcareRecordService.queryMedicationItemList(serviceSLTDInhospReqVO);
                log.info("【dealHisData】省立同德\"药品数据\"第{}页采集到{}条记录", outpPage, fetchedCount);

                totalCount += fetchedCount != null ? fetchedCount : 0;

                // å¦‚果返回的数据量小于 pageSize，说明已经是最后一页了，退出循环
                if (fetchedCount == null || fetchedCount < OUTP_PAGE_SIZE) {
                    log.info("【dealHisData】省立同德\"药品数据\"采集完成，总页数:{}, æ€»è®¡{}条记录", outpPage, totalCount);
                    break;
                }

                outpPage++;
            } catch (Exception e) {
                log.error("【dealHisData】省立同德\"药品数据\"第{}页采集失败", outpPage, e);
                // å‡ºé”™æ—¶ä¹Ÿå¯ä»¥é€‰æ‹©é€€å‡ºæˆ–继续，这里选择退出避免无限重试
                break;
            }
        }
    }

@@ -686,7 +704,7 @@
    public void dealHisData2() {
        //将患者信息、出入院数据全部采集
        // æŒ‡å®šçš„开始日期
        LocalDate endDate = LocalDate.of(2025, 3, 3);
        LocalDate endDate = LocalDate.of(2026, 7, 6);
        // å½“前日期
        LocalDate currentDate = LocalDate.now();
        // å®šä¹‰æ—¥æœŸæ ¼å¼

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

@@ -540,4 +540,26 @@
    @ApiModelProperty("'满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2）")
    @Excel(name = " '满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2） ")
    private String inhospMydFlag;

    /**
     * è¯å“ç¼–码,多个用,分割
     */
    @ApiModelProperty("药品编码,多个用,分割")
    @Excel(name = "药品编码,多个用,分割")
    private String medicalCode;

    /**
     * è¯å“åç§°,多个用,分割
     */
    @ApiModelProperty("药品名称,多个用,分割")
    @Excel(name = "药品名称,多个用,分割")
    private String medicalName;

    /**
     * è¯å“å…¬å¸,多个用,分割
     */
    @ApiModelProperty("药品公司,多个用,分割")
    @Excel(name = "药品公司,多个用,分割")
    private String medicalCompany;

}

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

@@ -266,7 +266,7 @@
     */
    @Excel(name = "  å‘送人详情")
    @ApiModelProperty(value = "发送人详情")
    private String senderdetail;
    private String hospitaldistrictname;

    /**
     * å¾®ä¿¡

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

@@ -550,4 +550,26 @@
    @ApiModelProperty("'满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2）")
    @Excel(name = " '满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2） ")
    private String inhospMydFlag;

    /**
     * è¯å“ç¼–码,多个用,分割
     */
    @ApiModelProperty("药品编码,多个用,分割")
    @Excel(name = "药品编码,多个用,分割")
    private String medicalCode;

    /**
     * è¯å“åç§°,多个用,分割
     */
    @ApiModelProperty("药品名称,多个用,分割")
    @Excel(name = "药品名称,多个用,分割")
    private String medicalName;

    /**
     * è¯å“å…¬å¸,多个用,分割
     */
    @ApiModelProperty("药品公司,多个用,分割")
    @Excel(name = "药品公司,多个用,分割")
    private String medicalCompany;

}

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

@@ -435,5 +435,27 @@
    @ApiModelProperty("'满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2）")
    @Excel(name = " '满意度标识：0未做满度   1住院满度度  2出院满意度  ï¼ˆå¦‚果既要做住院，又要做出院，则用“,”分割，例如1,2） ")
    private String inhospMydFlag;

    /**
     * è¯å“ç¼–码,多个用,分割
     */
    @ApiModelProperty("药品编码,多个用,分割")
    @Excel(name = "药品编码,多个用,分割")
    private String medicalCode;

    /**
     * è¯å“åç§°,多个用,分割
     */
    @ApiModelProperty("药品名称,多个用,分割")
    @Excel(name = "药品名称,多个用,分割")
    private String medicalName;

    /**
     * è¯å“å…¬å¸,多个用,分割
     */
    @ApiModelProperty("药品公司,多个用,分割")
    @Excel(name = "药品公司,多个用,分割")
    private String medicalCompany;

}


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

@@ -414,6 +414,27 @@
    private String icd10name;

    /**
     * è¯å“ç¼–码
     */
    @ApiModelProperty("药品编码")
    @Excel(name = "药品编码")
    private String medicalCode;

    /**
     * è¯å“åŽ‚家
     */
    @ApiModelProperty("药品厂家")
    @Excel(name = "药品厂家")
    private String medicalCompany;

    /**
     * ç–¾ç—…名称
     */
    @ApiModelProperty("药品名称")
    @Excel(name = "药品名称")
    private String medicalName;

    /**
     * æ‰‹æœ¯ç¼–码
     */
    @ApiModelProperty("手术编码")
@@ -436,7 +457,7 @@
    /**
     * é€‚用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型、5、按任务组
     */
    @ApiModelProperty("适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型、5、按任务组")
    @ApiModelProperty("适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型、5、按任务组  6.按药品编码")
    @Excel(name = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型、5、按任务组")
    private String appltype;


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

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

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 java.util.Date;

/**
 * ä»»åŠ¡è¯å“å…³è”对象 service_taskmedical
 *
 * @author lihu
 * @date 2026-07-29
 */
@Data
@ApiModel("任务药品关联")
public class ServiceTaskmedical extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty("自增ID")
    //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /**
     * åŒ»é™¢æœºæž„ID
     */
    @ApiModelProperty("医院机构ID")
    @Excel(name = "医院机构ID")
    private String orgid;

    /**
     * ä»»åŠ¡id
     */
    @ApiModelProperty("任务id")
    @Excel(name = "任务id")
    private Long taskId;

    /**
     * ä»»åŠ¡åç§°
     */
    @ApiModelProperty("任务名称")
    @Excel(name = "任务名称")
    private String taskName;

    /**
     * æ˜¯å¦æ˜¯é•¿æœŸæ¨¡æ¿ï¼š  0：不是    1：是
     */
    @ApiModelProperty("是否是长期模板：  0：不是    1：是")
    @Excel(name = "是否是长期模板：  0：不是    1：是")
    private Long longtask;

    /**
     * æœåŠ¡ç±»åž‹(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)
     */
    @ApiModelProperty("服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    private String serviceType;

    /**
     * ç–¾ç—…id
     */
    @ApiModelProperty("疾病id")
    @Excel(name = "疾病id")
    private Long icd10id;

    /**
     * è¯å“ç¼–码
     */
    @ApiModelProperty("药品编码")
    @Excel(name = "药品编码")
    private String medicalCode;

    /**
     * è¯å“åç§°
     */
    @ApiModelProperty("药品名称")
    @Excel(name = "药品名称")
    private String medicalName;

    /**
     * è¯å“åŽ‚家
     */
    @ApiModelProperty("药品厂家")
    @Excel(name = "药品厂家")
    private String medicalCompany;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡å¿—（0：未上传 1：已上传）
     */
    @ApiModelProperty("上传标志（0：未上传 1：已上传）")
    @Excel(name = "上传标志", readConverterExp = "0=：未上传,1=：已上传")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @ApiModelProperty("上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date uploadTime;

    /**
     * GUID
     */
    @ApiModelProperty("GUID")
    @Excel(name = "GUID")
    private String guid;

    /**
     * çˆ¶GUID
     */
    @ApiModelProperty("父GUID")
    @Excel(name = "父GUID")
    private String pguid;

    /**
     * çˆ¶ID
     */
    @ApiModelProperty("父ID")
    @Excel(name = "父ID")
    private Long pid;

    /**
     * ç—…区编号
     */
    @ApiModelProperty("病区编号")
    @Excel(name = "病区编号")
    private String wardCode;

    /**
     * ç—…区名称
     */
    @ApiModelProperty("病区名称")
    @Excel(name = "病区名称")
    private String wardName;

    /**
     * ç§‘室编号
     */
    @ApiModelProperty("科室编号")
    @Excel(name = "科室编号")
    private String deptCode;

    /**
     * ç§‘室名称
     */
    @ApiModelProperty("科室名称")
    @Excel(name = "科室名称")
    private String deptName;

}


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

@@ -80,7 +80,7 @@
     */
    @Excel(name = "  å‘送人详情")
    @ApiModelProperty(value = "发送人详情")
    private String senderdetail;
    private String hospitaldistrictname;

    /**
     * ä»»åŠ¡ç±»åž‹(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)

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

@@ -80,7 +80,7 @@
     */
    @Excel(name = "  å‘送人详情")
    @ApiModelProperty(value = "发送人详情")
    private String senderdetail;
    private String hospitaldistrictname;

    /**
     * ä»»åŠ¡ç±»åž‹(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)

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

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

import com.smartor.domain.ServiceTaskmedical;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * ä»»åŠ¡è¯å“å…³è”Mapper接口
 *
 * @author lihu
 * @date 2026-07-29
 */
@Mapper
public interface ServiceTaskmedicalMapper
{
    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ä»»åŠ¡è¯å“å…³è”
     */
    public ServiceTaskmedical selectServiceTaskmedicalById(Long id);

    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”列表
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ä»»åŠ¡è¯å“å…³è”集合
     */
    public List<ServiceTaskmedical> selectServiceTaskmedicalList(ServiceTaskmedical serviceTaskmedical);

    /**
     * æ–°å¢žä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    public int insertServiceTaskmedical(ServiceTaskmedical serviceTaskmedical);

    /**
     * ä¿®æ”¹ä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    public int updateServiceTaskmedical(ServiceTaskmedical serviceTaskmedical);

    /**
     * åˆ é™¤ä»»åŠ¡è¯å“å…³è”
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskmedicalById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤ä»»åŠ¡è¯å“å…³è”
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskmedicalByIds(Long[] ids);
}

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

@@ -44,9 +44,9 @@
     * é‡‡é›†åœ¨é™¢æ‚£è€…用药信息
     *
     * @param reqVO æŸ¥è¯¢è¯·æ±‚参数
     * @return è¯å“åˆ—表
     * @return å®žé™…获取到的药品数据条数
     */
    Boolean queryMedicationItemList(ServiceSLTDInhospReqVO reqVO);
    Integer queryMedicationItemList(ServiceSLTDInhospReqVO reqVO);

    /**
     * é‡‡é›†åŒ»é™¢ç”¨æˆ·ä¿¡æ¯

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

@@ -62,7 +62,7 @@
     * @param ServiceSubtask å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    public int insertServiceSubtask(ServiceSubtask ServiceSubtask);
    public Map<String, Object> insertServiceSubtask(ServiceSubtask ServiceSubtask);

    /**
     * å†æ¬¡æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
@@ -82,6 +82,7 @@

    /**
     * å­ä»»åŠ¡æ¨¡æ¿ä¿®æ”¹
     *
     * @param serviceSubtaskTemplateVO
     * @return
     */
@@ -194,6 +195,7 @@

    /**
     * ç»Ÿè®¡é—®é¢˜çš„选项的百分比
     *
     * @param taskIds
     * @return
     */

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

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

import com.smartor.domain.ServiceTaskmedical;

import java.util.List;

/**
 * ä»»åŠ¡è¯å“å…³è”Service接口
 *
 * @author lihu
 * @date 2026-07-29
 */
public interface IServiceTaskmedicalService
{
    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ä»»åŠ¡è¯å“å…³è”
     */
    public ServiceTaskmedical selectServiceTaskmedicalById(Long id);

    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”列表
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ä»»åŠ¡è¯å“å…³è”集合
     */
    public List<ServiceTaskmedical> selectServiceTaskmedicalList(ServiceTaskmedical serviceTaskmedical);

    /**
     * æ–°å¢žä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    public int insertServiceTaskmedical(ServiceTaskmedical serviceTaskmedical);

    /**
     * ä¿®æ”¹ä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    public int updateServiceTaskmedical(ServiceTaskmedical serviceTaskmedical);

    /**
     * æ‰¹é‡åˆ é™¤ä»»åŠ¡è¯å“å…³è”
     *
     * @param ids éœ€è¦åˆ é™¤çš„任务药品关联主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskmedicalByIds(Long[] ids);

    /**
     * åˆ é™¤ä»»åŠ¡è¯å“å…³è”信息
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskmedicalById(Long id);
}

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

@@ -56,7 +56,7 @@
    @Autowired
    private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
    @Autowired
    private PatMedOperationMapper patMedOperationMapper;
    private ServiceTaskmedicalMapper serviceTaskmedicalMapper;
    @Autowired
    private PatMedOperationItemMapper patMedOperationItemMapper;
    @Autowired
@@ -256,17 +256,18 @@

    @Override
    public int dealOutHospInfo(String config) {
        PatMedInhosp pmks = new PatMedInhosp();
        pmks.setDeptcheckFlag("0");
        pmks.setInhospstate("1");
        pmks.setFuflag("1");
        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);

        //1.入院宣教
        String helibrarySwitch = iSysConfigService.selectConfigByKey("in.helibrary.switch");
        if (StringUtils.isNotEmpty(helibrarySwitch) && "2".equals(helibrarySwitch)) {
            PatMedInhosp inhosp = new PatMedInhosp();
            inhosp.setInDeptcheckFlag("0");
            inhosp.setInhospstate("0");
            inhosp.setFuflag("1");
            List<PatMedInhosp> inPatMedInhosps = patMedInhospMapper.selectPatMedInhospList(inhosp);

            //1.1 ç§‘室
            for (PatMedInhosp patMedInhosp1 : inPatMedInhosps) {
            for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
                //获取患者信息
                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
                if (Objects.isNull(patArchive)) {
@@ -306,9 +307,10 @@


            //1.2 ç—…区
            inhosp.setInDeptcheckFlag(null);
            inhosp.setInWardcheckFlag("0");
            List<PatMedInhosp> inPatMedInhospsWard = patMedInhospMapper.selectPatMedInhospList(inhosp);
            pmks.setInDeptcheckFlag(null);
            pmks.setInWardcheckFlag("0");
            pmks.setDeptcheckFlag(null);
            List<PatMedInhosp> inPatMedInhospsWard = patMedInhospMapper.selectPatMedInhospList(pmks);
            for (PatMedInhosp patMedInhosp1 : inPatMedInhospsWard) {
                //获取患者信息
                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
@@ -340,9 +342,42 @@
            }
        }

        //2.出院随访 - åŸºäºŽè§„则的任务生成
        addSubTaskByRule(config);
        //根据患者所在病区，获取该病区的长期任务,新华医院可以先不用根据病区和疾病来做
        //2.药品宣教
        for (PatMedInhosp patMedInhosp : patMedInhosps) {
            String medicalCode = patMedInhosp.getMedicalCode();
            if (StringUtils.isNotEmpty(medicalCode)) {
                String[] split = medicalCode.split(",");
                // é˜²å¾¡æ€§ç¼–程：确保 medicalCompany å’Œ medicalName ä¸ä¸º null
                String medicalCompanyStr = patMedInhosp.getMedicalCompany() != null ? patMedInhosp.getMedicalCompany() : "";
                String medicalNameStr = patMedInhosp.getMedicalName() != null ? patMedInhosp.getMedicalName() : "";
                String[] medicalCompanyArray = medicalCompanyStr.split(",");
                String[] medicalNameArray = medicalNameStr.split(",");

                for (int i = 0; i < split.length; i++) {
                    ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
                    //拿药品编码和公司去查
                    serviceTaskmedical.setMedicalCode(split[i]);
                    // é˜²æ­¢ä¸‹æ ‡è¶Šç•Œï¼šå¦‚果数组长度不一致，取最小长度
                    if (i < medicalCompanyArray.length) {
                        serviceTaskmedical.setMedicalName(medicalCompanyArray[i]);
                    } else {
                        log.warn("【药品宣教】药品编码{}对应的公司信息下标越界，medicalCompany æ•°ç»„长度={}, å½“前索引={}", split[i], medicalCompanyArray.length, i);
                        serviceTaskmedical.setMedicalName(""); // è¶Šç•Œæ—¶è®¾ç½®ä¸ºç©º
                    }
                    List<ServiceTaskmedical> serviceTaskmedicals = serviceTaskmedicalMapper.selectServiceTaskmedicalList(serviceTaskmedical);
                    if (CollectionUtils.isNotEmpty(serviceTaskmedicals)) {
                        PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp.getPatid());
                        writeInSubTask(serviceTaskmedicals.get(0).getTaskId(), false, patMedInhosp, patArchive, 0, config);
                    }
                    //查不到的药品就是不需要宣教的，就不管了
                }
            }
        }

        //3.出院随访 - åŸºäºŽè§„则的任务生成
        // èŽ·å–所有需要处理的出院患者（科室维度未处理）

        addSubTaskByRule(config, patMedInhosps);
        if (!active.equals("xh")) {
            addOperationSubTask(config);
        }
@@ -570,7 +605,7 @@
     * @param check         æ˜¯å¦éœ€è¦æ ¡éªŒ
     * @param patMedInhosp1 ç—…人出入院信息
     * @param patArchive    ç—…人信息
     * @param type          éšè®¿ç±»åž‹(1-科室，2-病区，3-疾病 4-入院科室 5-入院病区)
     * @param type          éšè®¿ç±»åž‹(0-宣教，1-科室，2-病区，3-疾病 4-入院科室 5-入院病区)
     * @param config        é…ç½®ä¿¡æ¯ visit.early.day
     */
    //将患者放到subtask中
@@ -1530,15 +1565,7 @@
     * æ ¹æ®æ‚£è€…离院科室或病区查询service_task_rule，获取deptRule、wradRule、diagRule
     * æ ¹æ®è§„则值决定调用哪个方法生成随访任务
     */
    private void addSubTaskByRule(String config) {
        // èŽ·å–所有需要处理的出院患者（科室维度未处理）
        PatMedInhosp pmks = new PatMedInhosp();
        pmks.setDeptcheckFlag("0");
        pmks.setInhospstate("1");
        pmks.setFuflag("1");
        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
        log.info("【基于规则】需要处理的出院患者信息：{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);

    private void addSubTaskByRule(String config, List<PatMedInhosp> patMedInhosps) {
        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
            // èŽ·å–患者基本信息
            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());

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

@@ -51,6 +51,8 @@

    @Autowired
    private PatArchiveMapper patArchiveMapper;
    @Autowired
    private ServiceTaskmedicalMapper serviceTaskmedicalMapper;


    /**
@@ -76,8 +78,8 @@
        PatMedOuthospQueryReq patMedOuthospQueryReq = DtoConversionUtils.sourceToTarget(patMedOuthosp, PatMedOuthospQueryReq.class);
        patMedOuthospQueryReq.setBeginAdmitdate(patMedOuthosp.getBeginTime());
        patMedOuthospQueryReq.setEndAdmitdate(patMedOuthosp.getEndTime());
        if(!CollectionUtils.isEmpty(patMedOuthosp.getDeptcodes())) {
            String result = String.join(",",   patMedOuthosp.getDeptcodes());
        if (!CollectionUtils.isEmpty(patMedOuthosp.getDeptcodes())) {
            String result = String.join(",", patMedOuthosp.getDeptcodes());
            patMedOuthospQueryReq.setDeptcode(result);
        }

@@ -309,7 +311,7 @@
        PatMedOuthospQueryReq req = new PatMedOuthospQueryReq();
        String deptcodes = CollectionUtils.isEmpty(patMedReq.getDeptcodeList()) ? null : String.join(",", patMedReq.getDeptcodeList());
        req.setBeginAdmitdate(patMedReq.getStartDate());
        req.setEndAdmitdate(DateUtils.addDays(patMedReq.getEndDate(),1));
        req.setEndAdmitdate(DateUtils.addDays(patMedReq.getEndDate(), 1));
        req.setDeptcode(deptcodes);
        req.setOrgid(patMedReq.getOrgid());
//        req.setCampusid(patMedReq.getCampusid());
@@ -537,7 +539,7 @@
     * @return
     */
    @Override
    public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp,Date adminDate, Integer visitTimeNum){
    public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp, Date adminDate, Integer visitTimeNum) {
        int hoursToAdd = visitTimeNum * 24;
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(adminDate);
@@ -555,7 +557,7 @@
        serviceSubtaskEntity0.setDeptcode(deptcode);
        serviceSubtaskEntity0.setSort(0);
        List<ServiceSubtask> serviceSubtaskList0 = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity0);
        if(!CollectionUtils.isEmpty(serviceSubtaskList0)){
        if (!CollectionUtils.isEmpty(serviceSubtaskList0)) {
            ServiceSubtask serviceSubtask0 = serviceSubtaskList0.get(0);
            serviceSubtask0.setSendstate(6L);
            serviceSubtask0.setUpdateTime(new Date());
@@ -570,7 +572,7 @@
            serviceSubtask1.setVisitTime(newDate);
            serviceSubtask1.setLongSendTime(newDate);
            i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask1);
        }else {
        } else {
            //查看已完成的任务
//            ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
//            serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());

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

@@ -111,28 +111,57 @@
    }

    @Override
    public Boolean queryMedicationItemList(ServiceSLTDInhospReqVO reqVO) {
    /**
     * æŸ¥è¯¢è¯å“ä¿¡æ¯åˆ—表
     * @return è¿”回实际获取到的药品数据条数，如果出错则返回 null
     */ public Integer queryMedicationItemList(ServiceSLTDInhospReqVO reqVO) {
        try {
            Map<String, Object> requestParams = buildRequestParams(reqVO);
            Map<String, String> headers = buildRequestHeaders();
            log.info("请求参药品信息地址：{},appKey:{}", sltdPubPath + "/hbos-thirdparty-integration/standard/base/mc/service/medication/queryMedicationInfoPage", APP_KEY);
            String result = HttpUtils.sendPostByHeader(sltdPubPath + "/hbos-thirdparty-integration/standard/base/mc/service/medication/queryMedicationInfoPage", new Gson().toJson(requestParams), headers);
            List<Map<String, Object>> dataList = getDataList(result, 2);
            log.info("【queryMedicationItemList】共获取到{}条药品数据", dataList.size());
            int successCount = 0;
            int failCount = 0;
            for (Map<String, Object> dataItem : dataList) {
                MedicationItem medicationItem = convertToMedication(dataItem);
                log.info("medicationItem的值为：{}", medicationItem);
                medicationItemMapper.insertMedicationItem(medicationItem);
                List<MedicationDoseInfo> doseInfoList = medicationItem.getDoseInfoList();
                for (MedicationDoseInfo doseInfo : doseInfoList) {
                    doseInfo.setMedicationItemId(medicationItem.getId());
                    medicationDoseInfoMapper.insertMedicationDoseInfo(doseInfo);
                try {
                    MedicationItem medicationItem = convertToMedication(dataItem);
                    log.info("准备插入药品数据：itemName={}, itemCode={}", medicationItem.getItemName(), medicationItem.getItemCode());
                    medicationItem.setCreateTime(new Date());
                    medicationItemMapper.insertMedicationItem(medicationItem);

                    // å¦‚果插入成功且返回了自增 ID，则插入子表
                    if (medicationItem.getId() != null) {
                        List<MedicationDoseInfo> doseInfoList = medicationItem.getDoseInfoList();
                        if (CollectionUtils.isNotEmpty(doseInfoList)) {
                            for (MedicationDoseInfo doseInfo : doseInfoList) {
                                try {
                                    doseInfo.setMedicationItemId(medicationItem.getId());
                                    medicationDoseInfoMapper.insertMedicationDoseInfo(doseInfo);
                                    log.debug("插入剂量信息成功：itemId={}, doseUnit={}", medicationItem.getId(), doseInfo.getDoseUnit());
                                } catch (Exception e) {
                                    log.warn("插入剂量信息失败：itemId={}, doseUnit={}, é”™è¯¯:{}", medicationItem.getId(), doseInfo.getDoseUnit(), e.getMessage(), e);
                                    failCount++;
                                }
                            }
                        }
                    }
                    successCount++;
                    log.info("✓ è¯å“æ•°æ®æ’入成功：{}", medicationItem.getItemName());
                } catch (Exception e) {
                    log.warn("【queryMedicationItemList】单条药品数据插入失败：itemName={}, itemCode={}, é”™è¯¯:{}", dataItem.get("itemName"), dataItem.get("itemCode"), e.getMessage(), e);
                    failCount++;
                    // ç»§ç»­å¤„理下一条数据，不中断整个循环
                }
            }
            log.info("【queryMedicationItemList】批量插入完成，总数:{}, æˆåŠŸ:{}, å¤±è´¥:{}", dataList.size(), successCount, failCount);
            // è¿”回实际获取到的药品数据条数，用于分页判断是否还有更多数据
            return dataList.size();
        } catch (Exception e) {
            log.error("【queryMedicationItemList】调用省立同德药品信息查询接口异常，请求参数：{}", reqVO, e);
            throw new RuntimeException(e);
        }
        return true;
    }


@@ -868,7 +897,160 @@
            }
        }

        if (active.equals("nhfy") || active.equals("sltd")) {
            Map<String, String> drugInfoMap = queryMedicalOrders(dto);
            if (drugInfoMap != null && !drugInfoMap.isEmpty()) {
                patMedInhosp.setMedicalName(drugInfoMap.get("drugItemNames"));
                patMedInhosp.setMedicalCode(drugInfoMap.get("drugItemIds"));
                patMedInhosp.setMedicalCompany(drugInfoMap.get("drugManufacturerNames"));

                log.info("获取药品信息成功：名称={}, ç¼–码={}, åŽ‚家={}", drugInfoMap.get("drugItemNames"), drugInfoMap.get("drugItemIds"), drugInfoMap.get("drugManufacturerNames"));
            }
        }
        return patMedInhosp;
    }

    /**
     * æŸ¥è¯¢åŒ»å˜±ä¿¡æ¯å¹¶æ‹¼æŽ¥è¯å“ä¿¡æ¯
     *
     * @param dto å¥åº·è®°å½•è¯·æ±‚对象
     * @return è¿”回包含三个字段 Map：
     * - drugItemNames: è¯å“åç§°åˆ—表（逗号分隔）
     * - drugItemIds: è¯å“ç¼–码列表（逗号分隔）
     * - drugManufacturerNames: è¯å“åŽ‚家列表（逗号分隔）
     * <p>
     * è§„则：
     * 1. ä¸‰ä¸ªå­—段顺序位置保持一致
     * 2. å¦‚果三个字段都为空，则跳过该记录
     * 3. å¦‚果至少有一个字段有值，则其他两个为空用空字符串代替
     */
    private Map<String, String> queryMedicalOrders(ServiceSLTDInhospResDTO dto) {
        Map<String, String> result = new HashMap<>();
        List<String> itemNames = new ArrayList<>();
        List<String> itemIds = new ArrayList<>();
        List<String> manufacturerNames = new ArrayList<>();

        try {
            // èŽ·å–患者的医嘱信息
            Map<String, Object> medicineInfoReq = new HashMap<>();
            medicineInfoReq.put("orgId", dto.getOrgId());
            medicineInfoReq.put("patientId", dto.getPatientId());
            medicineInfoReq.put("campusId", dto.getCampusId());
            medicineInfoReq.put("medicalRecordNo", dto.getMedicalRecordNo());
            log.info("【queryMedicalOrders】请求参数：{}", medicineInfoReq);
            Map<String, String> headers = buildRequestHeaders();
            String resultStr = HttpUtils.sendPostByHeader(sltdPubPath + "/osj/hbos-thirdparty-integration/standard/common/doctorOrder/queryDoctorOrderList", new Gson().toJson(medicineInfoReq), headers);

            if (StringUtils.isEmpty(resultStr)) {
                log.warn("【queryMedicalOrders】接口返回为空，patientId={}", dto.getPatientId());
                return result;
            }

            // è§£æžè¿”回数据
            Gson gson = new Gson();
            Type mapType = new TypeToken<Map<String, Object>>() {
            }.getType();
            Map<String, Object> responseMap = gson.fromJson(resultStr, mapType);

            // æ£€æŸ¥è¿”回码
            Object codeObj = responseMap.get("code");
            if (codeObj != null) {
                String code = BigDecimal.valueOf(((Number) codeObj).longValue()).toPlainString();
                if (!"200".equals(code)) {
                    log.error("【queryMedicalOrders】接口返回失败，code={}, message={}", code, responseMap.get("message"));
                    return result;
                }
            }

            // èŽ·å– data æ•°ç»„
            Object dataObj = responseMap.get("data");
            if (dataObj instanceof List) {
                List<?> dataList = (List<?>) dataObj;

                // éåŽ†åŒ»å˜±åˆ—表，提取药品信息
                Set<String> processedItemIds = new HashSet<>(); // ç”¨äºŽåŽ»é‡ï¼ˆåªæ ¹æ® itemId åŽ»é‡ï¼‰
                
                for (Object item : dataList) {
                    if (item instanceof Map) {
                        Map<String, Object> itemMap = (Map<String, Object>) item;

                        // åªå¤„理药品相关的医嘱（itemDomain ä¸º FH0134.01 è¡¨ç¤ºè¯å“ï¼‰
                        Object itemDomainObj = itemMap.get("itemDomain");
                        if (itemDomainObj == null || !"FH0134.01".equals(itemDomainObj.toString())) {
                            continue;
                        }

                        // èŽ·å–三个字段
                        Object itemNameObj = itemMap.get("itemName");
                        Object itemIdObj = itemMap.get("itemId");
                        Object manufacturerNameObj = itemMap.get("manufacturerName");

                        // åˆ¤æ–­æ˜¯å¦éƒ½ä¸ºç©º
                        boolean allEmpty = (itemNameObj == null || StringUtils.isEmpty(itemNameObj.toString())) && (itemIdObj == null || StringUtils.isEmpty(itemIdObj.toString())) && (manufacturerNameObj == null || StringUtils.isEmpty(manufacturerNameObj.toString()));

                        // å¦‚果三个都为空，则跳过
                        if (allEmpty) {
                            continue;
                        }

                        // è‡³å°‘有一个有值，处理每个字段
                        String itemName = (itemNameObj != null && StringUtils.isNotEmpty(itemNameObj.toString())) ? itemNameObj.toString() : "";
                        
                        // itemId ç‰¹æ®Šå¤„理：避免科学计数法（Gson å¯èƒ½å°†æ•°å­—解析为 Double）
                        String itemId = "";
                        if (itemIdObj != null && StringUtils.isNotEmpty(itemIdObj.toString())) {
                            if (itemIdObj instanceof Number) {
                                // å¦‚果是数值类型，转换为整数字符串，避免科学计数法
                                itemId = String.valueOf(((Number) itemIdObj).longValue());
                            } else {
                                itemId = itemIdObj.toString();
                            }
                        }
                        
                        String manufacturerName = (manufacturerNameObj != null && StringUtils.isNotEmpty(manufacturerNameObj.toString())) ? manufacturerNameObj.toString() : "";

                        // åªæ ¹æ® itemId åŽ»é‡ï¼ˆåŒä¸€ç¼–码的药品只保留一个）
                        if (StringUtils.isNotEmpty(itemId)) {
                            if (processedItemIds.contains(itemId)) {
                                log.info("【queryMedicalOrders】跳过重复药品（相同编码）：名称={}, ç¼–码={}", itemName, itemId);
                                continue;
                            }
                            processedItemIds.add(itemId);
                        } else {
                            // itemId ä¸ºç©ºæ—¶ï¼Œä½¿ç”¨ itemName ä½œä¸ºåŽ»é‡ä¾æ®
                            if (processedItemIds.contains(itemName)) {
                                log.info("【queryMedicalOrders】跳过重复药品（相同名称）：名称={}", itemName);
                                continue;
                            }
                            processedItemIds.add(itemName);
                        }

                        // æ·»åŠ åˆ°åˆ—表
                        itemNames.add(itemName);
                        itemIds.add(itemId);
                        manufacturerNames.add(manufacturerName);

                        log.info("【queryMedicalOrders】提取药品信息：名称={}, ç¼–码={}, åŽ‚家={}", itemName, itemId, manufacturerName);
                    }
                }
            } else {
                log.info("【queryMedicalOrders】data ä¸æ˜¯æ•°ç»„类型，patientId={}", dto.getPatientId());
            }

            // å°†åˆ—表拼接成逗号分隔的字符串
            if (!itemNames.isEmpty()) {
                result.put("drugItemNames", String.join(",", itemNames));
                result.put("drugItemIds", String.join(",", itemIds));
                result.put("drugManufacturerNames", String.join(",", manufacturerNames));
            }

            log.info("【queryMedicalOrders】成功提取{}条药品信息，patientId={}", itemNames.size(), dto.getPatientId());

        } catch (Exception e) {
            log.error("【queryMedicalOrders】查询医嘱信息失败，patientId={}", dto.getPatientId(), e);
        }

        return result;
    }

    private void setDischargeInfo(PatMedInhosp patMedInhosp, ServiceSLTDInhospResDTO dto) {
@@ -928,11 +1110,7 @@
                if (importanceFlagCodeListObj instanceof List) {
                    List<?> importanceFlagCodeList = (List<?>) importanceFlagCodeListObj;
                    // è¿‡æ»¤æŽ‰ null å€¼
                    List<String> nonNullList = importanceFlagCodeList.stream()
                            .filter(Objects::nonNull)
                            .map(Object::toString)
                            .filter(StringUtils::isNotEmpty)
                            .collect(Collectors.toList());
                    List<String> nonNullList = importanceFlagCodeList.stream().filter(Objects::nonNull).map(Object::toString).filter(StringUtils::isNotEmpty).collect(Collectors.toList());

                    if (!nonNullList.isEmpty()) {
                        String importanceFlagLabel;

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

@@ -81,6 +81,9 @@
    private ISvyLibTemplateScriptService svyLibTemplateScriptService;

    @Autowired
    private ISvyTaskTemplateTargetoptionService svyTaskTemplateTargetoptionService;

    @Autowired
    private IIvrTaskTemplateService ivrTaskTemplateService;

    @Autowired
@@ -208,6 +211,10 @@
                List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
                log.info("问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());

                //校验一下题的序号是否有问题 (如果根据选项无序跳转，就会导致错误)
                cacheList = checkQuestionSort(cacheList);

                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
@@ -341,6 +348,8 @@
            String isabnormalFlag = "0";
            if (serviceSubTaskCacheReq.getType() == 2) {
                List<SvyTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS();
                //检查并修正问卷题目排序
                cacheList = checkQuestionSort(cacheList);
                cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
                log.info("问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
                // é¢„查询循环中不变的数据，避免每题重复查数据库
@@ -352,90 +361,89 @@
                ServiceTask preServiceTask = serviceTaskService.selectServiceTaskByTaskid(tid);
                Map<Long, Long> preDetailIdMap = getExistingDetailIdMap(subid);
                Map<Long, Long> preTraceIdMap = getExistingTraceIdMap(subid);

                // æå‰å®šä½ç¬¬ä¸€é¢˜çš„索引，避免后续嵌套循环
                Integer firstSortIndex = -1;
                if (CollectionUtils.isNotEmpty(cacheList)) {
                    for (int j = 0; j < cacheList.size(); j++) {
                        if (cacheList.get(j).getSort() != null && cacheList.get(j).getSort() == 1L) {
                            firstSortIndex = j;
                            break;
                        }
                    }
                }

                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
                        for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
                            if (svyTaskTemplateScriptVO.getSort() == 1L) {
                                //说明是第一题
                                List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
                                svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                                Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
                                if (map == null) continue;
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = Double.valueOf(map.get("score"));
                                } else {
                                    score = score + Double.valueOf(map.get("score"));
                                }
                                isabnormalFlag = map.get("isabnormal");
                            }
                        }
                    SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
                    log.info("svyTaskTemplateScriptVO çš„信息为：{}，i çš„值为：{}", svyTaskTemplateScriptVO.getScriptno(), i);
                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
                    svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);

                    } else {
                        SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
                        log.info("svyTaskTemplateScriptVO的信息为：{}，i的值为：{}", svyTaskTemplateScriptVO.getScriptno(), i);
                        List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
                        svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                    // å¦‚果是第一题或者匹配 nextScriptno çš„题目
                    boolean shouldProcess = false;
                    if (i == firstSortIndex) {
                        shouldProcess = true;
                    } else if (nextScriptno != null && svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                        shouldProcess = true;
                    }

                        if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                            Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
                            log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo"));
                            if (!Objects.isNull(map.get("nextScriptNo")))
                                nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                            if (score == null) {
                                score = Double.valueOf(map.get("score"));
                            } else {
                                score = score + Double.valueOf(map.get("score"));
                            }
                            isabnormalFlag = map.get("isabnormal");
                    if (shouldProcess) {
                        Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
                        log.error("nextScriptNo çš„信息为：{}", map.get("nextScriptNo"));
                        if (map == null) continue;

                        if (!Objects.isNull(map.get("nextScriptNo")))
                            nextScriptno = Long.valueOf(map.get("nextScriptNo"));

                        if (score == null) {
                            score = Double.valueOf(map.get("score"));
                        } else {
                            score = score + Double.valueOf(map.get("score"));
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
                }
            } else if (serviceSubTaskCacheReq.getType() == 1) {
                List<IvrTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList();
                cacheList.sort(Comparator.comparingLong(vo -> Optional.ofNullable(vo.getSort()).orElse(0)));
                log.error("电话随访问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());

                // æå‰å®šä½ç¬¬ä¸€é¢˜çš„索引
                Integer firstIvrSortIndex = -1;
                if (CollectionUtils.isNotEmpty(cacheList)) {
                    for (int j = 0; j < cacheList.size(); j++) {
                        if (cacheList.get(j).getSort() != null && cacheList.get(j).getSort() == 1L) {
                            firstIvrSortIndex = j;
                            break;
                        }
                    }
                }

                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
                        for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
                            if (ivrTaskTemplateScriptVO.getSort() != null && ivrTaskTemplateScriptVO.getSort() == 1L) {
                                //说明是第一题
                                List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList();
                                ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
                                //它俩都是ivr_task_templatescript_id,所以这里需要设置一下
                                ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());
                                Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = Double.valueOf(map.get("score"));
                                } else {
                                    score = score + Double.valueOf(map.get("score"));
                                }
                                isabnormalFlag = map.get("isabnormal");
                            }
                        }
                    IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
                    List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
                    ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
                    //它俩都是 ivr_task_templatescript_id,所以这里需要设置一下
                    ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());

                    } else {
                        IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
                        List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
                        ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
                    boolean shouldProcess = false;
                    if (i == firstIvrSortIndex) {
                        shouldProcess = true;
                    } else if (nextScriptno != null && ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
                        shouldProcess = true;
                    }

                        if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
                            Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
                            log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo"));
                            if (!Objects.isNull(map.get("nextScriptNo")))
                                nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                            if (score == null) {
                                score = Double.valueOf(map.get("score"));
                            } else {
                                score = score + Double.valueOf(map.get("score"));
                            }
                            isabnormalFlag = map.get("isabnormal");
                    if (shouldProcess) {
                        Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
                        log.error("----nextScriptNo2 çš„信息为：{}", map.get("nextScriptNo"));
                        if (!Objects.isNull(map.get("nextScriptNo")))
                            nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                        if (score == null) {
                            score = Double.valueOf(map.get("score"));
                        } else {
                            score = score + Double.valueOf(map.get("score"));
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
                }
            }
@@ -515,52 +523,46 @@
            Double score = null;
            List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS();
            Long nextScriptno = null;

            // æå‰å®šä½ç¬¬ä¸€é¢˜çš„索引
            Integer firstMydSortIndex = -1;
            if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptVOS)) {
                for (int j = 0; j < svyTaskTemplateScriptVOS.size(); j++) {
                    if (svyTaskTemplateScriptVOS.get(j).getSort() != null && svyTaskTemplateScriptVOS.get(j).getSort() == 1L) {
                        firstMydSortIndex = j;
                        break;
                    }
                }
            }

            for (int i = 0; i < svyTaskTemplateScriptVOS.size(); i++) {
                if (i == 0) {
                    //这个时间要找到第一题
                    for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
                        if (svyTaskTemplateScriptVO.getSort() == 1L) {
                            //说明是第一题
//                            SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(0), SvyTaskTemplateScriptVO.class);
                            List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(0).getSvyTaskTemplateTargetoptions();
//                            List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyTaskTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
                            svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                            Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
                            if (map == null) continue;
                            if (!Objects.isNull(map.get("nextScriptNo")))
                                nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                            if (score == null) {
                                score = Double.valueOf(map.get("score"));
                            } else {
                                score = score + Double.valueOf(map.get("score"));
                            }
                            if (!Objects.isNull(map.get("id"))) {
                                idList.add(Long.valueOf(map.get("id")));
                            }
                        }
                SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = svyTaskTemplateScriptVOS.get(i);
                List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(i).getSvyTaskTemplateTargetoptions();
                svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);

                boolean shouldProcess = false;
                if (i == firstMydSortIndex) {
                    shouldProcess = true;
                } else if (nextScriptno != null && svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                    shouldProcess = true;
                }

                if (shouldProcess) {
                    Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
                    if (map == null) continue;

                    log.error("nextScriptNo çš„信息为：{}", map.get("nextScriptNo"));
                    if (!Objects.isNull(map.get("nextScriptNo")))
                        nextScriptno = Long.valueOf(map.get("nextScriptNo"));

                    if (score == null) {
                        score = Double.valueOf(map.get("score"));
                    } else {
                        score = score + Double.valueOf(map.get("score"));
                    }

                } else {
                    SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = svyTaskTemplateScriptVOS.get(i);
//                    SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(i), SvyTaskTemplateScriptVO.class);
                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(i).getSvyTaskTemplateTargetoptions();
//                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(i).getSvyLibTemplateTargetoptions(), SvyTaskTemplateTargetoption.class);
                    svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);

                    if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                        log.error("svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO);
                        Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
                        log.error("map的信息为：{}", map);
                        if (!Objects.isNull(map.get("nextScriptNo")))
                            nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                        if (score == null) {
                            score = Double.valueOf(map.get("score"));
                        } else {
                            score = score + Double.valueOf(map.get("score"));
                        }
                        if (!Objects.isNull(map.get("id"))) {
                            idList.add(Long.valueOf(map.get("id")));
                        }
                    if (!Objects.isNull(map.get("id"))) {
                        idList.add(Long.valueOf(map.get("id")));
                    }
                }
            }
@@ -1342,4 +1344,127 @@
        map.put("isabnormal", isabnormalFlag);
        return map;
    }

    /**
     * æ£€æŸ¥å¹¶ä¿®æ­£é—®å·é¢˜ç›®æŽ’序(如果根据选项无序跳转，就会导致错误)
     *
     * @param svyTaskTemplateScriptVOList é—®å·é¢˜ç›® VO åˆ—表
     * @return ä¿®æ­£åŽçš„问卷题目列表
     */
    public List<SvyTaskTemplateScriptVO> checkQuestionSort(List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOList) {
        if (CollectionUtils.isEmpty(svyTaskTemplateScriptVOList)) {
            return svyTaskTemplateScriptVOList;
        }

        // æŒ‰å½“前 sort æŽ’序
        svyTaskTemplateScriptVOList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));

        // å…ˆæ£€æŸ¥ä¸€ä¸‹æ˜¯å¦å·²ç»æ˜¯æ­£ç¡®çš„顺序：连续的序号 1,2,3... ä¸”最后一个问题的 nextScriptno ä¸º "0"
        boolean isCorrect = true;
        int expectedValue = 1;

        for (int i = 0; i < svyTaskTemplateScriptVOList.size(); i++) {
            SvyTaskTemplateScriptVO vo = svyTaskTemplateScriptVOList.get(i);

            // æ£€æŸ¥ sort æ˜¯å¦è¿žç»­
            if (!Objects.equals(expectedValue, vo.getSort())) {
                isCorrect = false;
                break;
            }

            // å¦‚果不是最后一个问题，检查 nextScriptno æ˜¯å¦æ˜¯ä¸‹ä¸€é¢˜çš„序号
            if (i < svyTaskTemplateScriptVOList.size() - 1) {
                String expectedNextScriptNo = String.valueOf(expectedValue + 1);
                if (!expectedNextScriptNo.equals(vo.getNextScriptno())) {
                    isCorrect = false;
                    break;
                }
            } else {
                // æœ€åŽä¸€ä¸ªé—®é¢˜çš„ nextScriptno å¿…须是 "0"
                if (!"0".equals(vo.getNextScriptno())) {
                    isCorrect = false;
                    break;
                }

                // æ£€æŸ¥æœ€åŽä¸€ä¸ªé—®é¢˜çš„所有选项的 nextQuestion æ˜¯å¦ä¸º 0
                if (CollectionUtils.isNotEmpty(vo.getSvyTaskTemplateTargetoptions())) {
                    for (SvyTaskTemplateTargetoption option : vo.getSvyTaskTemplateTargetoptions()) {
                        if (option.getNextQuestion() == null || !option.getNextQuestion().equals(0)) {
                            isCorrect = false;
                            break;
                        }
                    }
                }
            }

            expectedValue++;
        }

        // å¦‚果已经是正确的，直接返回，不再进行数据库更新
        if (isCorrect) {
            log.debug("问卷题目排序正确，无需修正，共 {} ä¸ªé¢˜ç›®", svyTaskTemplateScriptVOList.size());
            return svyTaskTemplateScriptVOList;
        }

        log.info("检测到问卷题目需要修正，开始处理...");

        // é‡æ–°åˆ†é…è¿žç»­çš„ sort å€¼ï¼š1, 2, 3...
        int newSortValue = 1;
        List<SvyTaskTemplateScriptVO> updatedList = new ArrayList<>();

        for (int i = 0; i < svyTaskTemplateScriptVOList.size(); i++) {
            SvyTaskTemplateScriptVO vo = svyTaskTemplateScriptVOList.get(i);
            Long oldSort = vo.getSort();

            // å¦‚æžœ sort ä¸æ˜¯é¢„期的连续值，则需要更新
            if (!Objects.equals(newSortValue, oldSort)) {
                log.warn("检测到题目序号不连续，题目 ID: {}，原 sort: {}, æ–° sort: {}", vo.getId(), oldSort, newSortValue);
                vo.setSort((long) newSortValue);
            }

            // å¤„理下一个问题的 nextScriptno：除最后一个外，nextScriptno = å½“前 sort + 1
            if (i < svyTaskTemplateScriptVOList.size() - 1) {
                String expectedNextScriptNo = String.valueOf(newSortValue + 1);
                String currentNextScriptNo = vo.getNextScriptno();
                if (!Objects.equals(expectedNextScriptNo, currentNextScriptNo)) {
                    log.warn("检测到 nextScriptno ä¸æ­£ç¡®ï¼Œé¢˜ç›® ID: {}，原 nextScriptno: {}, æ–° nextScriptno: {}", vo.getId(), currentNextScriptNo, expectedNextScriptNo);
                    vo.setNextScriptno(expectedNextScriptNo);
                }
            } else {
                // æœ€åŽä¸€ä¸ªé—®é¢˜çš„ nextScriptno å¿…须是 "0"
                String currentNextScriptNo = vo.getNextScriptno();
                if (!"0".equals(currentNextScriptNo)) {
                    log.warn("检测到最后一个题目的 nextScriptno åº”为 0，题目 ID: {}，原 nextScriptno: {}", vo.getId(), currentNextScriptNo);
                    vo.setNextScriptno("0");
                }
            }

            // å¤„理每个选项的 nextQuestion
            if (CollectionUtils.isNotEmpty(vo.getSvyTaskTemplateTargetoptions())) {
                // åˆ¤æ–­æ˜¯å¦æ˜¯æœ€åŽä¸€ä¸ªé—®é¢˜
                boolean isLastQuestion = (i == svyTaskTemplateScriptVOList.size() - 1);
                int expectedNextQuestion = isLastQuestion ? 0 : newSortValue;

                for (SvyTaskTemplateTargetoption option : vo.getSvyTaskTemplateTargetoptions()) {
                    Integer optionNextQuestion = option.getNextQuestion();
                    int finalNextQuestion = expectedNextQuestion;

                    if (!isLastQuestion && (optionNextQuestion == null || !optionNextQuestion.equals(newSortValue))) {
                        log.info("检测到选项的 nextQuestion ä¸æ­£ç¡®ï¼Œé€‰é¡¹ ID: {}，题目 ID: {}，原 nextQuestion: {}, æ–° nextQuestion: {}", option.getId(), vo.getId(), optionNextQuestion, newSortValue);
                        finalNextQuestion = newSortValue;
                    } else if (isLastQuestion && (optionNextQuestion == null || !optionNextQuestion.equals(0))) {
                        log.info("检测到最后一个问题的选项 nextQuestion åº”为 0，选项 ID: {}，题目 ID: {}，原 nextQuestion: {}, æ–° nextQuestion: {}", option.getId(), vo.getId(), optionNextQuestion, 0);
                    }

                    option.setNextQuestion(finalNextQuestion);
                }
            }

            updatedList.add(vo);
            newSortValue++;
        }

        return updatedList;
    }

}

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

@@ -86,6 +86,8 @@

    @Autowired
    private IServiceTaskdeptService serviceTaskdeptService;
    @Autowired
    private IServiceTaskmedicalService serviceTaskmedicalService;

    @Autowired
    private IServiceTaskdiagService serviceTaskdiagService;
@@ -600,9 +602,30 @@
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceSubtask(ServiceSubtask serviceSubtask) {
    public Map<String, Object> insertServiceSubtask(ServiceSubtask serviceSubtask) {
        serviceSubtask.setCreateTime(DateUtils.getNowDate());
        return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
        serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
        RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
        String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
        String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
        String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
        ServiceOutPath serviceOutPath = new ServiceOutPath();
        serviceOutPath.setParam1(taskId);
        serviceOutPath.setParam2(patid);
        serviceOutPath.setCreateTime(new Date());
        serviceOutPath.setParam6(subId);
        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
        //转成16进制
        String format = String.format("%03X", serviceOutPath.getId());
        serviceOutPath.setRadix(format);
        serviceOutPath.setUpdateTime(new Date());
        iServiceOutPathService.updateServiceOutPath(serviceOutPath);

        Map<String, Object> result = new HashMap<>();
        result.put("url", localIP + ":" + req_path + "/wt?p=" + format);
        result.put("subId",serviceSubtask.getId());
        return result;
    }

    /**
@@ -873,6 +896,36 @@

                    log.info("----serviceTaskSchedule的值为：{}", scheduleVO);
                    serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
                } else if (serviceTaskVO.getAppltype().equals("6")) {
                    ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
                    serviceTaskmedical.setTaskId(serviceTask.getTaskid());
                    serviceTaskmedical.setTaskName(serviceTask.getTaskName());
                    serviceTaskmedical.setServiceType(serviceTaskVO.getServiceType());
                    serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskmedical.setLongtask(1L);
                    serviceTaskmedical.setMedicalCode(serviceTaskVO.getIcd10code());
                    serviceTaskmedical.setMedicalName(serviceTaskVO.getIcd10name());
                    serviceTaskmedical.setGuid(serviceTask.getGuid());
                    serviceTaskmedical.setOrgid(serviceTask.getOrgid());
                    serviceTaskmedical.setCreateTime(new Date());
                    serviceTaskmedical.setDeptCode(serviceTaskVO.getDeptcode());
                    serviceTaskmedical.setDeptName(serviceTaskVO.getDeptname());
                    serviceTaskmedical.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
                    serviceTaskmedical.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
                    //南华附一的icd10code是有重复的，所以不能用南华附一的icd10code去查询
                    log.info("----serviceTaskmedical的值为：{}", serviceTaskmedical);
                    if (!StringUtils.isEmpty(serviceTaskVO.getMedicalName())) {
                        String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
                        String[] medicalcodes = serviceTaskVO.getMedicalCode().split(",");
                        String[] medicalCompanys = serviceTaskVO.getMedicalCompany().split(",");
                        for (int i = 0; i < medicalNames.length; i++) {
                            serviceTaskmedical.setMedicalCode(medicalNames[i]);
                            serviceTaskmedical.setMedicalName(medicalcodes[i]);
                            if (ObjectUtils.isNotEmpty(medicalCompanys))
                                serviceTaskmedical.setMedicalCompany(medicalcodes[i]);
                            serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
                        }
                    }
                } else {
                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                    serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -1146,6 +1199,51 @@
                        }
                    }

                } else if (serviceTaskVO.getAppltype().equals("6")) {
                    ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
                    serviceTaskmedical.setTaskId(serviceTask.getTaskid());
                    serviceTaskmedical.setTaskName(serviceTask.getTaskName());
                    if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
                        throw new BaseException("药品编码为空");
                    }
                    serviceTaskmedical.setLongtask(Long.valueOf(serviceTask.getLongTask()));
                    serviceTaskmedical.setMedicalName(serviceTaskVO.getMedicalName());
                    serviceTaskmedical.setGuid(serviceTask1.getGuid());
                    serviceTaskmedical.setServiceType(serviceTask1.getServiceType());
                    serviceTaskmedical.setOrgid(serviceTask1.getOrgid());
                    serviceTaskmedical.setDeptCode(serviceTask1.getDeptcode());
                    serviceTaskmedical.setDeptName(serviceTask1.getDeptname());
                    serviceTaskmedical.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
                    serviceTaskmedical.setWardName(serviceTask1.getLeavehospitaldistrictname());
                    serviceTaskmedical.setUpdateTime(new Date());
                    if (StringUtils.isNotEmpty(serviceTaskVO.getMedicalCode())) {
                        String[] medicalCodes = serviceTaskVO.getMedicalCode().split(",");
                        String[] medicalNames = serviceTaskVO.getMedicalName().split(",");
                        String[] medicalCompany = serviceTaskVO.getMedicalCompany().split(",");
                        if (!active.equals("nhfy") && !active.equals("druid")) {
                            if (medicalCodes.length != medicalNames.length) {
                                throw new BaseException("药品编码和药品名称数量不一致");
                            }
                        }
                        for (int i = 0; i < medicalCodes.length; i++) {
                            //先查询一下是否存在
                            ServiceTaskmedical serviceTaskmedical1 = new ServiceTaskmedical();
                            serviceTaskmedical1.setTaskId(serviceTaskVO.getTaskid());
                            serviceTaskmedical1.setMedicalCode(medicalCodes[i]);
                            serviceTaskmedical1.setMedicalName(medicalNames[i]);
                            List<ServiceTaskmedical> serviceTaskmedicals = serviceTaskmedicalService.selectServiceTaskmedicalList(serviceTaskmedical1);
                            serviceTaskmedical.setMedicalCode(medicalCodes[i]);
                            serviceTaskmedical.setMedicalName(medicalNames[i]);
                            log.info("----serviceTaskmedical更新的值为：{}", serviceTaskmedical);
                            if (CollectionUtils.isNotEmpty(serviceTaskmedicals)) {
                                serviceTaskmedical.setId(serviceTaskmedicals.get(0).getId());
                                serviceTaskmedicalService.updateServiceTaskmedical(serviceTaskmedical);
                            } else {
                                serviceTaskmedicalService.insertServiceTaskmedical(serviceTaskmedical);
                            }
                        }
                    }

                } else if (serviceTaskVO.getAppltype().equals("4")) {
                    ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
//                    if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.ServiceTaskmedical;
import com.smartor.mapper.ServiceTaskmedicalMapper;
import com.smartor.service.IServiceTaskmedicalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä»»åŠ¡è¯å“å…³è”Service业务层处理
 *
 * @author lihu
 * @date 2026-07-29
 */
@Service
public class ServiceTaskmedicalServiceImpl implements IServiceTaskmedicalService
{
    @Autowired
    private ServiceTaskmedicalMapper serviceTaskmedicalMapper;

    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ä»»åŠ¡è¯å“å…³è”
     */
    @Override
    public ServiceTaskmedical selectServiceTaskmedicalById(Long id)
    {
        return serviceTaskmedicalMapper.selectServiceTaskmedicalById(id);
    }

    /**
     * æŸ¥è¯¢ä»»åŠ¡è¯å“å…³è”列表
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ä»»åŠ¡è¯å“å…³è”
     */
    @Override
    public List<ServiceTaskmedical> selectServiceTaskmedicalList(ServiceTaskmedical serviceTaskmedical)
    {
        return serviceTaskmedicalMapper.selectServiceTaskmedicalList(serviceTaskmedical);
    }

    /**
     * æ–°å¢žä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceTaskmedical(ServiceTaskmedical serviceTaskmedical)
    {
        serviceTaskmedical.setCreateTime(DateUtils.getNowDate());
        return serviceTaskmedicalMapper.insertServiceTaskmedical(serviceTaskmedical);
    }

    /**
     * ä¿®æ”¹ä»»åŠ¡è¯å“å…³è”
     *
     * @param serviceTaskmedical ä»»åŠ¡è¯å“å…³è”
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceTaskmedical(ServiceTaskmedical serviceTaskmedical)
    {
        serviceTaskmedical.setUpdateTime(DateUtils.getNowDate());
        return serviceTaskmedicalMapper.updateServiceTaskmedical(serviceTaskmedical);
    }

    /**
     * æ‰¹é‡åˆ é™¤ä»»åŠ¡è¯å“å…³è”
     *
     * @param ids éœ€è¦åˆ é™¤çš„任务药品关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskmedicalByIds(Long[] ids)
    {
        return serviceTaskmedicalMapper.deleteServiceTaskmedicalByIds(ids);
    }

    /**
     * åˆ é™¤ä»»åŠ¡è¯å“å…³è”信息
     *
     * @param id ä»»åŠ¡è¯å“å…³è”主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskmedicalById(Long id)
    {
        return serviceTaskmedicalMapper.deleteServiceTaskmedicalById(id);
    }
}

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

@@ -284,8 +284,8 @@
    private Map<String, String> buildRequestHeaders(LocalDateTime startTime) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
        Map<String, String> header = new HashMap<>();
        header.put("x-hcsb-serviceno", "IS044056");
//        header.put("x-hcsb-serviceno", "IS002347");
//        header.put("x-hcsb-serviceno", "IS044056");
        header.put("x-hcsb-serviceno", "IS002347");
        header.put("x-hcsb-version", "2.0");
        header.put("x-hcsb-sourcesyscode", "14");
        header.put("x-hcsb-token", "ArGE2JnHtxG/Zx5nrnGY4eOfMUJGGJokAJHigG1BrCY=");
@@ -333,14 +333,14 @@
            // æ ¡éªŒdata字段是否为JsonObject
            JsonElement dataElement = jsonObject.get("data");
            if (dataElement == null || !dataElement.isJsonObject()) {
                log.warn("【parseResponseData】响应数据中data字段为空或非对象类型，原始数据：{}", result);
                log.info("【parseResponseData】响应数据中data字段为空或非对象类型，原始数据：{}", result);
                return new ArrayList<>();
            }

            JsonObject dataObject = dataElement.getAsJsonObject();
            JsonElement resultElement = dataObject.get("result");
            if (resultElement == null || !resultElement.isJsonArray()) {
                log.warn("【parseResponseData】响应数据中result字段为空或非数组类型，原始数据：{}", result);
                log.info("【parseResponseData】响应数据中result字段为空或非数组类型，原始数据：{}", result);
                return new ArrayList<>();
            }


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

@@ -339,6 +339,9 @@
                #{icd10code}
            </foreach>
        </if>
        <if test="medicalCode != null and medicalCode != ''">and b.medical_code = #{medicalCode}</if>
        <if test="medicalName != null and medicalName != ''">and b.medical_name = #{medicalName}</if>
        <if test="medicalCompany != null and medicalCompany != ''">and b.medical_company = #{medicalCompany}</if>
        GROUP BY
        b.inhospid,
        a.age,
@@ -365,6 +368,9 @@
        select
        b.inhospid,
        b.nurse_id,
        b.medical_code,
        b.medical_name,
        b.medical_company,
        b.encounter_source_id,
        b.importance_flag_code,
        b.emergency_level_code,

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

@@ -98,6 +98,7 @@
        <result property="scheduleDetailId" column="schedule_detail_id"/>
        <result property="scheduleSeq" column="schedule_seq"/>
        <result property="loopCount" column="loop_count"/>
        <result property="campusid" column="campusid"/>
    </resultMap>

    <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -151,6 +152,7 @@
    <sql id="selectServiceSubtaskVo">
        select id,
               hosp_type,
               campusid,
               task_guid,
               diagname,
               patfrom,
@@ -969,6 +971,7 @@
            <if test="continueTimeNext != null ">continue_time_next,</if>
            <if test="continueContent != null ">continue_content,</if>
            <if test="operationItemId != null ">operation_item_id,</if>
            <if test="campusid != null">campusid,</if>
            <if test="scheduleId != null ">schedule_id,</if>
            <if test="scheduleDetailId != null ">schedule_detail_id,</if>
            <if test="scheduleSeq != null ">schedule_seq,</if>
@@ -1065,6 +1068,7 @@
            <if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
            <if test="continueContent != null ">#{continueContent},</if>
            <if test="operationItemId != null ">#{operationItemId},</if>
            <if test="campusid != null">#{campusid},</if>
            <if test="scheduleId != null ">#{scheduleId},</if>
            <if test="scheduleDetailId != null ">#{scheduleDetailId},</if>
            <if test="scheduleSeq != null ">#{scheduleSeq},</if>
@@ -1166,6 +1170,7 @@
            <if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
            <if test="continueContent != null ">continue_content = #{continueContent},</if>
            <if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
            <if test="campusid != null">campusid=#{campusid},</if>
            <if test="scheduleId != null ">schedule_id = #{scheduleId},</if>
            <if test="scheduleDetailId != null ">schedule_detail_id = #{scheduleDetailId},</if>
            <if test="scheduleSeq != null ">schedule_seq = #{scheduleSeq},</if>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,326 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.ServiceTaskmedicalMapper">

    <resultMap type="com.smartor.domain.ServiceTaskmedical" id="ServiceTaskmedicalResult">
        <result property="id" column="id"/>
        <result property="orgid" column="orgid"/>
        <result property="taskId" column="task_id"/>
        <result property="taskName" column="task_name"/>
        <result property="longtask" column="longtask"/>
        <result property="serviceType" column="service_type"/>
        <result property="icd10id" column="icd10id"/>
        <result property="medicalCode" column="medical_code"/>
        <result property="medicalName" column="medical_name"/>
        <result property="medicalCompany" column="medical_company"/>
        <result property="delFlag" column="del_flag"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="guid" column="guid"/>
        <result property="pguid" column="pguid"/>
        <result property="pid" column="pid"/>
        <result property="wardCode" column="ward_code"/>
        <result property="wardName" column="ward_name"/>
        <result property="deptCode" column="dept_code"/>
        <result property="deptName" column="dept_name"/>
    </resultMap>

    <sql id="selectServiceTaskmedicalVo">
        select id,
               orgid,
               task_id,
               task_name,
               longtask,
               service_type,
               icd10id,
               medical_code,
               medical_name,
               medical_company,
               del_flag,
               update_by,
               update_time,
               create_by,
               create_time,
               isupload,
               upload_time,
               guid,
               pguid,
               pid,
               ward_code,
               ward_name,
               dept_code,
               dept_name
        from service_taskmedical
    </sql>

    <select id="selectServiceTaskmedicalList" parameterType="com.smartor.domain.ServiceTaskmedical"
            resultMap="ServiceTaskmedicalResult">
        <include refid="selectServiceTaskmedicalVo"/>
        where 1=1
        and del_flag=0
        <if test="orgid != null  and orgid != ''">
            and orgid = #{orgid}
        </if>
        <if test="taskId != null ">
            and task_id = #{taskId}
        </if>
        <if test="taskName != null  and taskName != ''">
            and task_name like concat('%', #{taskName}, '%')
        </if>
        <if test="longtask != null ">
            and longtask = #{longtask}
        </if>
        <if test="serviceType != null  and serviceType != ''">
            and service_type = #{serviceType}
        </if>
        <if test="icd10id != null ">
            and icd10id = #{icd10id}
        </if>
        <if test="medicalCode != null  and medicalCode != ''">
            and medical_code = #{medicalCode}
        </if>
        <if test="medicalName != null  and medicalName != ''">
            and medical_name like concat('%', #{medicalName}, '%')
        </if>
        <if test="medicalCompany != null  and medicalCompany != ''">
            and medical_company = #{medicalCompany}
        </if>
        <if test="isupload != null ">
            and isupload = #{isupload}
        </if>
        <if test="uploadTime != null ">
            and upload_time = #{uploadTime}
        </if>
        <if test="guid != null  and guid != ''">
            and guid = #{guid}
        </if>
        <if test="pguid != null  and pguid != ''">
            and pguid = #{pguid}
        </if>
        <if test="pid != null ">
            and pid = #{pid}
        </if>
        <if test="wardCode != null  and wardCode != ''">
            and ward_code = #{wardCode}
        </if>
        <if test="wardName != null  and wardName != ''">
            and ward_name like concat('%', #{wardName}, '%')
        </if>
        <if test="deptCode != null  and deptCode != ''">
            and dept_code = #{deptCode}
        </if>
        <if test="deptName != null  and deptName != ''">
            and dept_name like concat('%', #{deptName}, '%')
        </if>
    </select>

    <select id="selectServiceTaskmedicalById" parameterType="Long"
            resultMap="ServiceTaskmedicalResult">
        <include refid="selectServiceTaskmedicalVo"/>
        where id = #{id}
    </select>

    <insert id="insertServiceTaskmedical" parameterType="com.smartor.domain.ServiceTaskmedical" useGeneratedKeys="true"
            keyProperty="id">
        insert into service_taskmedical
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="orgid != null">orgid,
            </if>
            <if test="taskId != null">task_id,
            </if>
            <if test="taskName != null">task_name,
            </if>
            <if test="longtask != null">longtask,
            </if>
            <if test="serviceType != null">service_type,
            </if>
            <if test="icd10id != null">icd10id,
            </if>
            <if test="medicalCode != null">medical_code,
            </if>
            <if test="medicalName != null">medical_name,
            </if>
            <if test="medicalCompany != null">medical_company,
            </if>
            <if test="delFlag != null">del_flag,
            </if>
            <if test="updateBy != null">update_by,
            </if>
            <if test="updateTime != null">update_time,
            </if>
            <if test="createBy != null">create_by,
            </if>
            <if test="createTime != null">create_time,
            </if>
            <if test="isupload != null">isupload,
            </if>
            <if test="uploadTime != null">upload_time,
            </if>
            <if test="guid != null">guid,
            </if>
            <if test="pguid != null">pguid,
            </if>
            <if test="pid != null">pid,
            </if>
            <if test="wardCode != null">ward_code,
            </if>
            <if test="wardName != null">ward_name,
            </if>
            <if test="deptCode != null">dept_code,
            </if>
            <if test="deptName != null">dept_name,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="orgid != null">#{orgid},
            </if>
            <if test="taskId != null">#{taskId},
            </if>
            <if test="taskName != null">#{taskName},
            </if>
            <if test="longtask != null">#{longtask},
            </if>
            <if test="serviceType != null">#{serviceType},
            </if>
            <if test="icd10id != null">#{icd10id},
            </if>
            <if test="medicalCode != null">#{medicalCode},
            </if>
            <if test="medicalName != null">#{medicalName},
            </if>
            <if test="medicalCompany != null">#{medicalCompany},
            </if>
            <if test="delFlag != null">#{delFlag},
            </if>
            <if test="updateBy != null">#{updateBy},
            </if>
            <if test="updateTime != null">#{updateTime},
            </if>
            <if test="createBy != null">#{createBy},
            </if>
            <if test="createTime != null">#{createTime},
            </if>
            <if test="isupload != null">#{isupload},
            </if>
            <if test="uploadTime != null">#{uploadTime},
            </if>
            <if test="guid != null">#{guid},
            </if>
            <if test="pguid != null">#{pguid},
            </if>
            <if test="pid != null">#{pid},
            </if>
            <if test="wardCode != null">#{wardCode},
            </if>
            <if test="wardName != null">#{wardName},
            </if>
            <if test="deptCode != null">#{deptCode},
            </if>
            <if test="deptName != null">#{deptName},
            </if>
        </trim>
    </insert>

    <update id="updateServiceTaskmedical" parameterType="com.smartor.domain.ServiceTaskmedical">
        update service_taskmedical
        <trim prefix="SET" suffixOverrides=",">
            <if test="orgid != null">orgid =
                #{orgid},
            </if>
            <if test="taskId != null">task_id =
                #{taskId},
            </if>
            <if test="taskName != null">task_name =
                #{taskName},
            </if>
            <if test="longtask != null">longtask =
                #{longtask},
            </if>
            <if test="serviceType != null">service_type =
                #{serviceType},
            </if>
            <if test="icd10id != null">icd10id =
                #{icd10id},
            </if>
            <if test="medicalCode != null">medical_code =
                #{medicalCode},
            </if>
            <if test="medicalName != null">medical_name =
                #{medicalName},
            </if>
            <if test="medicalCompany != null">medical_company =
                #{medicalCompany},
            </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="guid != null">guid =
                #{guid},
            </if>
            <if test="pguid != null">pguid =
                #{pguid},
            </if>
            <if test="pid != null">pid =
                #{pid},
            </if>
            <if test="wardCode != null">ward_code =
                #{wardCode},
            </if>
            <if test="wardName != null">ward_name =
                #{wardName},
            </if>
            <if test="deptCode != null">dept_code =
                #{deptCode},
            </if>
            <if test="deptName != null">dept_name =
                #{deptName},
            </if>
        </trim>
        where id = #{id}
    </update>

    <update id="deleteServiceTaskmedicalById" parameterType="Long">
        update service_taskmedical
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id = #{id}
    </update>

    <update id="deleteServiceTaskmedicalByIds" parameterType="String">
        update service_taskmedical
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>


</mapper>

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

@@ -12,7 +12,7 @@
        <result property="age" column="age"/>
        <result property="sfzh" column="sfzh"/>
        <result property="addr" column="addr"/>
        <result property="senderdetail" column="senderdetail"/>
        <result property="hospitaldistrictname" column="hospitaldistrictname"/>
        <result property="type" column="type"/>
        <result property="taskid" column="taskid"/>
        <result property="templateid" column="templateid"/>
@@ -81,7 +81,7 @@
               age,
               sfzh,
               addr,
               senderdetail,
               hospitaldistrictname,
               type,
               taskid,
               templateid,
@@ -151,7 +151,7 @@
            <if test="age != null ">and age = #{age}</if>
            <if test="sfzh != null  and sfzh != ''">and sfzh = #{sfzh}</if>
            <if test="addr != null  and addr != ''">and addr = #{addr}</if>
            <if test="senderdetail != null  and senderdetail != ''">and senderdetail = #{senderdetail}</if>
            <if test="hospitaldistrictname != null  and hospitaldistrictname != ''">and hospitaldistrictname = #{hospitaldistrictname}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="taskid != null ">and taskid = #{taskid}</if>
            <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
@@ -224,7 +224,7 @@
            <if test="age != null">age,</if>
            <if test="sfzh != null">sfzh,</if>
            <if test="addr != null">addr,</if>
            <if test="senderdetail != null">senderdetail,</if>
            <if test="hospitaldistrictname != null">hospitaldistrictname,</if>
            <if test="type != null">type,</if>
            <if test="taskid != null">taskid,</if>
            <if test="templateid != null">templateid,</if>
@@ -290,7 +290,7 @@
            <if test="age != null">#{age},</if>
            <if test="sfzh != null">#{sfzh},</if>
            <if test="addr != null">#{addr},</if>
            <if test="senderdetail != null">#{senderdetail},</if>
            <if test="hospitaldistrictname != null">#{hospitaldistrictname},</if>
            <if test="type != null">#{type},</if>
            <if test="taskid != null">#{taskid},</if>
            <if test="templateid != null">#{templateid},</if>
@@ -360,7 +360,7 @@
            <if test="age != null">age = #{age},</if>
            <if test="sfzh != null">sfzh = #{sfzh},</if>
            <if test="addr != null">addr = #{addr},</if>
            <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
            <if test="hospitaldistrictname != null">hospitaldistrictname = #{hospitaldistrictname},</if>
            <if test="type != null">type = #{type},</if>
            <if test="taskid != null">taskid = #{taskid},</if>
            <if test="templateid != null">templateid = #{templateid},</if>