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 b7e05c0..25246e7 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -220,7 +220,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { Emr_Dictionary dictionary = new Emr_Dictionary(); dictionary.setTypecode("dept_code"); List dictionaries = dictionaryMapper.dicByTypeCode(dictionary); - StringBuilder patientIdStr = new StringBuilder(); for (Archive_Master_Vo masterVo : list) { //科室名称编码转名称 deptNameCode2Name(dictionaries, masterVo); @@ -231,23 +230,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){ masterVo.setStatus(EnumVerify.DocState.CallBacked.getName()); } - if(StringUtils.isNotBlank(patientIdStr)){ - patientIdStr.append(","); - } - masterVo.setPrintStatus("否"); - patientIdStr.append(masterVo.getPatientId()); - } - //设置打印状态 - List tUuPrints = tUuPrintMapper.selectAllByPatientId(patientIdStr.toString()); - if(!CollectionUtils.isEmpty(tUuPrints)){ - for (Archive_Master_Vo masterVo : list) { - for (TUuPrint tUuPrint : tUuPrints){ - if(tUuPrint.getPatientId().equals(masterVo.getPatientId())){ - masterVo.setPrintStatus("是"); - break; - } - } - } } } return list; @@ -290,10 +272,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //组织完整性字段并完整的更新archive_master表的完整性字段值为完整LockInfo='完整' //updateMasterBySuccess(list); //转换科室与赋值超期天数 - String patientIds = selectByColumnChange(list); + selectByColumnChange(list); //根据状态code转换状态及判断显示按钮 if(null != list && !list.isEmpty()){ - List tUuPrints = tUuPrintMapper.selectAllByPatientId(patientIds); //查询流转角色集合 List flowRoles = flowRoleMapper.selectAll(); //计算属于哪种审核角色 @@ -318,17 +299,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { masterVo.setBtns(btns); } } - //定义打印状态 - String printStatus = "否"; - if(!CollectionUtils.isEmpty(tUuPrints)){ - for(TUuPrint tUuPrint : tUuPrints){ - if(tUuPrint.getPatientId().equals(masterVo.getPatientId())){ - printStatus = "是"; - break; - } - } - } - masterVo.setPrintStatus(printStatus); } } } diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index d3567fe..ac513ca 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -612,6 +612,9 @@ (select distinct jzh from archive_other_ext where sysFlag = -300) + + (SELECT DISTINCT patient_id FROM archive_printInfo WHERE print_userid not in (1,2399) and D1 > 0) + +
+ + +
@@ -847,7 +855,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index c39dc8c..0bd9f57 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -201,6 +201,14 @@ +
+ + +
@@ -679,7 +687,7 @@ - + diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index fcfc359..ead942c 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -72,7 +72,8 @@ function initTable() { isSuccess:$("#isSuccessSearch").val(), infoId:$("#infoId").val(), operRole:$("#checker").val(), - callBackStatus:$("#callBackStatus").val() + callBackStatus:$("#callBackStatus").val(), + printStatus:$("#printStatus").val() }; return temp; }, diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index cf94ef2..c609946 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -75,7 +75,8 @@ function initTable() { isSign:$("#isSign").val(), isSearch:$("#isSearch").val(), checkName:$("#checkName").val(), - callBackStatus:$("#callBackStatus").val() + callBackStatus:$("#callBackStatus").val(), + printStatus:$("#printStatus").val() }; return temp; },