zjh 2023/12/06--1

zjh

2023-12-06 71598a471bc9230d39329389d6a43d294e918630

zjh 2023/12/06--1

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

@@ -1674,8 +1674,54 @@
        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
        if(null !=tjCustomer){
            TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
            
            return AjaxResult.success(order);
            if(null !=order){
                List<Map<String, Object>> list = new ArrayList<>();
                if(order.getPacId().equals("o")){
                    List<Long> longList = remarkService.getTjProIdsByTjNum(order.getTjNumber());
                    for (Long aLong : longList) {
                        Map<String, Object> map = new HashMap<>();
                        map.put("pacName", "单项");
                        map.put("proId",aLong);
                        map.put("pacId",null);
                        map.put("parentName", projectService.getById(aLong).getProName());
                        map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
                        BigDecimal proPrice = projectService.getById(aLong).getProPrice();
                        map.put("ordPrice", proPrice);
                        map.put("nowPrice", proPrice);
                        list.add(map);
                    }
                }
                if(!order.getPacId().equals("o")){
                    List<Long> longList = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
                    TjPackage aPackage = tjPackageService.getById(order.getPacId());
                    for (Long aLong : longList) {
                        Map<String, Object> map = new HashMap<>();
                        map.put("pacName",aPackage.getPacName());
                        map.put("pacId",aPackage.getPacId());
                        map.put("parentName", projectService.getById(aLong).getProName());
                        map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
                        BigDecimal proPrice = projectService.getById(aLong).getProPrice();
                        map.put("ordPrice", proPrice);
                        map.put("nowPrice",tjPackageProjectService.getPacProPriceByPacIdAndPro(aLong,order.getPacId()));
                        list.add(map);
                    }

                    List<Long> longList1 = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
                    for (Long aLong : longList1) {
                        Map<String, Object> map = new HashMap<>();
                        map.put("pacName", "单项");
                        map.put("proId",aLong);
                        map.put("pacId",null);
                        map.put("parentName", projectService.getById(aLong).getProName());
                        map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
                        BigDecimal proPrice = projectService.getById(aLong).getProPrice();
                        map.put("ordPrice", proPrice);
                        map.put("nowPrice", proPrice);
                        list.add(map);
                    }
                }
                return AjaxResult.success(list);
            }
        }
        return AjaxResult.success("暂无历史记录");
    }

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

@@ -68,4 +68,20 @@

    @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'")
    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);


    @Select("SELECT a.pro_id FROM tj_order_remark a  WHERE a.deleted=0 AND a.tj_number=#{tjNumber} AND a.type !=2;")
    List<Long> getTjProIdsByTjNum(String tjNumber);


    @Select("SELECT b.pro_id FROM tj_package_project a " +
            "LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
            "WHERE b.type !=2 AND b.pro_id = a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
    List<Long> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);


    @Select("SELECT b.pro_id FROM tj_package_project a " +
            "LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
            "WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
    List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
}

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

@@ -1,10 +1,12 @@
package com.ltkj.hosp.mapper;

import java.math.BigDecimal;
import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjPackageProject;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
@@ -65,4 +67,7 @@

    @Select("SELECT * FROM tj_package_project WHERE pac_id=#{pacId}")
    List<TjPackageProject> getTjPackageProjectListByPacId(String pacId);

    @Select("SELECT a.price_now FROM tj_package_project a WHERE a.pro_id=#{proId} AND a.pac_id=#{pacId}")
    BigDecimal getPacProPriceByPacIdAndPro(@Param("proId") Long proId,@Param("pacId") String pacId);
}

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

@@ -32,4 +32,10 @@
    boolean saveTjOrderRemarkByOrderId(String tjNumber, String userName, String userId,String orderId);

    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);

    List<Long> getTjProIdsByTjNum(String tjNumber);

    List<Long> getTjProIdsByTjNumAndPacIc(String tjNumber,String pacId);

    List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber,String pacId);
}

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

@@ -1,5 +1,6 @@
package com.ltkj.hosp.service;

import java.math.BigDecimal;
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
@@ -61,4 +62,6 @@
    public int deleteTjPackageProjectByProId(Long proId);

    List<TjPackageProject> getTjPackageProjectListByPacId(String pacId);

    BigDecimal getPacProPriceByPacIdAndPro(Long proId,String pacId);
}

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

@@ -62,5 +62,18 @@
        return mapper.getRemarkListByTjNumAndType(tjNumber);
    }

    @Override
    public List<Long> getTjProIdsByTjNum(String tjNumber) {
        return mapper.getTjProIdsByTjNum(tjNumber);
    }

    @Override
    public List<Long> getTjProIdsByTjNumAndPacIc(String tjNumber, String pacId) {
        return mapper.getTjProIdsByTjNumAndPacIc(tjNumber,pacId);
    }
    @Override
    public List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber, String pacId) {
        return mapper.getTjProIdsByTjNumAndPacIc1(tjNumber,pacId);
    }

}

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

@@ -1,5 +1,6 @@
package com.ltkj.hosp.service.impl;

import java.math.BigDecimal;
import java.util.List;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -90,4 +91,9 @@
    public List<TjPackageProject> getTjPackageProjectListByPacId(String pacId) {
        return tjPackageProjectMapper.getTjPackageProjectListByPacId(pacId);
    }

    @Override
    public BigDecimal getPacProPriceByPacIdAndPro(Long proId, String pacId) {
        return tjPackageProjectMapper.getPacProPriceByPacIdAndPro(proId,pacId);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CopyTjProVo.java

New file
@@ -0,0 +1,58 @@
package com.ltkj.hosp.vodomain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @Company: 西安路泰科技有限公司
 * @Author: zjh
 * @Date: 2023/12/6 0006 09:00
 */

@Data
public class CopyTjProVo {


    @ApiModelProperty(value = "套餐id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long pacId;

    @ApiModelProperty(value = "套餐名")
    private String pacName;

    @ApiModelProperty(value = "项目id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long proId;

    @ApiModelProperty(value = "项目名")
    private String proName;

    @ApiModelProperty(value = "父项目id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentProId;

    @ApiModelProperty(value = "父项目名")
    private String parentProName;

    @ApiModelProperty(value = "原价")
    private BigDecimal ordPrice;

    @ApiModelProperty(value = "现价")
    private BigDecimal nowPrice;

    @ApiModelProperty(value = "检查方式 (改为是否空腹 默认否)")
    private String proCheckMethod;

    @ApiModelProperty(value = "项目类型 (改为性别 男女全部)")
    private String proType;

}