无纸化归档功能修改

src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java

@@ -8,10 +8,7 @@ package com.emr.service.ipml;
 
 import com.emr.dao.Archive_DetailMapper;
 import com.emr.dao.Archive_MasterMapper;
-import com.emr.entity.Archive_Detail;
-import com.emr.entity.Archive_Detail_Vo;
-import com.emr.entity.Emr_Fault_Vo;
-import com.emr.entity.OffsetLimitPage;
+import com.emr.entity.*;
 import com.emr.service.Archive_DetailService;
 import com.emr.util.Jpg2PdfUtil;
 import com.github.pagehelper.Page;
@@ -228,8 +225,9 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
 
     public Archive_Detail_Vo  changeTitle(Archive_Detail_Vo newList){
                 //改变title，变成title+inpNo
-                if (archiveMasterMapper.selectById(newList.getMasterid()) != null) {
-                    String inpNo = archiveMasterMapper.selectById(newList.getMasterid()).getInpNo();
+                Archive_Master master= archiveMasterMapper.selectById(newList.getMasterid());
+                if (master!= null) {
+                    String inpNo = master.getInpNo();
                     if (inpNo != null && !"".equals(inpNo)) {
                         newList.setTitle(newList.getTitle() +"_"+ inpNo);
                     }

src/main/resources/mapper/Archive_DetailMapper.xml

@@ -57,6 +57,10 @@
         <if test="patientId != null and patientId != ''">
             and id=#{patientId,jdbcType=VARCHAR}
         </if>)+'%'
+      and visit_id=(select visit_id from Archive_Master where 1=1
+      <if test="patientId != null and patientId != ''">
+        and id=#{patientId,jdbcType=VARCHAR}
+      </if>)
         and patindex('%B%',inp_no) != 0
         and id!=#{patientId,jdbcType=VARCHAR}
         )
@@ -79,6 +83,10 @@
     <if test="patientId != null and patientId != ''">
       and id=#{patientId,jdbcType=VARCHAR}
     </if>)+'%'
+    and visit_id=(select visit_id from Archive_Master where 1=1
+    <if test="patientId != null and patientId != ''">
+      and id=#{patientId,jdbcType=VARCHAR}
+    </if>)
     and patindex('%B%',inp_no) != 0
     and id!=#{patientId,jdbcType=VARCHAR}
     )
@@ -183,7 +191,12 @@
       select inp_no from archive_master where 1=1
       <if test="patientId != null and patientId != ''">
         and id=#{patientId,jdbcType=VARCHAR}
-      </if>)+'%'
+      </if>
+      and visit_id=(select visit_id from Archive_Master where 1=1
+      <if test="patientId != null and patientId != ''">
+        and id=#{patientId,jdbcType=VARCHAR}
+      </if>)
+      )+'%'
       and patindex('%B%',inp_no) != 0
       union
       select id from archive_master where id=#{patientId,jdbcType=VARCHAR}
@@ -197,7 +210,11 @@
       select inp_no from archive_master where 1=1
       <if test="patientId != null and patientId != ''">
         and id=#{patientId,jdbcType=VARCHAR}
-      </if>)+'%'
+      </if>
+      <if test="visit != null and patientId != ''">
+        and id=#{patientId,jdbcType=VARCHAR}
+      </if>
+      )+'%'
       and patindex('%B%',inp_no) != 0
       union
       select id from archive_master where id=#{patientId,jdbcType=VARCHAR}