23
lige
2023-12-11 c7e8b28a453bf85fb78c1f09a6d613ecef9ea240
23
5个文件已修改
40 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application.yml 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
@@ -51,9 +51,9 @@
     * 查询收费项目列表
     */
//    @PreAuthorize("@ss.hasPermi('system:sfxm:list')")
    @GetMapping("/list")
    @PostMapping("/list")
    @ApiOperation(value = "查询")
    public TableDataInfo list(DictSfxm dictSfxm) {
    public TableDataInfo list(@RequestBody DictSfxm dictSfxm) {
        startPage();
        String pym = dictSfxm.getPym();
        if(null !=pym && !"".equals(pym)) {
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.99:5502/uploadPath
#  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
  profile: http://192.168.0.5:5502/uploadPath
  # 获取ip地址开关
  addressEnabled: true
@@ -73,14 +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: 654321
    password: 123456
    # 连接超时时间
    timeout: 120s
    lettuce:
@@ -179,8 +180,8 @@
#  体检套餐和轮播图存储路径
photoPath: D:\AppPhoto\uploadPath\
# nginx图片服务器
photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
#photoServer: http://192.168.0.99:5502/uploadPath/
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
# 微信小程序appid secret
xcx:
@@ -210,8 +211,8 @@
#积木报表访问地址
jimu:
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.99:8080/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
  path: http://192.168.0.5:5000/ltkj-admin
#  path: http://192.168.0.99:8081/ltkj-admin
#  path: http://192.168.0.101:5011
ltkj-hosp/src/main/resources/mapper/hosp/DictSfxmMapper.xml
@@ -62,14 +62,13 @@
                            and xmbm = #{xmbm}
                        </if>
                        <if test="xmmc != null  and xmmc != ''">
--                             and xmmc like "%"#{xmmc}"%"
                            and xmmc like CONCAT("%",#{xmmc},"%")
                        </if>
                        <if test="pym != null  and pym != ''">
                            and pym like "%"#{pym}"%"
                            and pym like CONCAT("%",#{pym},"%")
                        </if>
                        <if test="wbm != null  and wbm != ''">
                            and wbm like "%"#{wbm}"%"
                            and wbm like CONCAT("%",#{wbm},"%")
                        </if>
                        <if test="zjm != null  and zjm != ''">
                            and zjm = #{zjm}
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -85,7 +85,7 @@
    <select id="getTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
        <include refid="selectTjOrderVo"/>
        <where>
            <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
            <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
            <if test="checkStatus != null and checkStatus==0 ">and status =288</if>
            <if test="checkStatus != null and checkStatus==1 ">and status =401 or  status= 402 </if>
            <if test="compId != null ">and comp_id = #{compId}</if>
@@ -99,7 +99,7 @@
    <select id="getWCsTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
        <include refid="selectTjOrderVo"/>
        <where>
            <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
            <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
            <if test="compId != null ">and comp_id = #{compId}</if>
            <if test="beginTime != null and endTime != null ">and create_time BETWEEN #{beginTime} and #{endTime}</if>
            and  deleted =0
@@ -112,7 +112,7 @@
    <select id="getYCsTjOrderList" parameterType="java.util.Map" resultMap="TjOrderResult">
        <include refid="selectTjOrderVo"/>
        <where>
            <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
            <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
            <if test="compId != null ">and comp_id = #{compId}</if>
            <if test="beginTime != null and endTime != null ">and create_time BETWEEN #{beginTime} and #{endTime}</if>
            and  deleted =0
@@ -125,7 +125,7 @@
    <select id="getCsTjOrderList1" parameterType="java.util.Map" resultMap="TjOrderResult">
        <include refid="selectTjOrderVo"/>
        <where>
            <if test="tjNum != null">and tj_number LIKE '%${tjNum}'</if>
            <if test="tjNum != null">and tj_number LIKE concat('%', #{tjNum}, '%')</if>
            <if test="checkStatus != null and checkStatus==0 ">and status =301</if>
            <if test="checkStatus != null and checkStatus== 1 ">and status =401 or status= 402 </if>
            <if test="compId != null ">and comp_id = #{compId}</if>
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -83,7 +83,7 @@
            <if test="name != null  and name != ''">and name =#{name}</if>
            <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>
            <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
            <if test="company != null  and company != ''">and company like "%"#{company}"%"</if>
            <if test="company != null  and company != ''">and company like concat('%', #{company}, '%')</if>
            <if test="reservationTime != null ">and reservation_time  BETWEEN #{reservationTime} and now()</if>
            <if test="isExpire != null ">and is_expire = #{isExpire}</if>
            and deleted = '0'
@@ -96,7 +96,7 @@
        <where>
            <if test="name != null  and name != ''">and name = #{name}</if>
            <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
            <if test="company != null  and company != ''">and company like "%"#{company}"%"</if>
            <if test="company != null  and company != ''">and company like concat('%', #{company}, '%')</if>
            <if test="reservationTime != null ">and reservation_time = #{reservationTime}</if>
            and deleted = '1'
        </where>