bug修复

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

@@ -46,11 +46,13 @@ public class CheckInfoDTO {
     /**
      * 入院时间
      */
+    @JsonIgnore
     private Date behospitalDate;
 
     /**
      * 出院时间
      */
+    @JsonIgnore
     private Date leaveHospitalDate;
 
     /**

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

@@ -48,11 +48,13 @@ public class ExamineInfoDTO {
     /**
      * 入院时间
      */
+    @JsonIgnore
     private Date behospitalDate;
 
     /**
      * 出院时间
      */
+    @JsonIgnore
     private Date leaveHospitalDate;
 
     /**

src/main/java/com/diagbot/service/MedLisInfoService.java

@@ -1,7 +1,12 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExamineInfoDTO;
+import com.diagbot.dto.ExamineSonInfoDTO;
 import com.diagbot.entity.MedLisInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
 
 /**
  * <p>
@@ -12,5 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-07-28
  */
 public interface MedLisInfoService extends IService<MedLisInfo> {
+    IPage<ExamineInfoDTO> getExamineInfo(ExamineInfoVO examineInfoVO);
+    IPage<ExamineSonInfoDTO> getExamineSonInfo(ExamineSonInfoVO examineSonInfoVO);
 
 }

src/main/java/com/diagbot/service/MedPacsInfoService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckInfoDTO;
 import com.diagbot.entity.MedPacsInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.CheckInfoVO;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-07-28
  */
 public interface MedPacsInfoService extends IService<MedPacsInfo> {
+    IPage<CheckInfoDTO> getCheckInfo(CheckInfoVO checkInfoVO);
 
 }

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

@@ -40,7 +40,7 @@ public class DoctorAdviceServiceImpl extends ServiceImpl<DoctorAdviceMapper, Doc
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
             if (s.contains("医嘱:")) {
-                String[] split = s.split("、");
+                String[] split = s.split("-");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");
                     for (String target : targetInfos) {

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

@@ -39,7 +39,7 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
             if (s.contains("化验:")) {
-                String[] split = s.split("、");
+                String[] split = s.split("-");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");
                     for (String targetInfo : targetInfos) {
@@ -53,10 +53,12 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
 
         //获取病人进出院时间
         Map<String, Object> timeMap = this.baseMapper.getTime(examineInfoVO);
-        Date behospital_date = (Date) timeMap.get("behospital_date");
-        examineInfoVO.setBehospitalDate(behospital_date);
-        Date leaveHospitalDate = (Date) timeMap.get("leave_hospital_date");
-        examineInfoVO.setLeaveHospitalDate(leaveHospitalDate);
+        if (null != timeMap) {
+            Date behospital_date = (Date) timeMap.get("behospital_date");
+            examineInfoVO.setBehospitalDate(behospital_date);
+            Date leaveHospitalDate = (Date) timeMap.get("leave_hospital_date");
+            examineInfoVO.setLeaveHospitalDate(leaveHospitalDate);
+        }
 
         String behospitalCode = examineInfoVO.getBehospitalCode();
         if(2l == examineInfoVO.getHospitalId()){

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

@@ -31,7 +31,7 @@ public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPa
         Set<String> infoSet = new HashSet<>();
         for (String s : infos) {
             if (s.contains("检查:")) {
-                String[] split = s.split("、");
+                String[] split = s.split("-");
                 for (String info : split) {
                     String[] targetInfos = info.split(":");
                     for (String targetInfo : targetInfos) {

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -55,8 +55,8 @@
         t1.rep_name as examineItemName,
         t1.rep_type_name as examineItemType,
         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,
+        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,
         t1.hospital_id as hospitalId,
         t1.behospital_code as behospitalCode

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -48,7 +48,7 @@
         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,
+        t2.apply_doctor as doctorName,
         t2.hospital_id as hospitalId,
         t2.behospital_code as behospitalCode,
         t2.rept_diag as checkResult