修改代码

pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java

@@ -172,4 +172,6 @@ public class DbwzOrderVo {
     private String evaluationContent;
     private String evaluationContent;
 
 
     private Date createTime;
     private Date createTime;
+
+    private String eName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderVo.java

@@ -152,4 +152,6 @@ public class ZyphOrderVo {
     private String isSatisfaction;
     private String isSatisfaction;
 
 
     private String evaluationContent;
     private String evaluationContent;
+
+    private String eName;
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.java

@@ -21,6 +21,7 @@ import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
+import com.pz.system.mapper.UserVsitorMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
     private final TotalOrderMapper totalOrderMapper;
     private final TotalOrderMapper totalOrderMapper;
     private final EmployeesMapper employeesMapper;
     private final EmployeesMapper employeesMapper;
     private final OrderDelayQueue delayQueue;
     private final OrderDelayQueue delayQueue;
+    private final UserVsitorMapper userVsitorMapper;
 
 
     private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 
@@ -71,6 +73,14 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
     @Override
     @Override
     public TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery) {
     public TableDataInfo<ZyphOrderVo> queryPageList(ZyphOrderBo bo, PageQuery pageQuery) {
         Page<ZyphOrderVo> result = baseMapper.findZyphOrderVoPage(pageQuery.build(), bo);
         Page<ZyphOrderVo> result = baseMapper.findZyphOrderVoPage(pageQuery.build(), bo);
+        Optional.ofNullable(result.getRecords()).ifPresent(zyphOrderVos -> {
+            zyphOrderVos.forEach(dbwzOrderVo -> {
+                Optional.ofNullable(userVsitorMapper.selectVoById(dbwzOrderVo.getVisitor())).ifPresent(
+                    // 就诊人员
+                    dbwzOrderVo::setUserVsitorVo
+                );
+            });
+        });
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }
 
 

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -38,6 +38,7 @@
         tlo.evaluation_content AS evaluationContent,
         tlo.evaluation_content AS evaluationContent,
         yyod.over_time AS overtime,
         yyod.over_time AS overtime,
         yyod.voucher AS voucher,
         yyod.voucher AS voucher,
+        yyod.visitor AS visitor,
         yyod.create_time as createTime
         yyod.create_time as createTime
         FROM dbgh_order AS yyod
         FROM dbgh_order AS yyod
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -42,6 +42,7 @@
         yyod.voucher AS voucher,
         yyod.voucher AS voucher,
         yyod.start_day,
         yyod.start_day,
         yyod.end_day,
         yyod.end_day,
+        yyod.visitor AS visitor,
         yyod.start_time,
         yyod.start_time,
         yyod.end_time,
         yyod.end_time,
         yyod.create_time
         yyod.create_time