diff --git a/doc/gm_record.bak b/doc/gm_record.bak index 857d9c0..8307f3f 100644 Binary files a/doc/gm_record.bak and b/doc/gm_record.bak differ diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index f0d0c0d..4921113 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -34,7 +34,9 @@ public class ArchiveOtherExtController { @RequestMapping("getArchiveExtInfo") @ResponseBody public OffsetLimitPage getArchiveExtInfo(Integer offset, Integer limit, ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){ - PageHelper.offsetPage(offset,limit); + if(null != offset && null != limit) { + PageHelper.offsetPage(offset, limit); + } try { List list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo); return new OffsetLimitPage((Page) list); @@ -44,6 +46,18 @@ public class ArchiveOtherExtController { return null; } } + @RequestMapping("getArchiveExtInfoList") + @ResponseBody + public List getArchiveExtInfoList(ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){ + try { + List list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo); + return list; + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } /** * 同步更新 diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index 6c19aaa..e4357c0 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -30,4 +30,8 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String statusFlagStr; private String createTime; + + private String assortName; + + private String assortId; } diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 0834fd0..77035cd 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -432,7 +432,7 @@ diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 269d160..eddd3bb 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -709,6 +709,12 @@ +
+ + +