【丽水】1.已拨通/未拨通要在综合统计处体现 2.过滤患者页面增加时间查询

陈昶聿

10 天以前 c0ddb9dad45beceb6afefb03fce409878079775b

【丽水】1.已拨通/未拨通要在综合统计处体现
    2.过滤患者页面增加时间查询

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -709,6 +709,7 @@
     * taskSituation4Info - taskSituation = 4
     * taskSituation5Info - taskSituation = 5
     * taskSituation6Info - taskSituation = 7
     * manuallyCalledInfo - isManuallyCalled = 1L
     * filterCountList - taskSituation = 6 && sendstate = 4
     *
     */

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -33,7 +33,7 @@
    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd[ HH:mm:ss]", timezone = "GMT+8")
    private Date createTime;

    /**
@@ -44,7 +44,7 @@
    /**
     * 更新时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd[ HH:mm:ss]", timezone = "GMT+8")
    private Date updateTime;

    /**

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -223,6 +224,12 @@
    private String hospType;

    /**
     * 人工电话标记
     */
    @ApiModelProperty(value = "是否人工打过电话 0-没打过 1-打过")
    private Long isManuallyCalled;

    /**
     * pageNum
     */
    @ApiModelProperty("pageNum")

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

@@ -102,6 +102,10 @@
    @Excel(name = " 应随访人次 ")
    private Long followUpNeeded = 0L;

    @ApiModelProperty(value = "人工已拨通总量")
    @Excel(name = " 人工已拨通总量 ")
    private Long manuallyCalled = 0L;

    @ApiModelProperty(value = "首次无需随访")
    private Long nonFollowUpFirst = 0L;


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

@@ -3324,6 +3324,12 @@
                    serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
                }

                //人工已拨通总量
                if (ObjectUtils.isNotEmpty(serviceSubtask.getIsManuallyCalled())
                        && serviceSubtask.getIsManuallyCalled().equals(1L)) {
                    serviceSubtaskStatistic.setManuallyCalled(serviceSubtaskStatistic.getManuallyCalled() + 1L);
                }

                //首次出院随访
                if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
                    //首次应随访
@@ -4343,6 +4349,7 @@
     * taskSituation4Info - taskSituation = 4
     * taskSituation5Info - taskSituation = 5
     * taskSituation6Info - taskSituation = 7
     * manuallyCalledInfo - isManuallyCalled = 1L
     * filterCountList - taskSituation = 6 && sendstate = 4
     *
     */
@@ -4521,6 +4528,9 @@
                serviceSubtaskCountReq.setTaskSituation(6);
                serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
                break;
            case "manuallyCalledInfo":
                serviceSubtaskCountReq.setIsManuallyCalled(1L);
                break;
            default:
                break;
        }

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

@@ -1573,7 +1573,8 @@
        continue_content,
        continue_count,
        continue_time_next,
        task_situation
        task_situation,
        is_manually_called
        from service_subtask
        where 1=1
        and del_flag = 0
@@ -1860,7 +1861,8 @@
        continue_count,
        continue_time_next,
        task_situation,
        remark
        remark,
        is_manually_called
        from service_subtask
        where 1=1
        and del_flag = 0
@@ -1947,6 +1949,9 @@
        <if test="deptcode != null and deptcode != ''">
            AND deptcode = #{deptcode}
        </if>
        <if test="isManuallyCalled != null">
            AND is_manually_called = #{isManuallyCalled}
        </if>
        order by endtime desc
        <if test="pageSize != null  and pageNum != null">
            limit ${pageSize} OFFSET ${pageNum}