时间处理

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

@@ -29,13 +29,25 @@ public class ExamineSonInfoDTO {
     /**
      * 检查时间
      */
+    @JsonIgnore
     private String cTime;
 
+    /**
+     * 返回检查时间
+     */
+    private Date checkTime;
+
     /**
      * 报告时间
      */
+    @JsonIgnore
     private String rTime;
 
+    /**
+     * 返回报告时间
+     */
+    private Date repTime;
+
     /**
      * 开单医生
      */

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

@@ -60,19 +60,31 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
         IPage<ExamineInfoDTO> page = this.baseMapper.getExamineInfo(examineInfoVO, infoSet);
         List<ExamineInfoDTO> records = page.getRecords();
         for (ExamineInfoDTO record : records) {
-            String cTime = record.getCTime();
-            String rTime = record.getRTime();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date cTimeDate = simpleDateFormat.parse(cTime);
-            Date rTimeDate = simpleDateFormat.parse(rTime);
-            record.setCheckTime(cTimeDate);
-            record.setRepTime(rTimeDate);
+            timeMethod(record,null,record.getCTime(),record.getRTime());
         }
         return page;
     }
 
-    public IPage<ExamineSonInfoDTO> getExamineSonInfo(ExamineSonInfoVO examineSonInfoVO) {
+    public IPage<ExamineSonInfoDTO> getExamineSonInfo(ExamineSonInfoVO examineSonInfoVO) throws ParseException {
         IPage<ExamineSonInfoDTO> page = this.baseMapper.getExamineSonInfo(examineSonInfoVO);
+        List<ExamineSonInfoDTO> records = page.getRecords();
+        for (ExamineSonInfoDTO record : records) {
+            timeMethod(null,record,record.getCTime(),record.getRTime());
+        }
         return page;
     }
+
+    public void timeMethod(ExamineInfoDTO recordInfo,ExamineSonInfoDTO record,String cTime, String rTime) throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date cTimeDate = simpleDateFormat.parse(cTime);
+        Date rTimeDate = simpleDateFormat.parse(rTime);
+        if(null == recordInfo){
+            record.setCheckTime(cTimeDate);
+            record.setRepTime(rTimeDate);
+        }
+        if(null == record){
+            recordInfo.setCheckTime(cTimeDate);
+            recordInfo.setRepTime(rTimeDate);
+        }
+    }
 }