Merge branch '20210512_yw_check' of http://192.168.2.236:10080/gaodm/mrqc-sys into 20210512_yw_check

src/main/java/com/diagbot/dto/CheckWorkDTO.java

@@ -40,6 +40,9 @@ public class CheckWorkDTO {
      * 年龄
      */
     private String age;
+    private String ageYear;
+    private String ageMon;
+    private String ageDay;
 
     /**
      * 科室

src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.dto.CheckWorkDTO;
 import com.diagbot.dto.MedicalRecordDTO;
 import com.diagbot.entity.MedBehospitalType;
@@ -24,11 +25,11 @@ import com.diagbot.vo.CheckWorkPageVO;
 import com.diagbot.vo.MedCheckWorkAddVO;
 import com.diagbot.vo.RecordTypeVO;
 import com.diagbot.vo.SysUserBaseVO;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -153,9 +154,8 @@ public class MedCheckWorkFacade {
         recordContentVO.setHospitalId(hospiatlId);
         recordContentVO.setModeList(new ArrayList<>(typeValue.keySet()));
         List<MedicalRecordDTO> medicalRecordList = medicalRecordServiceImpl.getMedicalRecord(recordContentVO);
-        if(medicalRecordList!=null&&!medicalRecordList.isEmpty())
-        {
-            getPatientRecordType(medBehospitalTypeMap,medicalRecordList, typeValue, typeName, hospiatlId);
+        if (medicalRecordList != null && !medicalRecordList.isEmpty()) {
+            getPatientRecordType(medBehospitalTypeMap, medicalRecordList, typeValue, typeName, hospiatlId);
         }
         //2.批量执行插入操作
         try {
@@ -219,6 +219,19 @@ public class MedCheckWorkFacade {
     public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
         checkWorkPageSet(checkWorkPageVO);
         IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
+        if (res == null || ListUtil.isEmpty(res.getRecords())) {
+            return res;
+        }
+        res.getRecords().forEach(i -> {
+            String age = "";
+            if (StringUtil.isNotBlank(i.getAgeYear()) && !i.getAgeYear().equals("0")) {
+                age += i.getAgeYear() + "岁";
+            } else {
+                age += (StringUtil.isNotBlank(i.getAgeMon()) && !i.getAgeMon().equals("0") ? (i.getAgeMon() + "个月") : "")
+                        + (StringUtil.isNotBlank(i.getAgeDay()) && !i.getAgeDay().equals("0") ? (i.getAgeDay() + "天") : "");
+            }
+            i.setAge(age);
+        });
         return res;
     }
 
@@ -247,7 +260,11 @@ public class MedCheckWorkFacade {
         if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
             SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
             sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-            List<String> deptIds = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+            List<String> deptIds = Lists.newArrayList();
+            List<BasDeptInfoDTO> selDepts = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts();
+            if (ListUtil.isNotEmpty(selDepts)) {
+                deptIds = selDepts.stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+            }
             if (ListUtil.isNotEmpty(checkWorkPageVO.getDepartment())) {
                 deptIds.retainAll(checkWorkPageVO.getDepartment());
             }

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -203,6 +203,9 @@
         mbi.file_code fileCode,
         mbi.sex,
         mhp.age,
+        TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageYear,
+        TIMESTAMPDIFF(month,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) year),mbi.behospital_date) as ageMon,
+        TIMESTAMPDIFF(day,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(month,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) month),mbi.behospital_date) as ageDay,
         mbi.beh_dept_name behDeptName,
         mbi.leave_hospital_date leaveHospitalDate,
         mhp.behospital_day_num behospitalDayNum,
@@ -230,10 +233,11 @@
         LEFT JOIN med_check_info mci
         ON mbi.behospital_code = mci.behospital_code
         AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
+        AND mci.check_id is null
         LEFT JOIN med_qcresult_info mqi
         ON mbi.behospital_code = mqi.behospital_code
         AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
-        LEFT JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
+        JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
         AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
         WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N' and mqi.score_res is not null
         <if test="startDate != null">
@@ -267,7 +271,7 @@
             <![CDATA[ AND mhp.behospital_day_num >= #{smallDay}]]>
         </if>
         <if test="bigDay != null">
-            <![CDATA[ AND mhp.behospital_day_num < #{bigDay}]]>
+            <![CDATA[ AND mhp.behospital_day_num <= #{bigDay}]]>
         </if>
         <if test="doctorName != null and doctorName != ''">
             AND mbi.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )