解决护士长提交统计bug,病历清单文件详情多一空对象

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<Archive_Detail> getSourceByMasterId(@Param("masterid") String masterid);
 
-    List<Archive_Detail> selectIsScan(@Param("ids") String ids);
+    List<Archive_Detail> selectIsScan(@Param("ids") String ids,@Param("fieldFlag")Integer fieldFlag);
 }

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<Archive_Detail> list =  archiveDetailMapper.selectIsScan(ids);
+            List<Archive_Detail> list =  archiveDetailMapper.selectIsScan(ids,2);
             ids = "";
             if(!CollectionUtils.isEmpty(list)){
                 for (Archive_Detail obj: list ) {

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<Archive_Detail> 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();

src/main/resources/mapper/Archive_DetailMapper.xml

@@ -369,8 +369,20 @@
           MasterID
       FROM
           archive_detail
+          <if test="fieldFlag == 1">
+             inner join archive_master
+             on archive_detail.MasterID = archive_master.id
+          </if>
       WHERE
-          MasterID IN (
+          <choose>
+            <when test="fieldFlag == 2">
+              MasterID
+            </when>
+            <when test="fieldFlag == 1">
+              patient_id
+            </when>
+          </choose>
+           IN (
           <foreach collection="ids.split(',')" item="item" separator=",">
                ${item}
           </foreach>

src/main/resources/mapper/RecordMapper.xml

@@ -115,7 +115,7 @@
         FROM
             archive_master
         WHERE
-            ArchiveState = '64'
+            (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024')
             <include refid="selectByDate"></include>
         GROUP BY
             dept_name
@@ -128,7 +128,7 @@
                     <include refid="selectByDate"></include>
                 </where>
             ) allCount,
-            ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '64' <include refid="selectByDate"></include>
+            ( SELECT COUNT( 1 ) FROM archive_master WHERE (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') <include refid="selectByDate"></include>
             ) count1,
             ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128' <include refid="selectByDate"></include>
             ) count2,
@@ -208,7 +208,7 @@
             FROM
                 archive_master
             WHERE
-                ArchiveState = '64'
+              (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024')
               <include refid="selectByDate1"></include>
             GROUP BY
                 <include refid="formatDate"></include>

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 = '<span style="color:'+colorStr+'"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        return str;
+                    }
+                },
                 {
                     title: "操作",
                     align: 'left',