Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/Emr_Fault_DetailMapper.xml

src/main/resources/mapper/Emr_Fault_DetailMapper.xml

@@ -1069,7 +1069,7 @@
     on m.id=f.master_id
     LEFT JOIN emr_fault_detail e
     on e.archive_detail_id=m.id
-    <where>  1=1 and m.ArchiveState  not in('作废','已封存','') and m.ArchiveState is not null  and  m.Is_Valid!=1 and total_back_num>0 and f.following_type=9 and e.back_flag in ('5','6')
+    <where>  1=1 and m.ArchiveState  not in('作废','已封存','') and m.ArchiveState is not null  and  m.Is_Valid!=1 and total_back_num>0 and f.following_type=9
       <if test="inpNo != null and inpNo != ''">
         and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
       </if>
@@ -1190,7 +1190,6 @@
         AND m.ArchiveState NOT IN ( '作废', '已封存', '' )
         AND m.ArchiveState IS NOT NULL
         AND m.Is_Valid!= 1
-        AND e.back_flag in ('5','6')
             <if test="sysflag == 1">
                 AND l.bnum is null
             </if>
@@ -1203,6 +1202,30 @@
             <if test="sysflag == 2">
                 AND l.bnum>1 OR l1.cnum is not NULL OR l2.scoreSum>10
             </if>
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '1'">-->
+                <!--AND l.bnum is NULL or 2>l.bnum-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '1'">-->
+                <!--AND l1.cnum is NULL-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '1'">-->
+                <!--AND l2.scoreSum is null-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '1'">-->
+                <!--AND 10>scoreSum-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '2'">-->
+                <!--AND l.bnum is NULL or 2>l.bnum-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '2'">-->
+                <!--AND l1.cnum is NULL-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '2'">-->
+                <!--AND l2.scoreSum is null-->
+            <!--</if>-->
+            <!--<if test="sysflag != null and sysflag != '' and sysflag = '2'">-->
+                <!--AND 10>scoreSum-->
+            <!--</if>-->
             <if test="inpNo != null and inpNo != ''">
                 and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
             </if>