zjh20250419

zjh

2025-04-21 3f31a0466e7a706424d28aaab10bb70e2895bcfc

zjh20250419

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

@@ -2207,9 +2207,11 @@
                    transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);

                    //补差价
                    List<Map<String, Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
                    List<Map<String, Object>> cjMaps = transitionService.addTbhuoquxiangmuchajia(pacId.toString(), cusId);
                    if (null != cjMaps && !cjMaps.isEmpty()) {
                        log.info("该套餐"+pacId+"中有差价:"+cjMaps.size()+"个");
                        for (Map<String, Object> cjMap : cjMaps) {
                            log.info("添加临时表套餐数据时所选的差价为:"+ cjMap.get("cj").toString());
                            transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString()));
                        }
                    }
@@ -3952,16 +3954,6 @@
    @GetMapping(value = "newgetTransitionList")
    @ApiOperation(value = "最新查询过渡表数据")
    public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "客户id") String cusId) {
//        String pacId = transitionService.getTbTransitionPacId(cusId);
//        if(StringUtil.isNotBlank(pacId)){
//            //补差价
//            List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
//            if(null !=cjMaps && !cjMaps.isEmpty()){
//                for (Map<String, Object> cjMap : cjMaps) {
//                    transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
//                }
//            }
//        }
        List<TbTransition> list = transitionService.newgetTransitionList(cusId);
        return AjaxResult.success(list);
    }

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

@@ -185,36 +185,6 @@
    @GetMapping("getList")
    @ApiOperation(value = "查询体检套餐列表")
    public TableDataInfo getList(@RequestParam(required = false) @ApiParam(value = "性别") String cusSex) {
//        List<TjPackage> tjPackageList = null;
//        List<TjPackage> list = null;
//        if (cusSex == null || cusSex.equals("2")) {
//            if (redisCache.hasKey("getTjPackageListBySex")) {
//                list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByManAndWoMan");
//            } else {
//                tjPackageList = tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0));
//            }
//        } else {
//            if (cusSex.equals("0")) {
//                if (redisCache.hasKey("getTjPackageListBySex")) {
//                    list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByMan");
//                } else {
//                    tjPackageList = tjPackageService.getTjPackageListByMan();
//                }
//            } else {
//                if (redisCache.hasKey("getTjPackageListBySex")) {
//                    list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByWoMan");
//                } else {
//                    tjPackageList = tjPackageService.getTjPackageListByWoMan();
//                }
//            }
//        }
//        asyncService.getTjPackageList();
//        if (null != list && list.size() > 0) {
//            return getDataTable(list);
//        } else {
//            getTjPackageList(tjPackageList);
//            return getDataTable(tjPackageList);
//        }
        String pacName="";
        if (cusSex==null || cusSex.equals("2")) {
            final List<TjPackage> pacListBySqlAndAll = tjPackageService.getPacListBySqlAndAll(pacName);

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

@@ -8,6 +8,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 过渡Mapper接口
@@ -358,6 +359,14 @@
    TbTransition getOnwTbTransition(@Param("idCard") String idCard,@Param("tjNumber")String tjNumber);


    @Select("SELECT aa.parent_pro_id xmid,(g.price_now-aa.ys)cj FROM tj_package_project g JOIN (\n" +
            " SELECT a.parent_pro_id,SUM(a.now_price)ys  FROM tb_transition a WHERE a.cus_id=#{cusIdCard} " +
            " AND pac_id=#{pacId} AND ISNULL(a.tj_num) GROUP BY a.parent_pro_id)aa\n" +
            "ON\n" +
            "trim(g.pro_id)=trim(aa.parent_pro_id ) where g.pac_id=#{pacId} AND (g.price_now-aa.ys)>0;")
    List<Map<String,Object>> addTbhuoquxiangmuchajia(@Param("pacId") String pacId, @Param("cusIdCard") String cusIdCard);


    @Update("UPDATE tb_transition t JOIN (SELECT a.id FROM tb_transition a \n" +
            "WHERE a.cus_id=#{idCard} AND a.pac_id=#{pacId}   " +
            "AND ISNULL(a.tj_num) AND a.now_price !=0 ORDER BY a.now_price DESC LIMIT 1)aa ON aa.id=t.id\n" +

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

@@ -86,7 +86,7 @@
    @Select("SELECT GROUP_CONCAT(b.pro_name ) AS names FROM tj_package_project a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.pac_id=#{pacId}")
    String getTjPacProNames(String pacId);

    @Select("SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
    @Select("SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
            "FROM  tj_package a\n" +
            "left JOIN tj_package_project b\n" +
            "ON a.pac_id=b.pac_id\n" +
@@ -97,7 +97,7 @@
            "ORDER BY a.sort;\n")
    List<TjPackage> getPacListBySqlAndMan(String pacName);

    @Select("SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
    @Select("SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
            "FROM  tj_package a\n" +
            "left JOIN tj_package_project b\n" +
            "ON a.pac_id=b.pac_id\n" +
@@ -110,7 +110,7 @@



    @Select(" SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
    @Select(" SELECT a.pac_id,a.pac_name,a.new_price price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
            "    FROM  tj_package a\n" +
            "    left JOIN tj_package_project b\n" +
            "    ON a.pac_id=b.pac_id\n" +

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

@@ -8,6 +8,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 过渡Service接口
@@ -144,6 +145,8 @@

    TbTransition getOnwTbTransition(String idCard,String tjNumber);

    List<Map<String,Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard);

    void  buxiangmuchajia(String idCard,String pacId,String proId,BigDecimal cj);



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

@@ -12,6 +12,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;


/**
@@ -244,6 +245,11 @@
    }

    @Override
    public List<Map<String, Object>> addTbhuoquxiangmuchajia(String groupingId, String cusIdCard) {
        return tbTransitionMapper.addTbhuoquxiangmuchajia(groupingId,cusIdCard);
    }

    @Override
    public void buxiangmuchajia(String idCard, String pacId,String proId, BigDecimal cj) {
       tbTransitionMapper.buxiangmuchajia( idCard, pacId,proId, cj);
    }