liusheng
5 天以前 11bc9c5453ef32df0be2c3d9c549b04910b8fbca
Merge remote-tracking branch 'origin/master'
已修改2个文件
10 ■■■■ 文件已修改
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -684,10 +684,4 @@
    @ApiModelProperty(value = "随访时间")
    private Date visitTime;
    /**
     * 随访次数标识
     */
    @ApiModelProperty(value = "随访次数标识:0首次随访  1再次随访")
    private Integer visit_count_flag;
}
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -290,10 +290,10 @@
            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
            <if test="score != null">and score = #{score}</if>
<!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
            <if test="visit_count_flag != null and visit_count_flag == 0">
            <if test="visitCount != null and visitCount == 1">
                AND visit_count = 1
            </if>
            <if test="visit_count_flag != null and visit_count_flag == 1">
            <if test="visitCount != null and visitCount > 1">
                AND visit_count > 1
            </if>
            <if test="remark != null">and remark = #{remark}</if>