召回日志模块、住院返修病历模块、初次提交归档模块不可查询作废及已封存

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1429,7 +1429,8 @@
         from Archive_Master_Following where 1=1 and following_type='5') as t1  where 1=1 and RowNum = 1
         ) f
         LEFT JOIN (
-        select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time from archive_master  where archiveState!='作废'
+            select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time
+            from archive_master  where 1=1 and ArchiveState!='作废' and ArchiveState!='已封存' and Is_Valid!=1
         ) m
         on f.master_id=m.master_id
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) c
@@ -1437,7 +1438,7 @@
 
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
         on m.dept_admission_to=e.code
-        <where> 1=1 and m.master_id!=''
+        <where> 1=1 and m.master_id!='' and m.master_id is not null
             <if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
                 and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),m.discharge_date_time,23)),f.handle_time) , 0)-#{overdueDays,jdbcType=NCHAR}>=#{overdueDaysTwo,jdbcType=NCHAR}
             </if>
@@ -1519,7 +1520,8 @@
         )f2
         on f1.master_id=f2.master_id and f1.rowNumb=f2.rowNumb-1
         LEFT JOIN (
-        select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time from archive_master  where archiveState!='作废'
+        select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time
+         from archive_master  where 1=1 and ArchiveState!='作废' and ArchiveState!='已封存' and Is_Valid!=1
         ) m
         on f1.master_id=m.master_id
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) c
@@ -1527,7 +1529,7 @@
 
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
         on m.dept_admission_to=e.code
-        <where> 1=1
+        <where> 1=1 and m.master_id!='' and m.master_id is not null
             <if test="overdueDaysTwo != null and overdueDaysTwo != '' and overdueDays != null and overdueDays != ''">
                 and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-#{overdueDays,jdbcType=NCHAR}>=#{overdueDaysTwo,jdbcType=NCHAR}
             </if>
@@ -1699,7 +1701,7 @@
         select m.id ,m.inp_no,m.visit_id,m.name,ISNULL(f.name, m.dept_name) dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,
         ISNULL(c.name, m.dept_admission_to) dept_admission_to
         ,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type
-        from(select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1)  m
+        from(select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1 )  m
         LEFT JOIN(
             select master_id ,handle_time ,handle_name,following_type  from (
             select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum

src/main/resources/mapper/Emr_Fault_DetailMapper.xml

@@ -761,7 +761,7 @@
     on a.master_id=m.id
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d
     on m.dept_name=d.code
-    <where>  1=1
+    <where>  1=1 and m.ArchiveState!='作废' and  m.Is_Valid!=1  and m.ArchiveState!='已封存'
       <if test="inpNo != null and inpNo != ''">
         and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
       </if>

src/main/resources/mapper/Emr_LogMapper.xml

@@ -171,7 +171,7 @@
       < ess.create_time and archive_detail_id= ess.archive_detail_id ) and ess.state in('已召回')
     ) f
     on l.log_title=f.archive_detail_id
-    where 1=1
+    where 1=1 and m.ArchiveState!='作废' and  m.Is_Valid!=1 and m.ArchiveState!='已封存'
         <if test="inpNo != null and inpNo != ''">
           and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
         </if>

src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp

@@ -434,6 +434,8 @@
                                 a = '<span style="color:blue"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                             } else if (value == "主任退回") {
                                 a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            }else{
+                                a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                             }
                             return a;
                         }