zjh
2024-12-06 dcd7d62c2bf627d22dfa042b7d92a913af6378c3
zjh20241205-3
4个文件已修改
20 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1717,6 +1717,11 @@
                transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
                List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                if (null != ppList && !ppList.isEmpty()) {
                    String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
                    if(!StringUtils.isBlank(string)){
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return AjaxResult.error("操作失败! 以下项目已存在: "+string);
                    }
                    transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
                }
            }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -281,4 +281,12 @@
            "</script>"
    })
    BigDecimal getLisPriceByTjNumAndInParentProId(@Param("tjNum") String tjNum, @Param("parentProId") List<String> parentProId);
    @Select("SELECT GROUP_CONCAT(c.pro_name SEPARATOR ' ; ' ) FROM tj_package_project b JOIN tj_project c ON c.pro_id=b.pro_id\n" +
            "\n" +
            "WHERE b.pro_id IN(SELECT DISTINCT a.parent_pro_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND ISNULL(a.tj_num))" +
            "AND b.pac_id=#{pacId}")
    String panduantaocanshifouchongfu(@Param("idCard") String idCard,@Param("pacId") Long pacId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -129,4 +129,6 @@
     boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber);
    void deleteTjOrderDetailByjxbz(String bldh);
    String panduantaocanshifouchongfu(String idCard,Long pacId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -212,4 +212,9 @@
    public void deleteTjOrderDetailByjxbz(String bldh) {
        tbTransitionMapper.deleteTjOrderDetailByjxbz(bldh);
    }
    @Override
    public String panduantaocanshifouchongfu(String idCard,Long pacId) {
        return tbTransitionMapper.panduantaocanshifouchongfu(idCard,pacId);
    }
}