代码提交

liusheng

13 小时以前 38e0cad3107b0a43e9afac4e5e55cf769e84d01c

代码提交

 ruoyi-admin/src/main/resources/application-local.yml

@@ -19,7 +19,7 @@
        #        password: csbsbxt@123
        #        driver-class-name: org.postgresql.Driver
        #      本地高斯
        url: jdbc:postgresql://127.0.0.1:5432/postgres
        url: jdbc:postgresql://192.168.100.138:5432/postgres
        username: gaussdb
        password: Ls@123456
        driver-class-name: org.postgresql.Driver

 ruoyi-admin/src/main/resources/application-wx.yml

@@ -19,10 +19,10 @@
        #        password: csbsbxt@123
        #        driver-class-name: org.postgresql.Driver
        #      本地高斯
#        url: jdbc:postgresql://192.168.100.120:5432/postgres
#        username: gaussdb
#        password: Ls@123456
#        driver-class-name: org.postgresql.Driver
        #        url: jdbc:postgresql://192.168.100.120:5432/postgres
        #        username: gaussdb
        #        password: Ls@123456
        #        driver-class-name: org.postgresql.Driver
        #      高斯数据库链接
        url: jdbc:postgresql://172.20.32.115:15400/smartorwx?prepareThreshold=0
        username: shuifang
@@ -90,8 +90,8 @@
    port: 6020

    # 地址（公司）
#    host: 116.62.18.175
#    port: 6020
    #    host: 116.62.18.175
    #    port: 6020
    # 数据库索引
    database: 0
    # 密码

 smartor/src/main/java/com/smartor/domain/PatMedInhosp.java

@@ -363,25 +363,25 @@
     * 开始出院日期
     */
    @ApiModelProperty(value = "开始出院日期")
    private Date startOutHospTime;
    private String startOutHospTime;

    /**
     * 结束出院日期
     */
    @ApiModelProperty(value = "结束出院日期")
    private Date endOutHospTime;
    private String endOutHospTime;

    /**
     * 开始入院日期
     */
    @ApiModelProperty(value = "开始入院日期")
    private Date startInHospTime;
    private String startInHospTime;

    /**
     * 结束入院日期
     */
    @ApiModelProperty(value = "结束入院日期")
    private Date endInHospTime;
    private String endInHospTime;

    @ApiModelProperty(value = "是否外部导入：0不是    1是")
    private Integer outImport = 0;

 smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java

