Merge branch 'develop' into dev/20200603_1.3.1

# Conflicts:
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java
#	src/main/resources/mapper/BehospitalInfoMapper.xml

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -697,15 +697,15 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     public void execute(TaskVO taskVO, String param) {
         // 处理医院信息
         dealTaskVO(param, taskVO);
-        // 类型过滤(1：出院时间比当前时间早3天前的病历（例如：长兴病历）)
+        // 类型过滤(1：出院时间比当前时间早4天前的病历（例如：长兴病历）)
         if (taskVO.getType() != null && taskVO.getType() == 1) {
-            Date date = DateUtil.addDay(DateUtil.now(), -3);
+            Date date = DateUtil.addDay(DateUtil.now(), -4);
             taskVO.setLeaveDate(date);
         }
         // 近3天不含当天的病历强制评分更新
         if (taskVO != null && ListUtil.isNotEmpty(taskVO.getIndividuation()) && taskVO.getIndividuation().contains(1)) {
-            // 3天前最早时间
-            taskVO.setStartLeaveDate(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(), -3)));
+            // 4天前最早时间
+            taskVO.setStartLeaveDate(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(), -4)));
             // 昨天最迟时间
             taskVO.setEndLeaveDate(DateUtil.getLastTimeOfDay(DateUtil.addDay(DateUtil.now(), -1)));
         }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -92,6 +92,7 @@
             and t.is_placefile = #{isPlacefile}
         </if>
         and t.qc_type_id != 0
+        and t.is_placefile = 1
     </select>
 
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
@@ -200,6 +201,7 @@
         select * from med_behospital_info a
         where a.is_deleted = 'N'
         and a.qc_type_id != 0
+        and a.is_placefile = 1
         <if test="filterFlag != null and filterFlag == 0">
             and
             not EXISTS (
@@ -227,6 +229,7 @@
             select * from med_behospital_info b
             where b.is_deleted = 'N'
             and b.qc_type_id != 0
+            and b.is_placefile = 1
             <if test="startLeaveDate != null">
                 <![CDATA[ and b.leave_hospital_date >= #{startLeaveDate}]]>
             </if>
@@ -313,6 +316,7 @@
             and t.is_placefile = #{isPlacefile}
         </if>
         and t.qc_type_id != 0
+        and t.is_placefile = 1
     </select>
 
     <!--质控评分(个人)分页-->
@@ -383,6 +387,7 @@
             and t.is_placefile = #{isPlacefile}
         </if>
         and t.qc_type_id != 0
+        and t.is_placefile = 1
     </select>
 
     <!-- 出院总人数统计-全院-首页 -->