From 31b0841439df0a87325b21d145529244d4e051c8 Mon Sep 17 00:00:00 2001 From: zengwh Date: Fri, 18 Sep 2020 18:11:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A4=E5=A3=AB=E9=95=BF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=9F=E8=AE=A1bug,=E7=97=85=E5=8E=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=96=87=E4=BB=B6=E8=AF=A6=E6=83=85=E5=A4=9A?= =?UTF-8?q?=E4=B8=80=E7=A9=BA=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/dao/Archive_DetailMapper.java | 3 +-- .../ipml/Archive_DetailServiceImpl.java | 6 ++--- .../ipml/Archive_MasterServiceImpl.java | 22 +++++++++++++++---- .../resources/mapper/Archive_DetailMapper.xml | 14 +++++++++++- src/main/resources/mapper/RecordMapper.xml | 6 ++--- .../js/lastVerifyList/lastVerifyList.js | 18 +++++++++++++++ 6 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index 7d5007d..2174bc7 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -2,7 +2,6 @@ package com.emr.dao; import com.emr.entity.Archive_Detail; import com.emr.entity.Archive_Detail_Vo; -import com.emr.entity.Archive_Master_Vo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -51,5 +50,5 @@ public interface Archive_DetailMapper { List getSourceByMasterId(@Param("masterid") String masterid); - List selectIsScan(@Param("ids") String ids); + List selectIsScan(@Param("ids") String ids,@Param("fieldFlag")Integer fieldFlag); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index e8a3567..b1030ed 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -65,11 +65,11 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { boolean flag = false; boolean nurseFlag = false; for (Archive_Detail_Vo detailVo : list) { - if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(assortId) && !flag) { + if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(assortId) && !flag && StringUtils.isNotBlank(detailVoTemp.getId())) { returnList.add(detailVoTemp); flag = true; } - if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(nurseAssortId) && !nurseFlag) { + if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(nurseAssortId) && !nurseFlag && StringUtils.isNotBlank(nurseDetailVoTemp.getId())) { returnList.add(nurseDetailVoTemp); nurseFlag = true; } @@ -224,7 +224,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { if(commomSet.getInt1() == 1){ StringBuilder idsStr = new StringBuilder(); //组织已经扫描上传的MasterId - List list = archiveDetailMapper.selectIsScan(ids); + List list = archiveDetailMapper.selectIsScan(ids,2); ids = ""; if(!CollectionUtils.isEmpty(list)){ for (Archive_Detail obj: list ) { 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 a416a53..ee68587 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -18,9 +18,6 @@ import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.apache.shiro.SecurityUtils; - -import javax.servlet.http.HttpServletRequest; - import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +26,12 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; /** * @author zwh @@ -219,6 +220,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } } } + //赋值纸质扫描上传情况 + List details = detailMapper.selectIsScan(patientIdStr.toString(),1); //赋值签收情况 //查询签收情况 String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + @@ -240,6 +243,17 @@ 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(); diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 2d08151..b3486a8 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -369,8 +369,20 @@ MasterID FROM archive_detail + + inner join archive_master + on archive_detail.MasterID = archive_master.id + WHERE - MasterID IN ( + + + MasterID + + + patient_id + + + IN ( ${item} diff --git a/src/main/resources/mapper/RecordMapper.xml b/src/main/resources/mapper/RecordMapper.xml index e9864fa..51eefb7 100644 --- a/src/main/resources/mapper/RecordMapper.xml +++ b/src/main/resources/mapper/RecordMapper.xml @@ -115,7 +115,7 @@ FROM archive_master WHERE - ArchiveState = '64' + (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') GROUP BY dept_name @@ -128,7 +128,7 @@ ) allCount, - ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '64' + ( SELECT COUNT( 1 ) FROM archive_master WHERE (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') ) count1, ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128' ) count2, @@ -208,7 +208,7 @@ FROM archive_master WHERE - ArchiveState = '64' + (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') GROUP BY diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index 4d16c1f..df4ce4c 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -162,6 +162,24 @@ function initTable() { return str; } }, + { + title: '纸质扫描', + field: 'checkName', + align: 'center', + valign: 'middle', + formatter: function (value, row) { + var colorStr = '' + if(value == '是'){ + colorStr = '#8FBC8F'; + }else if(value == '否'){ + colorStr = 'red'; + }else{ + value = ''; + } + var str = '' + value + ''; + return str; + } + }, { title: "操作", align: 'left',