5dce75a53738c22cbe924efad19bc26a724ca2ac..a854ee901ec35f92bd02fcfa04bb7146028e98ef
3 天以前 liusheng
代码提交
a854ee 对比 | 目录
3 天以前 liusheng
代码提交
0cd7d4 对比 | 目录
已修改7个文件
19 ■■■■■ 文件已修改
ruoyi-admin/src/main/resources/application-druid.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-hn.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-ls.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-xh.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        #        义乌二院
        #    义乌二院
        #        url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: root
        #        password: 123456
ruoyi-admin/src/main/resources/application-hn.yml
@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        #        河南
        #   河南
        url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
ruoyi-admin/src/main/resources/application-ls.yml
@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        #        丽水
        #   丽水
        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
ruoyi-admin/src/main/resources/application-xh.yml
@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        # 新华
        #   新华
        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
ruoyi-admin/src/main/resources/application.yml
@@ -15,7 +15,7 @@
  # 验证码类型 math 数组计算 char 字符验证
  captchaType: math
# 开发环境配置
#  开发环境配置
server:
  # 服务器的HTTP端口,默认为8080
  port: 8095
smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -221,6 +221,7 @@
        if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
        Date newDate = addDays(patMedOperation1.getOpreqtime(), serviceTask.getSendDay().intValue());
        serviceSubtask.setLongSendTime(newDate);
        serviceSubtask.setVisitTime(newDate);
        //患者发送时间
        if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
            String remark = patArchive.getNotrequiredreason();
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -187,7 +187,9 @@
            <if test="leavehospitaldistrictname != null  and leavehospitaldistrictname != ''">and
                leavehospitaldistrictname = #{leavehospitaldistrictname}
            </if>
            <if test="leavediagname != null  and leavediagname != ''">and leavediagname like concat('%', #{leavediagname}, '%')</if>
            <if test="leavediagname != null  and leavediagname != ''">and leavediagname like concat('%',
                #{leavediagname}, '%')
            </if>
            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="patguid != null ">and patguid = #{patguid}</if>
@@ -977,8 +979,8 @@
                </foreach>
            </if>
            <if test="startTime != null and endTime!=null">
                AND endtime > #{startTime}
                AND endtime &lt;= #{endTime}
                AND date_format(visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
                AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
            </if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>