检查搜索条件处理、稽查表导出根据不同的运行状态下载相应的状态表

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

@@ -76,8 +76,13 @@ public class ConsoleExportFacade {
         filterVO.setCurrent(1L);
         filterVO.setSize(Long.MAX_VALUE);
         filterVO.setSearchCount(false);
+        String fileName = null;
+        if ( "1".equals(filterVO.getIsPlacefile())) {
+            fileName = "终末病历稽查表.xls";
+        } else {
+            fileName = "运行病历稽查表.xls";
+        }
         List<MedicalCheckExportDTO> records = consoleFacade.medicalCheckExport(filterVO);
-        String fileName = "病历稽查统计表.xls";
         ExcelUtils.exportExcelUser(records, null, "sheet1", MedicalCheckExportDTO.class, fileName, response);
     }
 

src/main/java/com/diagbot/service/impl/MedPacsInfoServiceImpl.java

@@ -52,9 +52,12 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
             Date leaveHospitalDate = (Date) timeMap.get("leave_hospital_date");
             checkInfoVO.setLeaveHospitalDate(leaveHospitalDate);
         }
+        //邵逸夫病历号处理
+        if("2".equals(checkInfoVO.getHospitalId())){
+            String s = checkInfoVO.getBehospitalCode();
+            checkInfoVO.setBehospitalCode(s.split("_")[0]);
+        }
 
-        String s = checkInfoVO.getBehospitalCode();
-        checkInfoVO.setBehospitalCode(s.split("_")[0]);
         IPage<CheckInfoDTO> page = this.baseMapper.getCheckInfo(checkInfoVO, infoSet);
         return page;
     }

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -47,7 +47,7 @@
         t.da_start_date,
         t.da_stop_date,
         t.da_item_name,
-        CONCAT( t.da_item_name, '(',DATE_FORMAT( t.da_start_date,'%Y-%m-%d'),')')as info,
+        CONCAT( t.da_item_name, '(',DATE_FORMAT( t.da_start_date,'%Y-%m-%d %H:%i:%s'),')')as info,
         t.da_prescription_type,
         t.medicine_type,
         t.dose,

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -54,7 +54,7 @@
         t1.rep_no as repNo,
         t1.rep_name as examineItemName,
         t1.rep_type_name as examineItemType,
-        CONCAT( t2.item_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,
+        CONCAT( t2.item_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d %H:%i:%s'),')')as info,
         DATE_FORMAT( t1.rep_date, '%Y-%m-%d %h:%i:%s' ) as rTime,
         DATE_FORMAT( t1.check_date, '%Y-%m-%d %h:%i:%s' ) as cTime,
         t1.apply_doctor as doctorName,

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -45,7 +45,7 @@
         SELECT
         t1.rep_name as checkItemName,
         t1.rep_type_name as checkItemType,
-        CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,
+        CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d %H:%i:%s'),')')as info,
         date_format (t1.rep_date,'%Y-%m-%d %H:%i:%s') as reptTime,
         date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') as checkTime,
         t1.apply_doctor as doctorName,
@@ -77,7 +77,7 @@
             and t1.rep_type_name like CONCAT('%',#{checkInfoVO.checkItemType},'%')
         </if>
         <if test="checkInfoVO.checkItemName != null and checkInfoVO.checkItemName != ''">
-            and t2.rept_name like CONCAT('%',#{checkInfoVO.checkItemName},'%')
+            and t1.rep_name like CONCAT('%',#{checkInfoVO.checkItemName},'%')
         </if>
         <if test="checkInfoVO.jxDateStart != null">
             <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s')  >= #{checkInfoVO.jxDateStart}]]>