zjh 2023/10/25--1

zjh

2023-10-25 8c4968ea3bd61c154c71d40f43a2cc22760fef49

zjh 2023/10/25--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -1409,6 +1409,9 @@
     * @return
     */
    public static String hidePhoneNum(String phoneNum){
        if(null==phoneNum){
            return "";
        }
        if(phoneNum.contains("*")){
            return phoneNum;
        }
@@ -1435,6 +1438,9 @@
     * @return
     */
    public static String hideIdCardNum(String idCardNum){
        if(null==idCardNum){
            return "";
        }
        if(idCardNum.contains("*")){
            return idCardNum;
        }
@@ -1465,6 +1471,9 @@
     * @return
     */
    public static String hideCusName(String cusName){
        if(null==cusName){
            return "";
        }
        if(!cusName.contains("*")){
            String realname=null;
            char[] r =  cusName.toCharArray();
@@ -1486,8 +1495,8 @@
    //临时表添加单项
    public void saveRedisTransitionByProId(String cusId, List<Long> proIds) {
        for (Long proId : proIds) {
            if (null != transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)) &&
                    transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)).size() > 0) {
            List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
            if (null != transitionList && transitionList.size() > 0) {
                continue;
            }
            transitionService.saveRedisTransitionByProId(cusId,proId);

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

@@ -558,8 +558,14 @@
                                project.setProPrice(decimal.setScale(2));
                                project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
                            }else {
                                project.setProPrice(new BigDecimal("0.00"));
                                project.setProOrdPrice(new BigDecimal("0.00"));
                                BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
                                if(null !=decimal1){
                                    project.setProPrice(decimal1.setScale(2));
                                    project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2));
                                }else {
                                    project.setProPrice(new BigDecimal("0.00").setScale(2));
                                    project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
                                }
                            }
                        }
                    }

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

@@ -991,7 +991,7 @@
                if (null != ppList && ppList.size() > 0) {
                    //异步保存数据库
//                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, proIds);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {
@@ -1030,9 +1030,7 @@
        //单项
        if (null != proIds && proIds.size() > 0) {
            //异步保存数据库表
//            asyncService.addRedisTransitionPro(cusId, proIds);
            asyncService.saveRedisTransitionByPacId(cusId, null, proIds);

            for (Long proId : proIds) {
                List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
                if (null != transitions && transitions.size() > 0) {
@@ -1059,9 +1057,11 @@
                    }
                    tbTransition.setParentProId(tjProject.getProParentId());
                    if (tjProject.getProParentId() != null) {
                        final TjProject byId = projectService.getById(tjProject.getProParentId());
                        TjProject byId = projectService.getById(tjProject.getProParentId());
                        if(null !=byId){
                        tbTransition.setParentProName(byId.getProName());
                    }
                    }
                    tbTransition.setParentProName("");

                    tbTransition.setProId(tjProject.getProId());

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

@@ -547,21 +547,21 @@
                    // TODO: 2023/3/29  查询附件pdf 如心电图、附件
                    LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
                    rtwq1.eq(TjReport::getType, "医学名词");
                    rtwq1.eq(TjReport::getTjNumber, tjNumber);
//                    rtwq1.eq(TjReport::getTjNumber, tjNumber);
                    TjReport one11111 = tjReportService.getOne(rtwq1);
                    String report1 = one11111.getReport();
                    PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "医学名词.pdf");

                    LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
                    rtwq.eq(TjReport::getType, "心电图");
                    rtwq.eq(TjReport::getTjNumber, tjNumber);
//                    rtwq.eq(TjReport::getTjNumber, tjNumber);
                    TjReport one1111 = tjReportService.getOne(rtwq);
                    String report = one1111.getReport();
                    PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "心电图.pdf");

                    LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
                    rtwq12.eq(TjReport::getType, "附件");
                    rtwq12.eq(TjReport::getTjNumber, tjNumber);
//                    rtwq12.eq(TjReport::getTjNumber, tjNumber);
                    TjReport one111112 = tjReportService.getOne(rtwq12);
                    String report12 = one111112.getReport();
                    PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "附件.pdf");

 ltkj-admin/src/main/resources/application.yml

@@ -73,8 +73,8 @@
  # redis 配置
  redis:
    # 地址
    host: 101.42.27.146
#    host: localhost
#    host: 101.42.27.146
    host: localhost
    # 端口，默认为6379
    port: 6379
    # 数据库索引
@@ -203,8 +203,8 @@
    mch-key: Xianlutaikeji666888999shijihongL   #密钥
    #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12  #本地证书路径，在微信商户后台下载
    key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12  #服务器证书路径，在微信商户后台下载
#    pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify   #微信支付回调地址
#    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址

#积木报表访问地址
jimu:

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

@@ -79,7 +79,7 @@
    public boolean deletedTbTransitionListByCusIdAndPac(String cusId);

    //根据身份证号和套餐id查询和项目id
    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId}  AND pro_id =#{proId}")
    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(pac_id)  AND pro_id =#{proId}")
    public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(@Param("cusId") String cusId,@Param("proId") String proId);

    @Select("SELECT DISTINCT pac_id FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id)")
@@ -191,4 +191,11 @@
            "LEFT JOIN tj_package_project b\n" +
            "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
    BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);


    @Select("SELECT SUM(c.pro_price) FROM tj_project c WHERE c.pro_id IN " +
            "(SELECT b.pro_id FROM tb_transition b WHERE" +
            " b.cus_id=(SELECT a.cus_idcard FROM tj_customer a " +
            "WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId})  ")
    BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
}

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

@@ -122,7 +122,7 @@
            "\t\t\n" +
            "\tUNION\n" +
            "  \n" +
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id  WHERE a.cus_id=#{cusId}")
            "\tSELECT #{orderId},a.parent_pro_id,IFNULL(b.pro_default,''),'0',SYSDATE(),#{userName},b.is_sampling,#{userId},IFNULL(a.pac_id,0) FROM tb_transition a LEFT JOIN tj_project b ON a.parent_pro_id=b.pro_id  WHERE a.cus_id=#{cusId} GROUP BY a.parent_pro_id")
     boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);



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

@@ -101,4 +101,6 @@
    boolean saveTemoTransitionByGroupingId(String cusId,String groupingId);

    BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);

    BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
}

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

@@ -155,4 +155,9 @@
    public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) {
        return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId);
    }

    @Override
    public BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId, Long proId) {
        return tbTransitionMapper.getTbTransitionDxPriceAndOrdPrice(cusId,proId);
    }
}

 ltkj-hosp/src/main/resources/mapper/TjProjectMapper.xml

@@ -77,7 +77,7 @@

    <select id="selectTjProjectByProId" parameterType="Long" resultMap="TjProjectResult">
        <include refid="selectTjProjectVo"/>
        where pro_id = #{proId} and deleted='0'
        where pro_id = #{proId} and deleted=0
    </select>

    <insert id="insertTjProject" parameterType="TjProject" useGeneratedKeys="true" keyProperty="proId">