浏览代码

检查/检验/检验子项 返回时间字段修改

chengyao 4 年之前
父节点
当前提交
26d66cfeef

+ 2 - 2
src/main/java/com/diagbot/dto/CheckInfoDTO.java

@@ -36,12 +36,12 @@ public class CheckInfoDTO {
     /**
      * 检查时间
      */
-    private Date cTime;
+    private Date checkTime;
 
     /**
      * 报告时间
      */
-    private Date rTime;
+    private Date reptTime;
 
     /**
      * 入院时间

+ 2 - 2
src/main/java/com/diagbot/dto/ExamineInfoDTO.java

@@ -37,13 +37,13 @@ public class ExamineInfoDTO {
     /**
      * 返回检查时间
      */
-    private Date cTime;
+    private Date checkTime;
 
 
     /**
      * 返回报告时间
      */
-    private Date rTime;
+    private Date reptTime;
 
     /**
      * 入院时间

+ 3 - 3
src/main/java/com/diagbot/dto/ExamineSonInfoDTO.java

@@ -27,15 +27,15 @@ public class ExamineSonInfoDTO {
     private String examineItemResult;
 
     /**
-     * 返回检时间
+     * 返回检时间
      */
-    private Date cTime;
+    private Date checkTime;
 
 
     /**
      * 返回报告时间
      */
-    private Date rTime;
+    private Date reptTime;
 
     /**
      * 开单医生

+ 4 - 4
src/main/resources/mapper/MedLisInfoMapper.xml

@@ -44,8 +44,8 @@
         b.repNo,
         b.examineItemName,
         b.examineItemType,
-        b.rTime,
-        b.cTime,
+        b.rTime as reptTime,
+        b.cTime as checkTime,
         b.doctorName,
         b.hospitalId,
         b.behospitalCode
@@ -154,8 +154,8 @@
         SELECT
         t2.item_name AS examineItemName,
         CONCAT( t2.result, t2.unit ) AS examineItemResult,
-        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 reptTime,
+        DATE_FORMAT( t1.check_date, '%Y-%m-%d %h:%i:%s' ) as checkTime,
         t1.apply_doctor AS doctorName
         FROM
         med_lis_info t1,

+ 2 - 2
src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -46,8 +46,8 @@
         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,
-        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 reptTime,
+        date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') as checkTime,
         t1.apply_doctor as doctorName,
         t2.hospital_id as hospitalId,
         t2.behospital_code as behospitalCode,