陈昶聿
5 天以前 25c9ca5313fbed298f1faf3893b7b0c780b6e1b2
【丽水】手术撤销
已修改3个文件
19 ■■■■■ 文件已修改
smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
@@ -77,6 +77,14 @@
    public int deleteHardPatMedOperationItemByOpId(String opid);
    /**
     * 删除患者检查检验记录子
     *
     * @param opid 患者检查检验记录子主键
     * @return 结果
     */
    public int deleteSoftPatMedOperationItemByOpId(String opid);
    /**
     * 查询患者检查检验记录子列表
     *
     * @param patMedOperationItem 患者检查检验记录子
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1570,7 +1570,7 @@
                    serviceSubtaskVO.setPatid(patArchive.getId());
                    serviceSubtaskVO.setSendstates(sendstates);
                    serviceSubtaskVO.setOperationItemIds(operationItemIds);
                    serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
                    serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
                    //去redis中,查询是否有subid,有的话移除cache-exist
                    if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -1588,6 +1588,7 @@
                    }
                    operation.setUpdateTime(new Date());
                    patMedOperationMapper.updatePatMedOperation(operation);
                    patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid());
                }
            }
        }
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -444,6 +444,14 @@
               where opid = #{opid}
    </delete>
    <update id="deleteSoftPatMedOperationItemByOpId" parameterType="String">
        update pat_med_operation_item
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where opid = #{opid}
    </update>
    <select id="selectOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
            resultMap="PatMedOperationItemResult">
        select pmoi.id, pmoi.operationid, pmoi.opid, pmoi.opcode, pmoi.opdesc, pmoi.main_flag, pmoi.incitypecode,