代码提交

liusheng

2025-04-16 198ee38684b844473cd38dbb27ac984a2e932480

代码提交

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

@@ -13,10 +13,10 @@
        #        公司
        #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        丽水
        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
#        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: smartor
#        password: Smartor.2023
#        driverClassName: com.mysql.cj.jdbc.Driver
        #        # 新华
        #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
@@ -24,10 +24,10 @@
        #        driverClassName: com.mysql.cj.jdbc.Driver

        #  公司云
#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: hxsoft
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver
        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: hxsoft
        password: Hxerp2000
        driverClassName: com.mysql.cj.jdbc.Driver


      # 从库数据源

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java

@@ -97,7 +97,7 @@
        }

        // 修改 SQL
        if (originalSql.toUpperCase().contains("ORGID =")) {
        if (originalSql.toUpperCase().contains("ORGID =") || originalSql.toUpperCase().contains("ORGID=")) {
            return originalSql;
        } else if (originalSql.toUpperCase().contains("WHERE")) {
            // 在已有 WHERE 后添加 orgid 条件

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

@@ -487,5 +487,16 @@
    @Excel(name = "手术级别名称")
    private String opleveldesc;


    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始手术时间")
    private Date beginTime;

    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束手术时间")
    private Date endTime;

}


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

@@ -197,4 +197,16 @@
    @ApiModelProperty(value = "手机号")
    private String telcode;



    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始就诊时间")
    private Date beginTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束就诊时间")
    private Date endTime;

}

 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java

@@ -257,8 +257,6 @@
    public Boolean addInDeptInfo(Map dataMap) {
        log.error("ServiceExternalServiceImpl---addInDeptInfo的新增的值为：{}", dataMap);
        Map yeWuXX = (Map) dataMap.get("YeWuXX");

//        List<HashMap<String, Object>> hospPatientDiagnoseInfos = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null;
        Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
        Map<String, Object> RuKeXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("RuKeXX") : null;


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

@@ -182,8 +182,14 @@
            <if test="optypename != null  and optypename != ''">
                and optypename like concat('%', #{optypename}, '%')
            </if>
            <if test="operatortime != null ">
                and operatortime = #{operatortime}
            <!--            <if test="operatortime != null ">-->
            <!--                and operatortime = #{operatortime}-->
            <!--            </if>-->
            <if test="beginTime != null ">and date_format(operatortime,'%y%m%d') &gt;=
                date_format(#{beginTime},'%y%m%d')
            </if>
            <if test="endTime != null ">and date_format(operatortime,'%y%m%d') &lt;=
                date_format(#{endTime},'%y%m%d')
            </if>
            <if test="opreqtime != null ">
                and opreqtime = #{opreqtime}

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

@@ -114,7 +114,13 @@
            <if test="deptname != null  and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
            <if test="drname != null  and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
            <if test="patname != null  and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
            <if test="admitdate != null ">and pmo.admitdate = #{admitdate}</if>

            <if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &gt;=
                date_format(#{beginTime},'%Y%m%d%H%i%s')
            </if>
            <if test="endTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &lt;=
                date_format(#{endTime},'%Y%m%d%H%i%s')
            </if>
            <if test="patid != null ">and pmo.patid = #{patid}</if>
            <if test="patno != null ">and pmo.patno = #{patno}</if>
            <if test="orgid != null  and orgid != ''">and pmo.orgid = #{orgid}</if>