From 0262bad63e244c5b9789718e114fe2b5d073b3cb Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 2 Feb 2021 19:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=88=E5=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BA=B8=E8=B4=A8=E7=AD=BE=E6=94=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=B9=B6=E5=A2=9E=E5=8A=A0=E7=BA=B8=E8=B4=A8?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/lastVerifyController.java | 4 +- .../ipml/Archive_MasterServiceImpl.java | 52 +++++++++++-------- .../resources/mapper/Archive_MasterMapper.xml | 18 ++++++- .../views/lastVerifyDir/lastVerifyList.jsp | 10 +++- .../js/lastVerifyList/lastVerifyList.js | 6 ++- 5 files changed, 63 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index ca9edb9..842d586 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -95,8 +95,8 @@ public class lastVerifyController { archiveMasterVo.setStartDateTo(null); archiveMasterVo.setEndDateTo(null); } - String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态"; - String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status"; + String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态,纸质状态,纸质扫描"; + String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status,remark,checkName"; try { //是否查询纸质签收状态的相关处理 archiveMasterService.setLastVerifyList(archiveMasterVo); 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 c94b716..941b4e2 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -210,14 +210,32 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { patientIds.append("'").append(master.getPatientId()).append("'"); } } + //将查询结果带入查询oracle返回集合 + List selectList = new ArrayList<>(); + List selectList1 = new ArrayList<>(); + //selectList.add("1304063"); + //selectList.add("1304458"); + if(masters.size() > 30){ + patientIds = null; + } + selectList = selectOracleGetSignList(patientIds,selectList); + for(Archive_Master master : masters) { + if (StringUtils.isNotBlank(master.getPatientId())) { + if (StringUtils.isNotBlank(master.getPatientId())) { + for (String patientId : selectList) { + if (master.getPatientId().equals(patientId)) { + selectList1.add(master.getPatientId()); + break; + } + } + } + } + } + //设置进查询条件 + if(!CollectionUtils.isEmpty(selectList)) { + vo.setPatientIdsForSign(selectList1); + } } - //将查询结果带入查询oracle返回集合 - List selectList = new ArrayList<>(); - //selectList.add("1304063"); - //selectList.add("1304458"); - selectList = selectOracleGetSignList(patientIds,selectList); - //设置进查询条件 - vo.setPatientIdsForSign(selectList); } return vo; } @@ -265,8 +283,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } } } - //赋值纸质扫描上传情况 - List details = detailMapper.selectIsScan(patientIdStr.toString(),1); //赋值签收情况 List selectList = new ArrayList<>(); try{ @@ -287,17 +303,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } } } - //组织是否纸质扫描 - String isScan = "否"; - if(!CollectionUtils.isEmpty(details)){ - for (Archive_Detail detail:details) { - if(detail.getMasterid().equals(masterVo.getId())){ - isScan = "是"; - break; - } - } - } - masterVo.setCheckName(isScan); } }catch (Exception e){ e.printStackTrace(); @@ -1149,8 +1154,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectOracleGetSignList(StringBuilder patientIdStr, List selectList){ //查询签收情况 - String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + + String sql = ""; + if(StringUtils.isNotBlank(patientIdStr)){ + sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + "and freg_date is not null"; + }else{ + sql = "select fpat_no from v_jswzh_archive_bqreg where freg_date is not null"; + } //执行查询 try{ selectList = OracleConnect.selectList(sql); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index f608e28..f1e8692 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -499,9 +499,25 @@ dead_days ELSE days - END from emr_overtime_set where id = 1) days + END from emr_overtime_set where id = 1) days, + CASE + WHEN MasterID IS NULL THEN + '否' ELSE '是' + END checkName from archive_master m + LEFT JOIN ( SELECT MasterID FROM archive_detail INNER JOIN archive_master ON archive_detail.MasterID = archive_master.id WHERE Source = '扫描上传' GROUP BY MasterID ) archive_detail ON m.id = archive_detail.MasterID where 1=1 and ArchiveState in ('64','1024') + + AND MasterID IS + + + NULL + + + NOT NULL + + + and patient_id diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 716d26a..a737f24 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -185,6 +185,14 @@ +
+ + +
@@ -654,7 +662,7 @@ - + diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index 0febf66..59b6e25 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -73,7 +73,8 @@ function initTable() { endDateTo: $("#endDateTo").val(), doctorInCharge:$("#doctorInCharge").val(), isSign:$("#isSign").val(), - isSearch:$("#isSearch").val() + isSearch:$("#isSearch").val(), + checkName:$("#checkName").val() }; return temp; }, @@ -489,6 +490,7 @@ function callApproveDiag(ids,count) { $("#status1").val("64"); $("#verifyText").val(""); $("#approveCount").val(count); + $("#changeReason").val(''); } //查看初审信息 @@ -635,5 +637,5 @@ $("#excelBtn").click(function () { var endDateTo = $("#endDateTo").val(); window.location.href = path+"/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&deptName=" + deptName - + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&isSearch="+$("#isSearch").val()+"&doctorInCharge="+$("#doctorInCharge").val()+"&isSign="+$("#isSign").val(); + + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&isSearch="+$("#isSearch").val()+"&doctorInCharge="+$("#doctorInCharge").val()+"&isSign="+$("#isSign").val()+"&checkName="+$("#checkName").val(); }); \ No newline at end of file