zjh 本地 2023/12/12 -1

zjh

2023-12-12 8597cde32f9d7ad35028781cedff4ce79490c81f

zjh 本地 2023/12/12 -1

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

@@ -1548,7 +1548,6 @@
//                                longList.add(Long.valueOf(str));
//                            }
//                        }
//                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
                    } else {
                        parent.put("parentAdvice", null);

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

@@ -496,7 +496,6 @@
//                            }
//                        }
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
//                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));

                    } else {
                        parent.put("parentAdvice", null);

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

@@ -78,16 +78,10 @@
            //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
            final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
            if ("Y".equals(getInfoFromSqlData)){
                final LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                if (tjPatByIdCard!=null){
                    testMapper.getTjPatByCusId(cusIdcard);
                }else {
                    return error("身份证号不存在");
                }
//                 LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                 testMapper.getTjPatByCusId(cusIdcard);
            }
            //end2023.12.12


            LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
            wq.eq(TjReservation::getIdCard, cusIdcard);
            wq.eq(TjReservation::getIsExpire, 2);

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

@@ -581,24 +581,28 @@
                    rtwq1.eq(TjReport::getType, "医学名词");
//                    rtwq1.eq(TjReport::getTjNumber, tjNumber);
                    TjReport one11111 = tjReportService.getOne(rtwq1);
                    String report1 = one11111.getReport();
                    PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "医学名词.pdf");
                    if(null !=one11111){
                        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);
                    TjReport one1111 = tjReportService.getOne(rtwq);
                    String report = one1111.getReport();
                    PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "心电图.pdf");
                    if(null !=one1111){
                        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);
                    TjReport one111112 = tjReportService.getOne(rtwq12);
                    String report12 = one111112.getReport();
                    PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "附件.pdf");


                    if(null !=one111112){
                        String report12 = one111112.getReport();
                        PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "附件.pdf");
                    }
                    //合并
                    String[] files1 = {value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + "体检报告项目详情页.pdf", value + "\\" + userId + "医学名词.pdf", value + "\\" + userId + "附件.pdf", value + "\\" + userId + "心电图.pdf"};
                    String outputPath1 = value + "\\";

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

@@ -11,8 +11,8 @@
  # 文件路径 示例（ Windows配置D:/ltkj/uploadPath，Linux配置 /home/ltkj/uploadPath）
  # 用户换头像后的图片存储地址  测试：D:\ltkj\uploadPath\avatar\2022\12\14
  #profile: D:/ltkj/uploadPath
  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
#  profile: http://192.168.0.5:5502/uploadPath
#  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
  profile: http://192.168.0.5:5502/uploadPath

  # 获取ip地址开关
  addressEnabled: true
@@ -73,15 +73,15 @@
  # redis 配置
  redis:
    # 地址
    host: 101.42.27.146
#    host: localhost
#    host: 101.42.27.146
    host: localhost
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
    password: 654321
#    password: 123456
#    password: 654321
    password: 123456
    # 连接超时时间
    timeout: 120s
    lettuce:
@@ -180,8 +180,8 @@
#  体检套餐和轮播图存储路径
photoPath: D:\AppPhoto\uploadPath\
# nginx图片服务器
photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
#photoServer: http://192.168.0.5:5502/uploadPath/
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/

# 微信小程序appid secret
xcx:
@@ -210,11 +210,12 @@

#积木报表访问地址
jimu:
  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.5:5000/ltkj-admin
  path: http://192.168.0.5:5000/ltkj-admin
#   path: http://10.168.0.9:5011
#  path: http://192.168.0.99:8081/ltkj-admin
#  path: http://192.168.0.101:5011


jeecg :
  jmreport:

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java

@@ -335,6 +335,7 @@
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("deleted", getDeleted())
                .append("dwPhone", getDwPhone())
                .toString();
    }
}

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

@@ -31,6 +31,7 @@
        <result property="idType" column="id_type"/>
        <result property="ageUnit" column="age_unit"/>
        <result property="career" column="career"/>
        <result property="dwPhone" column="dw_phone"/>
    </resultMap>

    <sql id="selectTjCustomerVo">
@@ -59,7 +60,8 @@
               age,
               id_type,
               age_unit,
               career
               career,
               dw_phone
        from tj_customer
    </sql>

@@ -117,6 +119,7 @@
            <if test="idType != null">id_type,</if>
            <if test="ageUnit != null">age_unit,</if>
            <if test="career != null">career,</if>
            <if test="dwPhone != null">dw_phone,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="cusName != null and cusName != ''">#{cusName},</if>
@@ -144,6 +147,7 @@
            <if test="idType != null">#{idType},</if>
            <if test="ageUnit != null">#{ageUnit},</if>
            <if test="career != null">#{career},</if>
            <if test="dw_phone != null">#{dwPhone},</if>
        </trim>
    </insert>

@@ -175,6 +179,7 @@
            <if test="idType != null">id_type = #{idType},</if>
            <if test="ageUnit != null">age_unit = #{ageUnit},</if>
            <if test="career != null">career = #{career},</if>
            <if test="dwPhone != null">dw_phone = #{dwPhone},</if>
        </trim>
        where cus_id = #{cusId}
    </update>