陈昶聿
昨天 d045d87f7ad5d97964281886db5611eb8c4748b6
【丽水】新增ServiceTask新增四级手术等级代码
已修改4个文件
33 ■■■■■ 文件已修改
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,6 +822,7 @@
                    }
//                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()));
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>