订单导出

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.info.order.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.order.enums.CancellationMethod;
@@ -106,6 +107,23 @@ public class OrderVo {
     private Long patientId;
     @ApiModelProperty("就诊人信息")
     private PatientVo patientVo;
+    @ExcelProperty(value = "就诊人姓名", order = 17)
+    @ApiModelProperty("就诊人姓名")
+    private String patientName;
+    @ExcelProperty(value = "就诊人电话", order = 18)
+    @ApiModelProperty("手机号")
+    private String patientMobile;
+    @ExcelProperty(value = "就诊人性别", converter = ExcelDictConvert.class, order = 19)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    @ApiModelProperty("性别 0：未知、1：男、2：女")
+    private Integer patientGender;
+    @ExcelProperty(value = "就诊人年龄", order = 20)
+    @ApiModelProperty("年龄")
+    private Integer patientAge;
+    @ExcelProperty(value = "就诊人关系", converter = ExcelDictConvert.class, order = 21)
+    @ExcelDictFormat(dictType = "patient_relationship")
+    @ApiModelProperty("关系")
+    private String patientRelationship;
 
     /**
      * 服务ID

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.info.order.enums.OrderStatus;
 import com.ruoyi.info.order.exception.OrderExceptionEnum;
 import com.ruoyi.info.order.mapper.OrderMapper;
 import com.ruoyi.info.order.service.IOrderService;
+import com.ruoyi.info.patient.domain.vo.PatientVo;
 import com.ruoyi.info.patient.service.IPatientService;
 import com.ruoyi.info.service.domain.ServiceProduct;
 import com.ruoyi.info.service.domain.vo.ServiceProductVo;
@@ -248,14 +249,14 @@ public class OrderServiceImpl implements IOrderService {
     public TableDataInfo<OrderVo> queryAllPageList(OrderBo bo, PageQuery pageQuery) {
         buildTime(bo);
         Page<OrderVo> result = baseMapper.queryAllPageList(bo, pageQuery.build());
-        result.setRecords(convertAllList(result.getRecords()));
+        result.setRecords(convertAllList(result.getRecords(), false));
         return TableDataInfo.build(result);
     }
 
     @Override
     public List<OrderVo> queryAllList(OrderBo bo) {
         buildTime(bo);
-        return convertAllList(baseMapper.queryAllList(bo));
+        return convertAllList(baseMapper.queryAllList(bo), true);
     }
 
     private void buildTime(OrderBo bo) {
@@ -283,12 +284,20 @@ public class OrderServiceImpl implements IOrderService {
         }).collect(Collectors.toList());
     }
 
-    private List<OrderVo> convertAllList(List<OrderVo> list) {
+    private List<OrderVo> convertAllList(List<OrderVo> list, boolean queryPatient) {
         return list.stream().map(o -> {
             HospitalVo hospitalVo = hospitalService.queryDelById(o.getHospitalId());
             o.setHospitalName(hospitalVo.getName());
-            o.setHospitalAddress(hospitalVo.getProvinceName() + hospitalVo.getCityName() + hospitalVo.getAreaName() + hospitalVo.getAddress());
+            o.setHospitalAddress(hospitalVo.getAddress());
             o.setHospitalDepartmentName(hospitalDepartmentService.queryNameById(o.getHospitalDepartmentId()));
+            if(queryPatient) {
+                PatientVo patientVo = patientService.queryDelById(o.getPatientId());
+                o.setPatientName(patientVo.getName());
+                o.setPatientMobile(patientVo.getMobile());
+                o.setPatientGender(patientVo.getGender());
+                o.setPatientAge(patientVo.getAge());
+                o.setPatientRelationship(patientVo.getRelationship());
+            }
             return o;
         }).collect(Collectors.toList());
     }