生成核查任务列表年龄修改

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

@@ -28,7 +28,6 @@ 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 +152,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 +217,16 @@ public class MedCheckWorkFacade {
     public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
         checkWorkPageSet(checkWorkPageVO);
         IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
+        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;
     }
 

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,
@@ -233,7 +236,7 @@
         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 +270,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}, '%' )