@@ -198,14 +198,14 @@
     */
    @ApiModelProperty(value = "就诊开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date starttime;
    private String starttime;

    /**
     * 就诊结束时间
     */
    @ApiModelProperty(value = "就诊结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date endtime;
    private String endtime;


    /**

 smartor/src/main/resources/mapper/smartor/ExternallInfoMapper.xml

@@ -303,8 +303,9 @@
    <select id="getExternalOutHospInfo" resultMap="ExternalOutHospInfResult">
        <include refid="selectOutHospitalRecordVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and jzrq between TO_DATE(#{startTime}, 'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null">
                and jzrq > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and jzrq &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
        </where>
    </select>
@@ -312,8 +313,9 @@
    <select id="getExternalOutHospPatientInfo" resultMap="ExternalPatientInfoResult">
        <include refid="selectOutHospitalPatientRecordVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and jdsj between TO_DATE(#{startTime}, 'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null ">
                and jdsj > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and jdsj &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
            <if test="brid != null ">and BRID = #{brid}</if>
        </where>
@@ -322,8 +324,9 @@
    <select id="getExternalLeaveHospPatientInfo" resultMap="ExternalLeaveHospPatientInfoResult">
        <include refid="selectLeaveHospitalRecordVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and cysq between TO_DATE(#{startTime}, 'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null ">
                and cysq > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and cysq &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
        </where>
    </select>
@@ -331,8 +334,9 @@
    <select id="getExternalInHospPatientInfo" resultMap="ExternalInHospPatientInfoResult">
        <include refid="selectInHospitalRecordVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and ryrq between TO_DATE(#{startTime}, 'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null ">
                and ryrq > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and ryrq &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
            <if test="brid != null ">and BRID = #{brid}</if>
        </where>
@@ -341,9 +345,9 @@
    <select id="getExternalUserInfo" resultMap="ExternalUserInfoResult">
        <include refid="selectUserVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and create_time between TO_DATE(#{startTime},
                'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null ">
                and create_time > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and create_time &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
        </where>
    </select>
@@ -351,9 +355,9 @@
    <select id="getExternalDeptInfo" resultMap="ExternalDeptInfoResult">
        <include refid="selectDeptVo"/>
        <where>
            <if test="startTime != null and endTime != null ">and create_time between TO_DATE(#{startTime},
                'YYYY-MM-DD') AND
                TO_DATE(#{endTime},'YYYY-MM-DD')
            <if test="startTime != null and endTime != null ">
                and create_time > TO_DATE(#{startTime}, 'YYYY-MM-DD')
                and create_time &lt;= TO_DATE(#{endTime}, 'YYYY-MM-DD')
            </if>
        </where>
    </select>

 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml

@@ -909,10 +909,15 @@
            </if>
            <if test="patid != null  and patid != ''">AND a.id = #{patid}</if>
            <if test="telcode != null  and telcode != ''">AND a.telcode LIKE concat('%', #{telcode}, '%')</if>
            <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>
            <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}
            </if>
            <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>
            <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>
            <if test="leaveicd10code != null and leaveicd10code != ''">AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')</if>
            <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE
                concat('%',#{hospitaldistrictname}, '%')
            </if>
            <if test="leaveicd10code != null and leaveicd10code != ''">AND d.leaveicd10code LIKE
                concat('%',#{leaveicd10code}, '%')
            </if>
            <if test="endtime != null">AND d.endtime = #{endtime}</if>
            <if test="cry != null and cry == 0 ">AND d.endtime IS NULL</if>
            <if test="cry != null and cry == 1 ">AND d.endtime IS NOT NULL</if>
@@ -922,11 +927,18 @@
            <if test="diagname != null and diagname != ''">AND d.diagname LIKE concat('%',#{diagname}, '%')</if>
            <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
                AND d.leavehospitaldistrictcode IN
                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")">
                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{leavehospitaldistrictcode}
                </foreach>
            </if>
            <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
            <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0 and leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
                OR d.leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
                    #{leaveldeptcode}
                </foreach>
            </if>
            <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0 and leavehospitaldistrictcodes == null">
                AND d.leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
                    #{leaveldeptcode}
@@ -934,7 +946,8 @@
            </if>
            <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size()>0">
                AND d.hospitaldistrictcode IN
                <foreach collection="hospitaldistrictcodes" item="hospitaldistrictcode" open="(" separator="," close=")">
                <foreach collection="hospitaldistrictcodes" item="hospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{hospitaldistrictcode}
                </foreach>
            </if>

 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml

@@ -188,16 +188,16 @@
                )
            </if>
            <if test="startOutHospTime != null">
                AND TO_DATE(b.endtime,'YYYY-MM-DD') &gt;= TO_DATE(#{startOutHospTime},'YYYY-MM-DD')
                AND b.endtime &gt;= TO_DATE(#{startOutHospTime},'YYYY-MM-DD')
            </if>
            <if test="endOutHospTime != null">
                AND TO_DATE(b.endtime,'YYYY-MM-DD') &lt;= TO_DATE(#{endOutHospTime},'YYYY-MM-DD')
                AND b.endtime &lt;= TO_DATE(#{endOutHospTime},'YYYY-MM-DD')
            </if>
            <if test="startInHospTime != null">
                AND TO_DATE(b.starttime, 'YYYY-MM-DD') >= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
                AND b.starttime >= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
            </if>
            <if test="endInHospTime != null">
                AND TO_DATE(b.starttime, 'YYYY-MM-DD') &lt;= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
                AND b.starttime &lt;= TO_DATE(#{endInHospTime}, 'YYYY-MM-DD')
            </if>
            <if test="hospitalname != null  and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
                '%')

 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml

@@ -115,13 +115,14 @@
                '%')
            </if>
            <if test="deptname != null  and deptname != ''">and b.deptname like concat('%', #{deptname}, '%')</if>
            <if test="patname != null  and patname != ''">and b.patname like concat('%', #{patname}, '%')</if>
            <if test="deptcode != null  and deptcode != ''">and b.deptcode =#{deptcode}</if>
            <if test="drname != null  and drname != ''">and b.drname like concat('%', #{drname}, '%')</if>
            <if test="starttime != null ">and date_format(pmo.admitdate,'%y%m%d') &gt;=
                date_format(#{starttime},'%y%m%d')
            <if test="starttime != null ">and b.admitdate &gt;=
                TO_DATE(#{starttime},'YYYY-MM-DD')
            </if>
            <if test="endtime != null ">and date_format(pmo.admitdate,'%y%m%d') &lt;=
                date_format(#{endtime},'%y%m%d')
            <if test="endtime != null ">and b.admitdate &lt;=
                TO_DATE(#{endtime},'YYYY-MM-DD')
            </if>
            <if test="orgid != null  and orgid != ''">and b.orgid = #{orgid}</if>
            <if test="outhospno != null  and outhospno != ''">and b.outhospno = #{outhospno}</if>