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

@@ -428,6 +428,13 @@
    private String opdesc;

    /**
     * 手术等级编码 对应 pat_med_operation_item.oplevelcode
     */
    @ApiModelProperty("手术等级编码")
    @Excel(name = "手术等级编码")
    private String oplevelcode;

    /**
     * 适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型
     */
    @ApiModelProperty("适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")

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

@@ -7,13 +7,13 @@
import lombok.Data;

/**
 * 模板科室关联对象 service_taskoper
 * 任务手术关联对象 service_taskoper
 *
 * @author lihu
 * @date 2025-02-25
 */
@Data
@ApiModel("模板科室关联")
@ApiModel("任务手术关联")
public class ServiceTaskoper extends BaseEntity {
    private static final long serialVersionUID = 1L;

@@ -67,6 +67,14 @@
    private String opcode;

    /**
     * 手术编码
     */
    @ApiModelProperty("手术等级代码")
    @Excel(name = "手术等级代码")
    private String oplevelcode;


    /**
     * 手术名称
     */
    @ApiModelProperty("手术名称")

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

@@ -593,6 +593,7 @@
                    ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
                    serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
                    serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
                    serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
                    serviceTaskoper.setTaskId(serviceTask.getTaskid());
                    serviceTaskoper.setTaskName(serviceTask.getTaskName());
                    serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
@@ -821,31 +822,32 @@
                    }
//                serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
                    serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
                    serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
                    serviceTaskoper.setTaskId(serviceTask.getTaskid());
                    serviceTaskoper.setTaskName(serviceTask.getTaskName());
                    serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
                    serviceTaskoper.setGuid(serviceTask.getGuid());
                    serviceTaskoper.setOrgid(serviceTask.getOrgid());
                    serviceTaskoper.setCreateTime(new Date());
                    if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
                        String[] opcodes = serviceTaskVO.getOpcode().split(",");
                        for (String opcode : opcodes) {
                            //先查询一下是否存在
                            ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
                            serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
                            serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
                            List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);

                            serviceTaskoper.setOpcode(opcode);
                            log.info("----serviceTaskoper的值为：{}", serviceTaskoper);
                            if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
                                serviceTaskoper.setId(serviceTaskopers.get(0).getId());
                                serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
                            } else {
                                serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
                            }
                        }
                    }
//                    if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
//                        String[] opcodes = serviceTaskVO.getOpcode().split(",");
//                        for (String opcode : opcodes) {
//                            //先查询一下是否存在
//                            ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
//                            serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
//                            serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
//                            List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
//
//                            serviceTaskoper.setOpcode(opcode);
//                            log.info("----serviceTaskoper的值为：{}", serviceTaskoper);
//                            if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
//                                serviceTaskoper.setId(serviceTaskopers.get(0).getId());
//                                serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
//                            } else {
//                                serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
//                            }
//                        }
//                    }
                }
            }
            if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -3167,7 +3169,7 @@
     * @return
     */
    @Override
    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
//    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
    public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
        log.info("getSfStatisticsScript的入参为：{}", serviceSubtaskCountReq);
        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();

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

@@ -2135,6 +2135,14 @@
                </foreach>
            </if>
        </if>
        <if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
            AND visit_dept_code IN
            <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
                     separator=","
                     close=")">
                #{visitDeptCodes}
            </foreach>
        </if>
        <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
            AND leavehospitaldistrictname = #{leavehospitaldistrictname}
        </if>

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

@@ -12,6 +12,7 @@
        <result property="serviceType" column="service_type"/>
        <result property="opid" column="opid"/>
        <result property="opcode" column="opcode"/>
        <result property="oplevelcode" column="oplevelcode"/>
        <result property="opdesc" column="opdesc"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
@@ -30,6 +31,7 @@
               service_type,
               opid,
               opcode,
               oplevelcode,
               opdesc,
               del_flag,
               create_time,
@@ -63,6 +65,9 @@
            </if>
            <if test="opcode != null  and opcode != ''">
                and opcode = #{opcode}
            </if>
            <if test="oplevelcode != null  and oplevelcode != ''">
                and oplevelcode = #{oplevelcode}
            </if>
            <if test="opdesc != null  and opdesc != ''">
                and opdesc = #{opdesc}
@@ -103,6 +108,8 @@
            </if>
            <if test="opcode != null">opcode,
            </if>
            <if test="oplevelcode != null">oplevelcode,
            </if>
            <if test="opdesc != null">opdesc,
            </if>
            <if test="delFlag != null">del_flag,
@@ -132,6 +139,8 @@
            <if test="opid != null">#{opid},
            </if>
            <if test="opcode != null">#{opcode},
            </if>
            <if test="oplevelcode != null">#{oplevelcode},
            </if>
            <if test="opdesc != null">#{opdesc},
            </if>
@@ -173,6 +182,9 @@
            <if test="opcode != null">opcode =
                #{opcode},
            </if>
            <if test="oplevelcode != null">oplevelcode =
                #{oplevelcode},
            </if>
            <if test="opdesc != null">opdesc =
                #{opdesc},
            </if>