From 1a13005b82aa9f45e85104d6076be708fd15e70a Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Tue, 11 Oct 2022 11:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchiveOtherExtController.java | 4 +- .../com/emr/dao/ArchiveOtherExtMapper.java | 2 + src/main/java/com/emr/dao/V_CountMapper.java | 3 + .../service/ipml/ArchiveOtherExtService.java | 66 ++++---- .../ipml/Archive_MasterServiceImpl.java | 16 +- .../emr/service/ipml/V_CountServiceImpl.java | 17 +- .../java/com/emr/vo/ArchiveOtherExtVo.java | 3 +- .../mapper/ArchiveOtherExtMapper.xml | 60 ++++--- src/main/resources/mapper/V_CountMapper.xml | 150 +++++++++++++----- .../js/hospitalCommom/hospitalCommom.js | 19 ++- .../webapp/static/js/vCount/vCountList.js | 6 +- 11 files changed, 232 insertions(+), 114 deletions(-) diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 7c5bcd2..2155f72 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -83,7 +83,7 @@ public class ArchiveOtherExtController { */ @RequestMapping("submitUpdate") @ResponseBody - public Msg submitUpdate(String ids,String notNursingIds,String detailIds,String jzh,String masterId,Integer sysFlag,HttpServletRequest request) throws Exception{ + public Msg submitUpdate(String ids,String notNursingIds,String nursingIds,String detailIds,String jzh,String masterId,Integer sysFlag,HttpServletRequest request) throws Exception{ if(StringUtils.isBlank(ids)){ return Msg.fail("至少选中一个!"); } @@ -95,7 +95,7 @@ public class ArchiveOtherExtController { return Msg.fail("masterId不能为空!"); } } - archiveOtherExtService.updateSubmit(ids,notNursingIds,detailIds,jzh,masterId,sysFlag,request); + archiveOtherExtService.updateSubmit(ids,notNursingIds,nursingIds,detailIds,jzh,masterId,sysFlag,request); return Msg.success(); } diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index f862b91..570ca02 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -26,6 +26,8 @@ public interface ArchiveOtherExtMapper { int updateSubmit(@Param("ids")String ids); + int updateNursingSubmit(@Param("nursingIdTemp")String nursingIdTemp); + /** * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合 * @param ids diff --git a/src/main/java/com/emr/dao/V_CountMapper.java b/src/main/java/com/emr/dao/V_CountMapper.java index d4b7a11..8fcb34f 100644 --- a/src/main/java/com/emr/dao/V_CountMapper.java +++ b/src/main/java/com/emr/dao/V_CountMapper.java @@ -9,6 +9,9 @@ import java.util.List; public interface V_CountMapper { List selectByCol(V_CountVo record); + + V_Count selectday2Num(@Param("deptCode")String deptCode,@Param("startDate")String startDate,@Param("endDate")String endDate,@Param("dayNum")Integer dayNum); + // /** // * 根据条件查找统计列表分页 // * diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 57ea0a6..db545a6 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -64,6 +64,12 @@ public class ArchiveOtherExtService { vo.setNursingEndTime(maxETime); } } + Integer statusFlag = vo.getStatusFlag(); + if(statusFlag==3){ + vo.setStatusFlagStr("完成"); + } else { + vo.setStatusFlagStr("未完成"); + } //presulit为Done转换为完成 String presult = vo.getPresult(); if (StringUtils.isNoneBlank(presult) && "done".equalsIgnoreCase(presult)) { @@ -97,31 +103,34 @@ public class ArchiveOtherExtService { } } } - - String idTemp = vo.getIdTemp(); - List archiveOtherExtVos = archiveOtherExtMapper.selectEmrBackInfo1(idTemp); - for (int i=0;archiveOtherExtVos.size()>i;i++){ - if (null != archiveOtherExtVos) { - if (!archiveOtherExtVos.get(i).getC1().equals("")) { - vo.setStatusFlagStr("完成"); - }else { - vo.setStatusFlagStr("未完成"); - } - } - } - if (vo.getSysflag().equals(1)) { - archiveOtherExtVo.setPid(vo.getJzh()); - List archiveOtherExtVos1 = archiveOtherExtMapper.selectEmrBackInfo2(archiveOtherExtVo); - if (null != archiveOtherExtVos1) { - for (int a = 0; archiveOtherExtVos1.size() > a; a++) { - if (!archiveOtherExtVos1.get(a).getC1().equals("")) { - vo.setStatusFlagStr("完成"); - } else { - vo.setStatusFlagStr("未完成"); - } - } - } - } +// if (!vo.getSysflag().equals(1)) { +// String idTemp = vo.getIdTemp(); +// List archiveOtherExtVos = archiveOtherExtMapper.selectEmrBackInfo1(idTemp); +// for (int i = 0; archiveOtherExtVos.size() > i; i++) { +// if (null != archiveOtherExtVos) { +// if (!archiveOtherExtVos.get(i).getC1().equals("")) { +// vo.setStatusFlagStr("完成"); +// } else { +// vo.setStatusFlagStr("未完成"); +// } +// } +// } +// } +// if (vo.getSysflag().equals(1)) { +// archiveOtherExtVo.setPid(vo.getJzh()); +// List archiveOtherExtVos1 = archiveOtherExtMapper.selectEmrBackInfo2(archiveOtherExtVo); +// if (null != archiveOtherExtVos1) { +// for (ArchiveOtherExtVo a : archiveOtherExtVos1) { +// if (a.getStatusFlag()==3) { +// vo.setStatusFlagStr("完成"); +// break; +// } else { +// vo.setStatusFlagStr("未完成"); +// break; +// } +// } +// } +// } } } return list; @@ -181,7 +190,7 @@ public class ArchiveOtherExtService { * @param masterId * @param sysFlag */ - public void updateSubmit(String ids,String notNursingIds, String detailIds,String jzh, String masterId, Integer sysFlag,HttpServletRequest request) throws Exception{ + public void updateSubmit(String ids,String notNursingIds,String nursingIds, String detailIds,String jzh, String masterId, Integer sysFlag,HttpServletRequest request) throws Exception{ String idsStr = splitString2String(ids); String idsTemp = idsStr; //存在护理记录则调用护理按需采集功能 @@ -190,8 +199,9 @@ public class ArchiveOtherExtService { //调用护理按需采集功能 archiveOtherService.updateArchiveOther(jzh, masterId,null,null); //ext表更新非护理记录 - if(StringUtils.isNotBlank(notNursingIds)){ - idsTemp = splitString2String(notNursingIds); + if(StringUtils.isNotBlank(nursingIds)){ + String nursingIdTemp = splitString2String(nursingIds); + archiveOtherExtMapper.updateNursingSubmit(nursingIdTemp); } } // if (null != sysFlag && sysFlag == 3){ diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index d6a1520..e6fc715 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -296,15 +296,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { for (Archive_Master_Vo masterVo : list) { String archivestate = masterVo.getArchivestate(); String inpNo = masterVo.getPatientId(); -// String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; -// try { -// String select = OracleConnect.select(sql); -// masterVo.setHisStatic(select); + String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; + try { + String select = OracleConnect.select(sql); + masterVo.setHisStatic(select); // String hisStatic = masterVo.getHisStatic(); -// } catch (Exception e) { -// ExceptionPrintUtil.printException(e); -// e.printStackTrace(); -// } + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } if (StringUtils.isNotBlank(archivestate)) { //转换中文状态 boolean numeric = isNumeric(archivestate); diff --git a/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java b/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java index 3adb1dd..8da5b49 100644 --- a/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/V_CountServiceImpl.java @@ -25,19 +25,30 @@ public class V_CountServiceImpl implements V_CountService { @Override public List selectByCol(V_CountVo record) { + String startDate = record.getStartDate(); + String endDate = record.getEndDate(); List counts = vCountMapper.selectByCol(record); if(!CollectionUtils.isEmpty(counts)){ for(V_Count count :counts){ Integer outNum = count.getOutNum(); Integer fileNum = count.getFileNum(); - Integer day2Num = count.getDay2Num(); - Integer day3Num = count.getDay3Num(); - Integer day7Num = count.getDay7Num(); + int i = outNum - fileNum; + count.setUnfileNum(i); java.text.NumberFormat numberformat=java.text.NumberFormat.getInstance(); numberformat.setMaximumFractionDigits(2); String result1=numberformat.format((float)fileNum/(float)outNum*100); + String deptCode = count.getDeptCode(); + //二日归档 + V_Count v_count = vCountMapper.selectday2Num(deptCode, startDate, endDate,2); + Integer day2Num = v_count.getDay2Num(); String result2=numberformat.format((float)day2Num/(float)outNum*100); + //三日归档 + V_Count v_count1 = vCountMapper.selectday2Num(deptCode, startDate, endDate, 3); + Integer day3Num = v_count1.getDay2Num(); String result3=numberformat.format((float)day3Num/(float)outNum*100); + //七日归档 + V_Count v_count2 = vCountMapper.selectday2Num(deptCode, startDate, endDate, 7); + Integer day7Num = v_count2.getDay2Num(); String result7=numberformat.format((float)day7Num/(float)outNum*100); count.setFileRate(result1); count.setDay2Rate(result2); diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index fda7f3a..980e746 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -2,7 +2,6 @@ package com.emr.vo; import com.emr.entity.ArchiveOtherExt; import lombok.Data; -import org.apache.ibatis.annotations.Param; /** * @ProjectName: @@ -26,6 +25,8 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String sysFlag3; + private Integer statusFlag; + private Integer timeStatus; private String etimeStr; diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 06b5a47..9f609ab 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -13,7 +13,7 @@ - + @@ -439,26 +439,26 @@ archive_other_ext_submitTime.create_time,archive_other_ext_submitTime.str2 tempTime, (case when temp.etimeStr <= archive_other_ext_submitTime.create_time THEN '1' when temp.etimeStr >=archive_other_ext_submitTime.create_time THEN '2' end - ) as timeStatus, - CASE - WHEN sysFlag = 1 THEN - CASE - WHEN archive_other_ext_submitTime.str2 IS NOT NULL - AND archive_other_ext_submitTime.str2 >= (select top 1 convert(varchar(19),eTime,120) eTime from archive_other_ext where sysFlag = 1 and jzh = temp.jzh order by eTime desc) THEN - - 1 - ELSE - statusFlag - END - ELSE - CASE - WHEN archive_other_ext_submitTime.str2 IS NOT NULL - AND archive_other_ext_submitTime.str2 >= etimeStr THEN - - 1 - ELSE - statusFlag - END - END - statusFlagSort + ) as timeStatus +-- CASE +-- WHEN sysFlag = 1 THEN +-- CASE +-- WHEN archive_other_ext_submitTime.str2 IS NOT NULL +-- AND archive_other_ext_submitTime.str2 >= (select top 1 convert(varchar(19),eTime,120) eTime from archive_other_ext where sysFlag = 1 and jzh = temp.jzh order by eTime desc) THEN +-- - 1 +-- ELSE +-- statusFlag +-- END +-- ELSE +-- CASE +-- WHEN archive_other_ext_submitTime.str2 IS NOT NULL +-- AND archive_other_ext_submitTime.str2 >= etimeStr THEN +-- - 1 +-- ELSE +-- statusFlag +-- END +-- END +-- statusFlagSort from ( select archive_other_ext.ID idTemp, @@ -526,7 +526,7 @@ and zd_assort.assort_id = #{assortId,jdbcType=NVARCHAR} - order by statusFlagSort +-- order by statusFlagSort SELECT @@ -787,7 +799,7 @@ diff --git a/src/main/resources/mapper/V_CountMapper.xml b/src/main/resources/mapper/V_CountMapper.xml index cb3f916..94c6178 100644 --- a/src/main/resources/mapper/V_CountMapper.xml +++ b/src/main/resources/mapper/V_CountMapper.xml @@ -21,53 +21,119 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 60fcdf6..3135794 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1255,11 +1255,15 @@ function initTable5(data,sidePagination) { var id = row.idTemp; var sysflag = row.sysflag; var notNursingIds = ''; + var nursingIds=''; + if(sysflag = 1){ + nursingIds= id; + } if(sysflag != 1){ - sysflag = ''; + sysflag = ''; notNursingIds = id; } - submitUpdate(id,notNursingIds,row.did,sysflag); + submitUpdate(id,notNursingIds,row.did,sysflag,nursingIds); } } }, @@ -1463,7 +1467,7 @@ function cancleListentingSuccess(){ } //提交同步采集 -function submitUpdate(ids,notNursingIds,detailIds,sysFlag) { +function submitUpdate(ids,notNursingIds,detailIds,sysFlag,nursingIds) { //记录需要监听的数据 addListentingData(ids); //撤销定时 @@ -1472,7 +1476,7 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) { $.ajax({ type:'post', url:path+'/archiveExt/submitUpdate', - data:{ids:ids,notNursingIds:notNursingIds,detailIds:detailIds,jzh:jzh,masterId:$("#idLab").text(),sysFlag:sysFlag}, + data:{ids:ids,notNursingIds:notNursingIds,nursingIds:nursingIds,detailIds:detailIds,jzh:jzh,masterId:$("#idLab").text(),sysFlag:sysFlag}, dataType:'json', success:function (data) { @@ -1560,6 +1564,7 @@ $("#searchBtn6").click(function(){ var ids = ''; var sysflag = ''; var notNursingIds = ''; + var nursingIds=''; var detailIds = ''; for (var i = 0; i < data.length; i++) { var id = data[i].idTemp; @@ -1581,6 +1586,10 @@ $("#searchBtn6").click(function(){ if(data[i].sysflag == 1){ //判断包含护理 sysflag = 1; + if(nursingIds != ''){ + nursingIds += ','; + } + nursingIds += id; }else{ //拼接不包含护理的id if(notNursingIds != ''){ @@ -1589,6 +1598,6 @@ $("#searchBtn6").click(function(){ notNursingIds += id; } } - submitUpdate(ids,notNursingIds,detailIds,sysflag); + submitUpdate(ids,notNursingIds,detailIds,sysflag,nursingIds); } }) diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js index 89da905..ca1742f 100644 --- a/src/main/webapp/static/js/vCount/vCountList.js +++ b/src/main/webapp/static/js/vCount/vCountList.js @@ -907,10 +907,14 @@ function queryParams(params,_this,row){ _this.pageSize = currPageSize; } var deptName = row.deptCode; + var startDate = $("#startDate").val(); + var endDate = $("#endDate").val(); var temp = { offset:offset, limit:limit, - deptName:deptName + deptName:deptName, + startDateTo:startDate, + endDateTo:endDate, }; return temp; }