【丽水】手术随访

陈昶聿

2 天以前 b79d14af673a7adc8614b5cb1e49773b5a992f83

【丽水】手术随访

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

@@ -296,11 +296,6 @@
     */
    @ApiModelProperty(value = "疾病长期任务，是否处理：0未处理   1处理成功    2处理失败 ")
    private String diagcheckFlag;
    /**
     * 手术长期任务，是否处理：0未处理   1处理
     */
    @ApiModelProperty(value = "手术长期任务，是否处理：0未处理   1处理成功    2处理失败 ")
    private String opercheckFlag;

    /**
     * 年龄

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

@@ -669,4 +669,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "继续时间下次")
    private Date continueTimeNext;

    @ApiModelProperty(value = "手术记录id 对应pat_med_operation_item.id")
    private Long operationItemId;
}

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

@@ -993,7 +993,7 @@
            return;
        }
        //封装serviceSubtask
        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedOperation, patArchive, config);
        ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedOperation, patMedOperationItem, patArchive, config);
        if (ObjectUtils.isEmpty(serviceSubtask)) {
            return;
        }
@@ -1204,7 +1204,7 @@
    }

    //封装serviceSubtask
    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedOperation patMedOperation, PatArchive patArchive, String config) {
    private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedOperation patMedOperation, PatMedOperationItem patMedOperationItem, PatArchive patArchive, String config) {
        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
        serviceSubtask.setTaskid(serviceTask.getTaskid());
        if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
@@ -1240,6 +1240,7 @@
        serviceSubtask.setCreateBy(patMedOperation.getNurseName());
//        serviceSubtask.setLeavehospitaldistrictcode(patArchive.getLeavehospitaldistrictcode());
//        serviceSubtask.setLeavehospitaldistrictname(patArchive.getLeavehospitaldistrictname());
        serviceSubtask.setOperationItemId(patMedOperationItem.getId());
        serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
        serviceSubtask.setUpdateTime(new Date());
        //设置发送时间

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

@@ -27,10 +27,12 @@
            <result property="pguid" column="pguid"/>
            <result property="guid" column="guid"/>
            <result property="pid" column="pid"/>
            <result property="opercheckFlag" column="opercheck_flag"/>
            <result property="longTaskReason" column="long_task_reason"/>
    </resultMap>

    <sql id="selectPatMedOperationItemVo">
        select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
        select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid, opercheck_flag, long_task_reason
        from pat_med_operation_item
    </sql>

@@ -141,6 +143,10 @@
                    </if>
                    <if test="pid != null">pid,
                    </if>
                    <if test="opercheckFlag != null">opercheck_flag,
                    </if>
                    <if test="longTaskReason != null">long_task_reason,
                    </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="id != null">#{id},
@@ -186,6 +192,10 @@
                    <if test="guid != null">#{guid},
                    </if>
                    <if test="pid != null">#{pid},
                    </if>
                    <if test="opercheckFlag != null">#{opercheckFlag},
                    </if>
                    <if test="longTaskReason != null">#{longTaskReason},
                    </if>
        </trim>
    </insert>
@@ -256,6 +266,12 @@
                    <if test="pid != null">pid =
                        #{pid},
                    </if>
                    <if test="opercheckFlag != null">opercheck_flag =
                        #{opercheckFlag},
                    </if>
                    <if test="longTaskReason != null">long_task_reason =
                        #{longTaskReason},
                    </if>
        </trim>
        where id = #{id}
    </update>

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

@@ -92,6 +92,7 @@
        <result property="continueContent" column="continue_content"/>
        <result property="continueCount" column="continue_count"/>
        <result property="continueTimeNext" column="continue_time_next"/>
        <result property="operationItemId" column="operation_item_id"/>
    </resultMap>

    <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -212,6 +213,7 @@
               continue_content,
               continue_count,
               continue_time_next,
               operation_item_id,
               task_situation
        from service_subtask
    </sql>
@@ -852,6 +854,7 @@
            <if test="continueCount != null ">continue_count,</if>
            <if test="continueTimeNext != null ">continue_time_next,</if>
            <if test="continueContent != null ">continue_content,</if>
            <if test="operationItemId != null ">operation_item_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sendname != null">#{sendname},</if>
@@ -943,6 +946,7 @@
            <if test="continueCount != null ">#{continueCount},</if>
            <if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
            <if test="continueContent != null ">#{continueContent},</if>
            <if test="operationItemId != null ">#{operationItemId},</if>
        </trim>
    </insert>

@@ -1039,6 +1043,7 @@
            <if test="continueCount != null ">continue_count = #{continueCount},</if>
            <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>
        </trim>
        where id = #{id}
    </update>