zjh 本地 2024/06/20 --2

zjh

2024-06-20 e54ecd3c3cdf57c25d7dad004173ee46364fceec

zjh 本地 2024/06/20 --2

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -1918,6 +1918,7 @@
        for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
            Map<String, Object> map = new HashMap<>();
            Long pacId = entry.getValue().get(0).getPacId();
            map.put("proPrantId",entry.getKey().toString());
            if (null != pacId) {
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                map.put("pacName", aPackage.getPacName());
@@ -1967,6 +1968,7 @@
        for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
            Map<String, Object> map = new HashMap<>();
            Long pacId = entry.getValue().get(0).getPacId();
            map.put("proPrantId",entry.getKey().toString());
            if (null != pacId) {
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                map.put("pacName", aPackage.getPacName());
@@ -2543,5 +2545,18 @@
            return AjaxResult.error(e.getMessage());
        }
    }


    @GetMapping("/delTbBycusCardIdAndProId")
    @ApiOperation(value = "根据客户身份证号和项目父项id删除临时表数据")
    @Transactional
    public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "身份证号") String cusCardId,
                                           @RequestParam @ApiParam(value = "父项id") String proId) {

        if (transitionService.delTbBycusCardIdAndProId(cusCardId,proId)) {
            return AjaxResult.success();
        }
        return AjaxResult.error("记录不存在!");
    }
}


 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java

@@ -72,6 +72,9 @@
    @Delete("DELETE  FROM tb_transition WHERE tj_num=#{tjNum}")
    public boolean deletedTbTransitionByTjNum(String tjNum);

    @Delete("DELETE  FROM tb_transition WHERE isnull(tj_num)  and  cus_id=#{cdId} and parent_pro_id=#{proId}")
    public boolean delTbBycusCardIdAndProId(@Param("cdId") String cdId,@Param("proId")String proId);

    @Update("UPDATE tb_transition a SET "+
            "a.tj_num=null" +
            " WHERE a.tj_num=#{tjNum}")

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java

@@ -85,6 +85,9 @@

    public boolean deletedTbTransitionByTjNum(String tjNum);


    public boolean delTbBycusCardIdAndProId(String cdId,String proId);

    //根据身份证号和套餐id查询和项目id
    public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(String cusId,String proId);


 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java

@@ -102,6 +102,11 @@
    }

    @Override
    public boolean delTbBycusCardIdAndProId(String cdId, String proId) {
        return tbTransitionMapper.delTbBycusCardIdAndProId(cdId,proId);
    }

    @Override
    public boolean updateTbTransitionByTjNum(String tjNum) {
        return tbTransitionMapper.updateTbTransitionByTjNum(tjNum);
    }