瀏覽代碼

Merge remote-tracking branch 'origin/20210512_yw_check' into 20210512_yw_check

zhanghang 4 年之前
父節點
當前提交
ec577383d9
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 2 0
      src/main/java/com/diagbot/dto/CheckJobDTO.java
  2. 3 1
      src/main/resources/mapper/MedCheckInfoMapper.xml

+ 2 - 0
src/main/java/com/diagbot/dto/CheckJobDTO.java

@@ -23,6 +23,8 @@ public class CheckJobDTO {
     private String attendingDoctor;
     //出院日期
     private String leaveHospitalDate;
+    //核查任务生成时间
+    private String jobCreateTime;
     //任务分配人员id
     private Long jobDistributor;
     //任务分配人员名称

+ 3 - 1
src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -121,7 +121,8 @@
         a.`name`,
         b.`value`,
         a.id,
-        a.beh_dept_id behospitalDeptId
+        a.beh_dept_id behospitalDeptId,
+        a.job_create_time jobCreateTime
         from
         (select
             a.behospital_code,
@@ -131,6 +132,7 @@
             a.leave_hospital_date,
             a.hospital_id,
             a.beh_dept_id,
+            b.job_create_time,
             b.id
             from
             med_behospital_info a ,med_check_info b