From 26d0b8ee53c3cbc7486b94d17950385d62d90b2f Mon Sep 17 00:00:00 2001
From: xuhaoxiang <1216720373@qq.com>
Date: Mon, 26 Jul 2021 22:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=BA=B8=E5=8C=96=E5=BD=92=E6=A1=A3?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ipml/Archive_DetailServiceImpl.java | 10 ++++-----
.../resources/mapper/Archive_DetailMapper.xml | 21 +++++++++++++++++--
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
index bf02b5ca..eb4018b1 100644
--- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
+++ b/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);
}
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index f704a64a..bc3ad0c7 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -57,6 +57,10 @@
and id=#{patientId,jdbcType=VARCHAR}
)+'%'
+ and visit_id=(select visit_id from Archive_Master where 1=1
+
+ and id=#{patientId,jdbcType=VARCHAR}
+ )
and patindex('%B%',inp_no) != 0
and id!=#{patientId,jdbcType=VARCHAR}
)
@@ -79,6 +83,10 @@
and id=#{patientId,jdbcType=VARCHAR}
)+'%'
+ and visit_id=(select visit_id from Archive_Master where 1=1
+
+ and id=#{patientId,jdbcType=VARCHAR}
+ )
and patindex('%B%',inp_no) != 0
and id!=#{patientId,jdbcType=VARCHAR}
)
@@ -183,7 +191,12 @@
select inp_no from archive_master where 1=1
and id=#{patientId,jdbcType=VARCHAR}
- )+'%'
+
+ and visit_id=(select visit_id from Archive_Master where 1=1
+
+ and id=#{patientId,jdbcType=VARCHAR}
+ )
+ )+'%'
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
and id=#{patientId,jdbcType=VARCHAR}
- )+'%'
+
+
+ and id=#{patientId,jdbcType=VARCHAR}
+
+ )+'%'
and patindex('%B%',inp_no) != 0
union
select id from archive_master where id=#{patientId,jdbcType=VARCHAR}