From 7007ab24051e79fe268fb1f468fba673159d5bdf Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Mon, 19 Dec 2022 10:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=8C=BB=E7=94=9F=E3=80=81=E6=8A=A4=E5=A3=AB=E4=BC=98?= =?UTF-8?q?=E5=85=88=E6=98=BE=E7=A4=BA=E7=94=B5=E5=AD=90=E7=97=85=E5=8E=86?= =?UTF-8?q?=E3=80=81=E6=8A=A4=E7=90=86=E6=96=87=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchiveOtherExtController.java | 6 +- .../controller/beHospitaledController.java | 3 +- .../com/emr/dao/ArchiveOtherExtMapper.java | 4 + .../java/com/emr/entity/OffsetLimitPage.java | 15 ++ .../service/ipml/ArchiveOtherExtService.java | 14 +- .../mapper/ArchiveOtherExtMapper.xml | 213 ++++++++++-------- 6 files changed, 163 insertions(+), 92 deletions(-) diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 0a0972f..d677a79 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -40,9 +40,13 @@ public class ArchiveOtherExtController { if(null != offset && null != limit) { PageHelper.offsetPage(offset, limit); } + try { List list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo); - return new OffsetLimitPage((Page) list); + long offsetLong = offset.longValue(); + long limitLong = limit.longValue(); + OffsetLimitPage page =new OffsetLimitPage(limitLong,offsetLong,list); + return page; } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 1184046..f7db0ca 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -200,9 +200,10 @@ public class beHospitaledController { String method = HomepageMethod; JAXDynamicClientFactory factory = JAXDynamicClientFactory.newInstance(); Client client = null; + String refreshFlag="2"; try { client = factory.createClient(endpoint); - Object[] res = client.invoke(method, archiveDetailId); + Object[] res = client.invoke(method, archiveDetailId,refreshFlag); result = (String) res[0]; //更新master表完整性字段 if(StringUtils.isNotBlank(result)){ diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index 3caa82e..9c7ee94 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -23,6 +23,10 @@ public interface ArchiveOtherExtMapper { List getArchiveExtInfo(ArchiveOtherExtVo record); + List getArchiveExtInfoDoctor(ArchiveOtherExtVo record); + + List getArchiveExtInfoNurse(ArchiveOtherExtVo record); + List selectAllByIds(@Param("ids") String ids); int updateSubmit(@Param("ids")String ids); diff --git a/src/main/java/com/emr/entity/OffsetLimitPage.java b/src/main/java/com/emr/entity/OffsetLimitPage.java index 3f60f6a..13ae682 100644 --- a/src/main/java/com/emr/entity/OffsetLimitPage.java +++ b/src/main/java/com/emr/entity/OffsetLimitPage.java @@ -12,8 +12,17 @@ import java.util.List; public class OffsetLimitPage { private Long total; + private Long limit; private List rows; + public Long getLimit() { + return limit; + } + + public void setLimit(Long limit) { + this.limit = limit; + } + public Long getTotal() { return total; } @@ -39,6 +48,12 @@ public class OffsetLimitPage { this.total = total; } + public OffsetLimitPage(Long total, Long limit, List rows) { + this.total = total; + this.limit = limit; + this.rows = rows; + } + public OffsetLimitPage(Page rows) { this(rows, rows.getTotal()); } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index e4e1ed3..75e7486 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -7,6 +7,7 @@ import com.emr.dao.ArchiveOtherMapper; import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExt; import com.emr.entity.ArchiveOtherExtSubmittime; +import com.emr.entity.Power_User; import com.emr.vo.ArchiveOtherExtVo; import com.emr.vo.KeyValue; import org.apache.commons.lang3.StringUtils; @@ -47,7 +48,18 @@ public class ArchiveOtherExtService { //读取系统标识json文件 String fileNamePath = "static/json/dictionary.json"; List statusAndSysFlagValues = readJsonData(request, fileNamePath); - List list = archiveOtherExtMapper.getArchiveExtInfo(archiveOtherExtVo); + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + Integer roleId = user.getRoleId(); + List list =null; + if (roleId==1){ + list = archiveOtherExtMapper.getArchiveExtInfoDoctor(archiveOtherExtVo); + } + if (roleId==2) { + list = archiveOtherExtMapper.getArchiveExtInfoNurse(archiveOtherExtVo); + } + if (roleId!=2 ||roleId!=1){ + list = archiveOtherExtMapper.getArchiveExtInfo(archiveOtherExtVo); + } if(!CollectionUtils.isEmpty(list)) { //查询护理的最新采集完成时间 String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh()); diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 694b84d..9c4a61e 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -438,95 +438,6 @@ + + select * from archive_detail where id=#{did} + + + +