From 99ce7c3637b32e8bdf0f59d24f8bf338ade495b8 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 27 Nov 2020 16:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201128?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchiveOtherExtController.java | 4 +- .../com/emr/dao/ArchiveOtherExtMapper.java | 9 +++- .../service/ipml/ArchiveOtherExtService.java | 9 +++- .../java/com/emr/vo/ArchiveOtherExtVo.java | 2 + .../mapper/ArchiveOtherExtMapper.xml | 54 +++++++++++++++++-- .../views/beHospitaledDir/beHospList.jsp | 2 +- src/main/webapp/WEB-INF/views/index.jsp | 2 +- .../js/hospitalCommom/hospitalCommom.js | 17 +++--- 8 files changed, 81 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 3e1b77f..18ac3d0 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -99,7 +99,7 @@ public class ArchiveOtherExtController { */ @RequestMapping("selectAllByIdsAndSubmitTime") @ResponseBody - public Msg selectSuccessByExtIds(String ids) throws Exception{ + public Msg selectSuccessByExtIds(String ids,String jzh) throws Exception{ if(StringUtils.isNotBlank(ids)){ String[] split = ids.split(","); StringBuilder temp = new StringBuilder(); @@ -111,7 +111,7 @@ public class ArchiveOtherExtController { temp.append("'").append(str).append("'"); } } - List list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString()); + List list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString(),jzh); return Msg.success().add("list",list); }else{ return Msg.fail("参数ids不能为空"); diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index a3c18b0..bf4df82 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -31,7 +31,7 @@ public interface ArchiveOtherExtMapper { * @param ids * @return */ - List selectAllByIdsAndSubmitTime(@Param("ids")String ids); + List selectAllByIdsAndSubmitTime(@Param("ids")String ids,@Param("patientId")String patientId); /** * 查询未同步更新完成的文件名称集合 @@ -45,4 +45,11 @@ public interface ArchiveOtherExtMapper { * @return */ List selectNotCompleteMidList(); + + /** + * 根据记账号查询该病例护理记录的最新采集完成时间 + * @param patientId 记账号 + * @return + */ + String selectMaxETimeByNursingAndJzh(@Param("patientId")String patientId); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 06e437d..16da8ee 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -49,7 +49,12 @@ public class ArchiveOtherExtService { //读取系统标识json文件 String fileNamePath = "static/json/dictionary.json"; List statusAndSysFlagValues = readJsonData(request, fileNamePath); + //查询护理的最新采集完成时间 + String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh()); for(ArchiveOtherExtVo vo : list){ + if(StringUtils.isNotBlank(maxETime)){ + vo.setTempTime(maxETime); + } //presulit为Done转换为完成 String presult = vo.getPresult(); if(StringUtils.isNoneBlank(presult) && "done".equalsIgnoreCase(presult)){ @@ -301,8 +306,8 @@ public class ArchiveOtherExtService { * @param ids * @return */ - public List selectAllByIdsAndSubmitTime(String ids) { - return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids); + public List selectAllByIdsAndSubmitTime(String ids,String jzh) { + return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids,jzh); } /** diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index e4357c0..197e128 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -34,4 +34,6 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String assortName; private String assortId; + + private String tempTime; } diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 3c5bda7..b27e1c8 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -529,11 +529,32 @@ SELECT archive_other_ext.ID FROM - archive_other_ext + (SELECT + CASE + WHEN + sysFlag = 1 THEN + ( + SELECT + MAX( eTime ) eTime + FROM + archive_other_ext + WHERE + sysFlag = 1 + AND jzh = #{patientId} + GROUP BY + sysFlag, + jzh + ) ELSE eTime + END eTime, + ID + FROM + archive_other_ext + WHERE + ID IN (${ids})) + archive_other_ext INNER JOIN archive_other_ext_submitTime ON archive_other_ext.ID = archive_other_ext_submitTime.other_ext_id WHERE eTime > create_time - AND archive_other_ext.ID IN ( ${ids} ) + + diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 1dece5d..543973b 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -832,6 +832,6 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index a4b0c96..b4f5c4f 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -355,7 +355,7 @@