【丽水】patItem筛选当前执行方式

陈昶聿

4 天以前 9b27e22beac4f247f0a703f1e8a8bb661dbc31f3

【丽水】patItem筛选当前执行方式

 smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java

@@ -469,6 +469,12 @@
    @ApiModelProperty(value = "当前发送方式")
    private String currentPreachform;

    /**
     * 当前执行方式多选筛选，多个值用逗号分隔
     */
    @ApiModelProperty(value = "当前执行方式多选筛选，多个值用逗号分隔")
    private String currentPreachforms;


    /**
     * 床号

 smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java

@@ -488,6 +488,12 @@
    @ApiModelProperty(value = "当前发送方式")
    private String currentPreachform;

    /**
     * 当前执行方式多选筛选，多个值用逗号分隔
     */
    @ApiModelProperty(value = "当前执行方式多选筛选，多个值用逗号分隔")
    private String currentPreachforms;


    /**
     * 床号

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

@@ -448,7 +448,7 @@
            if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())) {
                if (StringUtils.isNotEmpty(serviceSubtask.getPreachform())) {
                    //默认取第一个
                    serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
                    serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0].trim());
                }
            }
            PatMedInhosp inhosp = patMedInhospMapper.selectPatMedInhospByInhospid(serviceSubtask.getInhospid());

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

@@ -303,6 +303,11 @@
        END
    </sql>

    <!-- 当前执行方式：首次随访 current_preachform 为空时，取 preachform 的第一个执行方式兜底 -->
    <sql id="effectiveCurrentPreachformExpr">
        COALESCE(NULLIF(TRIM(current_preachform), ''), TRIM(SUBSTRING_INDEX(preachform, ',', 1)))
    </sql>

    <select id="selectServiceSubtaskBySendstate" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
            resultMap="ServiceSubtaskResult">
        <include refid="selectServiceSubtaskVo"/>
@@ -569,6 +574,9 @@
        <if test="pid != null ">and pid = #{pid}</if>
        <if test="preachform != null ">and preachform = #{preachform}</if>
        <if test="currentPreachform != null ">and current_preachform = #{currentPreachform}</if>
        <if test="currentPreachforms != null and currentPreachforms != ''">
            and FIND_IN_SET(<include refid="effectiveCurrentPreachformExpr"/>, #{currentPreachforms})
        </if>
        <if test="guid != null  and guid != ''">and guid = #{guid}</if>
        <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
        <if test="bedNo != null">and bed_no = #{bedNo}</if>
@@ -2922,6 +2930,9 @@
                #{state}
            </foreach>
        </if>
        <if test="currentPreachforms != null and currentPreachforms != ''">
            AND FIND_IN_SET(<include refid="effectiveCurrentPreachformExpr"/>, #{currentPreachforms})
        </if>
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>