sinake
3 天以前 30c41afb4fe4fd4b857f579e98543da211c11989
新增随访情况统计
已修改5个文件
52 ■■■■ 文件已修改
ruoyi-admin/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/pom.xml
@@ -180,12 +180,6 @@
            <artifactId>postgresql</artifactId>
            <version>42.6.0</version> <!-- 请根据需要选择最新版本 -->
        </dependency>
        <!--oracle-->
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <scope>runtime</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,7 @@
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver
        #  公司本地
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.100.10:3306/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
@@ -113,7 +113,7 @@
            multi-statement-allow: true
  # redis 配置
  redis:
    host: 192.168.100.10
    host: 127.0.0.1 #192.168.100.10
    port: 6020
    database: 0
    password: Smartor
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -640,5 +640,5 @@
    private String managementDoctor;
    @ApiModelProperty(value = "随访情况:1正常语音,2患者拒接或拒访,3面访或者接诊,4微信随访,5随访电话不正确,6其他")
    private String taskSituation;
    private Integer taskSituation;
}
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -188,4 +188,23 @@
    @ApiModelProperty(value = "满意度比例")
    private String joyTotal="";
    @ApiModelProperty(value = "随访情况:1正常语音")
    private Integer taskSituation1 = 0;
    @ApiModelProperty(value = "随访情况:2患者拒接或拒访")
    private Integer taskSituation2 = 0;
    @ApiModelProperty(value = "随访情况:3面访或者接诊")
    private Integer taskSituation3 = 0;
    @ApiModelProperty(value = "随访情况:4微信随访")
    private Integer taskSituation4 = 0;
    @ApiModelProperty(value = "随访情况:5随访电话不正确")
    private Integer taskSituation5 = 0;
    @ApiModelProperty(value = "随访情况:6其他")
    private Integer taskSituation6 = 0;
}
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2437,8 +2437,25 @@
                    serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
                }
            }
            //随访情况
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==1) {
                serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
            }
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==2) {
                serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
            }
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==3) {
                serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
            }
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==4) {
                serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
            }
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==5) {
                serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
            }
            if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==6) {
                serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
            }
        }