修改导出,上一条git也是2
This commit is contained in:
parent
2af42b2d40
commit
5eee45a64b
@ -32,12 +32,12 @@ type DoctorWithdrawalData struct {
|
|||||||
BankCardAddress string // 银行地址
|
BankCardAddress string // 银行地址
|
||||||
ExamineStatus string // 审核状态(1:审核中 2:审核通过 3:审核未通过)
|
ExamineStatus string // 审核状态(1:审核中 2:审核通过 3:审核未通过)
|
||||||
ExamineFailReason string // 审核失败原因
|
ExamineFailReason string // 审核失败原因
|
||||||
ExamineTime time.Time // 审核日期
|
ExamineTime string // 审核日期
|
||||||
ExamineBy string // 审核人员名称
|
ExamineBy string // 审核人员名称
|
||||||
PaymentStatus string // 财务打款状态(0:否 1:是)
|
PaymentStatus string // 财务打款状态(0:否 1:是)
|
||||||
PaymentTime time.Time // 财务打款时间
|
PaymentTime string // 财务打款时间
|
||||||
PaymentBy string // 财务打款人员id(后台用户id)
|
PaymentBy string // 财务打款人员id(后台用户id)
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// DoctorWithdrawalOrderData 提现记录-关联订单
|
// DoctorWithdrawalOrderData 提现记录-关联订单
|
||||||
@ -48,7 +48,7 @@ type DoctorWithdrawalOrderData struct {
|
|||||||
PatientAge string // 患者年龄-就诊人
|
PatientAge string // 患者年龄-就诊人
|
||||||
PatientMobile string // 患者电话
|
PatientMobile string // 患者电话
|
||||||
PayChannel string // 支付渠道(1:小程序支付 2:微信扫码支付 3:模拟支付)
|
PayChannel string // 支付渠道(1:小程序支付 2:微信扫码支付 3:模拟支付)
|
||||||
PayTime time.Time // 支付时间
|
PayTime string // 支付时间
|
||||||
InquiryNo string // 系统订单编号
|
InquiryNo string // 系统订单编号
|
||||||
EscrowTradeNo string // 第三方支付流水号
|
EscrowTradeNo string // 第三方支付流水号
|
||||||
AmountTotal float64 // 订单金额
|
AmountTotal float64 // 订单金额
|
||||||
@ -121,7 +121,7 @@ type DoctorBankCardData struct {
|
|||||||
Province string // 省份
|
Province string // 省份
|
||||||
City string // 城市
|
City string // 城市
|
||||||
County string // 区县
|
County string // 区县
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// DoctorAccountData 医生账户
|
// DoctorAccountData 医生账户
|
||||||
@ -158,19 +158,19 @@ type OrderInquiryForAccount struct {
|
|||||||
CouponAmountTotal float64 // 优惠卷总金额
|
CouponAmountTotal float64 // 优惠卷总金额
|
||||||
PaymentAmountTotal float64 // 实际付款金额
|
PaymentAmountTotal float64 // 实际付款金额
|
||||||
DoctorAmount float64 // 医生收益
|
DoctorAmount float64 // 医生收益
|
||||||
PayTime time.Time // 支付时间
|
PayTime string // 支付时间
|
||||||
ReceptionTime time.Time // 接诊时间(已接诊)
|
ReceptionTime string // 接诊时间(已接诊)
|
||||||
CompleteTime time.Time // 订单完成时间(问诊完成时间)
|
CompleteTime string // 订单完成时间(问诊完成时间)
|
||||||
FinishTime time.Time // 订单结束时间
|
FinishTime string // 订单结束时间
|
||||||
StatisticsStatus string // 订单统计状态(0:未统计 1:已统计 2:统计失败)
|
StatisticsStatus string // 订单统计状态(0:未统计 1:已统计 2:统计失败)
|
||||||
StatisticsTime time.Time // 订单统计时间
|
StatisticsTime string // 订单统计时间
|
||||||
IsWithdrawal string // 是否提现(0:否 1:是 2:提现中)
|
IsWithdrawal string // 是否提现(0:否 1:是 2:提现中)
|
||||||
WithdrawalTime time.Time // 提现时间
|
WithdrawalTime string // 提现时间
|
||||||
CancelTime time.Time // 订单取消时间
|
CancelTime string // 订单取消时间
|
||||||
CancelReason string // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时)
|
CancelReason string // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时)
|
||||||
CancelRemarks string // 取消订单备注(自动添加)
|
CancelRemarks string // 取消订单备注(自动添加)
|
||||||
EntryStatus string // 入账状态(0:未入账 1:已入账 2:入账中 3:入账失败)
|
EntryStatus string // 入账状态(0:未入账 1:已入账 2:入账中 3:入账失败)
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// UserPatientData 患者列表
|
// UserPatientData 患者列表
|
||||||
@ -181,7 +181,7 @@ type UserPatientData struct {
|
|||||||
Avatar string // 头像
|
Avatar string // 头像
|
||||||
DisableReason string // 禁用理由
|
DisableReason string // 禁用理由
|
||||||
PatientFamilyCount string // 家庭成员数量
|
PatientFamilyCount string // 家庭成员数量
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// PatientFamilyData 就诊人列表
|
// PatientFamilyData 就诊人列表
|
||||||
@ -204,7 +204,7 @@ type PatientFamilyData struct {
|
|||||||
MaritalStatus string `json:"marital_status"` // 婚姻状况(0:未婚 1:已婚 2:离异)
|
MaritalStatus string `json:"marital_status"` // 婚姻状况(0:未婚 1:已婚 2:离异)
|
||||||
NationName string `json:"nation_name"` // 民族名称
|
NationName string `json:"nation_name"` // 民族名称
|
||||||
JobName string `json:"job_name"` // 职业名称
|
JobName string `json:"job_name"` // 职业名称
|
||||||
CreatedAt time.Time `json:"created_at"` // 创建时间
|
CreatedAt string `json:"created_at"` // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// OrderInquiry 问诊订单
|
// OrderInquiry 问诊订单
|
||||||
@ -228,19 +228,19 @@ type OrderInquiry struct {
|
|||||||
CouponAmountTotal float64 // 优惠卷总金额
|
CouponAmountTotal float64 // 优惠卷总金额
|
||||||
PaymentAmountTotal float64 // 实际付款金额
|
PaymentAmountTotal float64 // 实际付款金额
|
||||||
DoctorAmount float64 // 医生收益
|
DoctorAmount float64 // 医生收益
|
||||||
PayTime time.Time // 支付时间
|
PayTime string // 支付时间
|
||||||
ReceptionTime time.Time // 接诊时间(已接诊)
|
ReceptionTime string // 接诊时间(已接诊)
|
||||||
CompleteTime time.Time // 订单完成时间(问诊完成时间)
|
CompleteTime string // 订单完成时间(问诊完成时间)
|
||||||
FinishTime time.Time // 订单结束时间
|
FinishTime string // 订单结束时间
|
||||||
StatisticsStatus string // 订单统计状态(0:未统计 1:已统计 2:统计失败)
|
StatisticsStatus string // 订单统计状态(0:未统计 1:已统计 2:统计失败)
|
||||||
StatisticsTime time.Time // 订单统计时间
|
StatisticsTime string // 订单统计时间
|
||||||
IsWithdrawal string // 是否提现(0:否 1:是 2:提现中)
|
IsWithdrawal string // 是否提现(0:否 1:是 2:提现中)
|
||||||
WithdrawalTime time.Time // 提现时间
|
WithdrawalTime string // 提现时间
|
||||||
CancelTime time.Time // 订单取消时间
|
CancelTime string // 订单取消时间
|
||||||
CancelReason string // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时)
|
CancelReason string // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时)
|
||||||
CancelRemarks string // 取消订单备注(自动添加)
|
CancelRemarks string // 取消订单备注(自动添加)
|
||||||
EntryStatus string // 入账状态(0:未入账 1:已入账 2:入账中 3:入账失败)
|
EntryStatus string // 入账状态(0:未入账 1:已入账 2:入账中 3:入账失败)
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// OrderProductData 药品订单
|
// OrderProductData 药品订单
|
||||||
@ -311,16 +311,16 @@ type OrderServicePackageDto struct {
|
|||||||
CancelReason string // 取消订单原因(1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)
|
CancelReason string // 取消订单原因(1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时)
|
||||||
AmountTotal float64 // 订单金额
|
AmountTotal float64 // 订单金额
|
||||||
PaymentAmountTotal float64 // 实际付款金额
|
PaymentAmountTotal float64 // 实际付款金额
|
||||||
PayTime time.Time // 支付时间
|
PayTime string // 支付时间
|
||||||
StartTime time.Time // 开始服务时间
|
StartTime string // 开始服务时间
|
||||||
FinishTime time.Time // 结束服务时间
|
FinishTime string // 结束服务时间
|
||||||
RefundStatus string // 订单退款状态(0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款)
|
RefundStatus string // 订单退款状态(0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款)
|
||||||
CancelTime time.Time // 订单取消时间
|
CancelTime string // 订单取消时间
|
||||||
CancelRemarks string // 取消订单备注
|
CancelRemarks string // 取消订单备注
|
||||||
AddFinishStatus string // 添加完成订单延迟队列状态(0:未添加 1:已添加 2:添加失败)
|
AddFinishStatus string // 添加完成订单延迟队列状态(0:未添加 1:已添加 2:添加失败)
|
||||||
AddFinishTime time.Time // 添加完成订单延迟队列时间
|
AddFinishTime string // 添加完成订单延迟队列时间
|
||||||
AddFinishFailReason string // 添加完成订单延迟队列失败原因
|
AddFinishFailReason string // 添加完成订单延迟队列失败原因
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// OrderPrescriptionData 处方
|
// OrderPrescriptionData 处方
|
||||||
@ -329,14 +329,14 @@ type OrderPrescriptionData struct {
|
|||||||
PharmacistName string // 药师姓名
|
PharmacistName string // 药师姓名
|
||||||
PrescriptionStatus string // 处方状态(1:待审核 2:待使用 3:已失效 4:已使用)
|
PrescriptionStatus string // 处方状态(1:待审核 2:待使用 3:已失效 4:已使用)
|
||||||
PharmacistAuditStatus string // 药师审核状态(0:审核中 1:审核成功 2:审核驳回)
|
PharmacistAuditStatus string // 药师审核状态(0:审核中 1:审核成功 2:审核驳回)
|
||||||
PharmacistVerifyTime time.Time // 药师审核时间
|
PharmacistVerifyTime string // 药师审核时间
|
||||||
PharmacistFailReason string // 药师审核驳回原因
|
PharmacistFailReason string // 药师审核驳回原因
|
||||||
PlatformAuditStatus string // 处方平台审核状态(0:审核中 1:审核成功 2:审核驳回)
|
PlatformAuditStatus string // 处方平台审核状态(0:审核中 1:审核成功 2:审核驳回)
|
||||||
PlatformFailTime time.Time // 平台审核失败时间
|
PlatformFailTime string // 平台审核失败时间
|
||||||
PlatformFailReason string // 处方平台驳回原因
|
PlatformFailReason string // 处方平台驳回原因
|
||||||
IsAutoPharVerify string // 是否药师自动审核(0:否 1:是)
|
IsAutoPharVerify string // 是否药师自动审核(0:否 1:是)
|
||||||
DoctorCreatedTime time.Time // 医生开具处方时间
|
DoctorCreatedTime string // 医生开具处方时间
|
||||||
ExpiredTime time.Time // 处方过期时间
|
ExpiredTime string // 处方过期时间
|
||||||
IsDelete string // 是否删除(0:否 1:是)
|
IsDelete string // 是否删除(0:否 1:是)
|
||||||
PrescriptionCode string // 处方编号
|
PrescriptionCode string // 处方编号
|
||||||
ProductNames string // 药品列表
|
ProductNames string // 药品列表
|
||||||
@ -346,7 +346,7 @@ type OrderPrescriptionData struct {
|
|||||||
PatientMobile string // 患者电话
|
PatientMobile string // 患者电话
|
||||||
DoctorAdvice string // 医嘱
|
DoctorAdvice string // 医嘱
|
||||||
OrderPrescriptionIcd string // 处方诊断疾病
|
OrderPrescriptionIcd string // 处方诊断疾病
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// ProductData 系统商品
|
// ProductData 系统商品
|
||||||
@ -371,7 +371,7 @@ type ProductData struct {
|
|||||||
FrequencyUse string // 使用频率(例:1天3次)
|
FrequencyUse string // 使用频率(例:1天3次)
|
||||||
AvailableDays float64 // 可用天数(3)
|
AvailableDays float64 // 可用天数(3)
|
||||||
ProductRemarks string // 商品备注
|
ProductRemarks string // 商品备注
|
||||||
CreatedAt time.Time // 创建时间
|
CreatedAt string // 创建时间
|
||||||
}
|
}
|
||||||
|
|
||||||
// DoctorWithdrawal 提现记录
|
// DoctorWithdrawal 提现记录
|
||||||
@ -455,22 +455,19 @@ func (r *ExportService) DoctorWithdrawal(doctorWithdrawals []*model.DoctorWithdr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 时间处理
|
// 时间处理
|
||||||
var examineTime time.Time
|
var examineTime string
|
||||||
if v.ExamineTime != (model.LocalTime{}) {
|
if v.ExamineTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.ExamineTime)
|
examineTime = time.Time(v.ExamineTime).Format("2006-01-02 15:04:05")
|
||||||
examineTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var paymentTime time.Time
|
var paymentTime string
|
||||||
if v.PaymentTime != (model.LocalTime{}) {
|
if v.PaymentTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PaymentTime)
|
paymentTime = time.Time(v.PaymentTime).Format("2006-01-02 15:04:05")
|
||||||
paymentTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var createdAt time.Time
|
var createdAt string
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
createdAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
createdAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
doctorWithdrawalData := DoctorWithdrawalData{
|
doctorWithdrawalData := DoctorWithdrawalData{
|
||||||
@ -556,7 +553,7 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do
|
|||||||
var couponAmountTotal float64
|
var couponAmountTotal float64
|
||||||
var paymentAmountTotal float64
|
var paymentAmountTotal float64
|
||||||
var doctorAmount float64
|
var doctorAmount float64
|
||||||
var payTime time.Time
|
var payTime string
|
||||||
if v.Order.OrderInquiry != nil {
|
if v.Order.OrderInquiry != nil {
|
||||||
patientName = v.Order.OrderInquiry.PatientName
|
patientName = v.Order.OrderInquiry.PatientName
|
||||||
|
|
||||||
@ -587,8 +584,7 @@ func (r *ExportService) DoctorWithdrawalOrder(doctorWithdrawalOrders []*model.Do
|
|||||||
// 时间处理
|
// 时间处理
|
||||||
|
|
||||||
if v.Order.OrderInquiry.PayTime != (model.LocalTime{}) {
|
if v.Order.OrderInquiry.PayTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.Order.OrderInquiry.PayTime)
|
payTime = time.Time(v.Order.OrderInquiry.PayTime).Format("2006-01-02 15:04:05")
|
||||||
payTime = t
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -985,8 +981,7 @@ func (r *ExportService) UserDoctorBankCard(d []*model.DoctorBankCard) (string, e
|
|||||||
|
|
||||||
// 创建时间
|
// 创建时间
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dataSlice = append(dataSlice, data)
|
dataSlice = append(dataSlice, data)
|
||||||
@ -1157,43 +1152,35 @@ func (r *ExportService) OrderInquiryForAccount(d []*model.OrderInquiry) (string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.PayTime != (model.LocalTime{}) {
|
if v.PayTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PayTime)
|
data.PayTime = time.Time(v.PayTime).Format("2006-01-02 15:04:05")
|
||||||
data.PayTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.ReceptionTime != (model.LocalTime{}) {
|
if v.ReceptionTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.ReceptionTime)
|
data.ReceptionTime = time.Time(v.ReceptionTime).Format("2006-01-02 15:04:05")
|
||||||
data.ReceptionTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CompleteTime != (model.LocalTime{}) {
|
if v.CompleteTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CompleteTime)
|
data.CompleteTime = time.Time(v.CompleteTime).Format("2006-01-02 15:04:05")
|
||||||
data.CompleteTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.FinishTime != (model.LocalTime{}) {
|
if v.FinishTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.FinishTime)
|
data.FinishTime = time.Time(v.FinishTime).Format("2006-01-02 15:04:05")
|
||||||
data.FinishTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.StatisticsTime != (model.LocalTime{}) {
|
if v.StatisticsTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.StatisticsTime)
|
data.StatisticsTime = time.Time(v.StatisticsTime).Format("2006-01-02 15:04:05")
|
||||||
data.StatisticsTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.WithdrawalTime != (model.LocalTime{}) {
|
if v.WithdrawalTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.WithdrawalTime)
|
data.WithdrawalTime = time.Time(v.WithdrawalTime).Format("2006-01-02 15:04:05")
|
||||||
data.WithdrawalTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CancelTime != (model.LocalTime{}) {
|
if v.CancelTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CancelTime)
|
data.CancelTime = time.Time(v.CancelTime).Format("2006-01-02 15:04:05")
|
||||||
data.CancelTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理入账状态(0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消)
|
// 处理入账状态(0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消)
|
||||||
@ -1253,8 +1240,7 @@ func (r *ExportService) UserPatient(d []*model.UserPatient) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(v.PatientFamily) > 0 {
|
if len(v.PatientFamily) > 0 {
|
||||||
@ -1340,8 +1326,7 @@ func (r *ExportService) PatientFamily(d []*model.PatientFamily) (string, error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dataSlice = append(dataSlice, data)
|
dataSlice = append(dataSlice, data)
|
||||||
@ -1446,43 +1431,35 @@ func (r *ExportService) OrderInquiry(d []*model.OrderInquiry) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.PayTime != (model.LocalTime{}) {
|
if v.PayTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PayTime)
|
data.PayTime = time.Time(v.PayTime).Format("2006-01-02 15:04:05")
|
||||||
data.PayTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.ReceptionTime != (model.LocalTime{}) {
|
if v.ReceptionTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.ReceptionTime)
|
data.ReceptionTime = time.Time(v.ReceptionTime).Format("2006-01-02 15:04:05")
|
||||||
data.ReceptionTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CompleteTime != (model.LocalTime{}) {
|
if v.CompleteTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CompleteTime)
|
data.CompleteTime = time.Time(v.CompleteTime).Format("2006-01-02 15:04:05")
|
||||||
data.CompleteTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.FinishTime != (model.LocalTime{}) {
|
if v.FinishTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.FinishTime)
|
data.FinishTime = time.Time(v.FinishTime).Format("2006-01-02 15:04:05")
|
||||||
data.FinishTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.StatisticsTime != (model.LocalTime{}) {
|
if v.StatisticsTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.StatisticsTime)
|
data.StatisticsTime = time.Time(v.StatisticsTime).Format("2006-01-02 15:04:05")
|
||||||
data.StatisticsTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.WithdrawalTime != (model.LocalTime{}) {
|
if v.WithdrawalTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.WithdrawalTime)
|
data.WithdrawalTime = time.Time(v.WithdrawalTime).Format("2006-01-02 15:04:05")
|
||||||
data.WithdrawalTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CancelTime != (model.LocalTime{}) {
|
if v.CancelTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CancelTime)
|
data.CancelTime = time.Time(v.CancelTime).Format("2006-01-02 15:04:05")
|
||||||
data.CancelTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理入账状态(0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消)
|
// 处理入账状态(0:未入账 1:已入账 2:入账中 3:入账失败 4:入账取消)
|
||||||
@ -1762,33 +1739,27 @@ func (r *ExportService) OrderServicePackage(d []*model.OrderServicePackage) (str
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.PayTime != (model.LocalTime{}) {
|
if v.PayTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PayTime)
|
data.PayTime = time.Time(v.PayTime).Format("2006-01-02 15:04:05")
|
||||||
data.PayTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.StartTime != (model.LocalTime{}) {
|
if v.StartTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.StartTime)
|
data.StartTime = time.Time(v.StartTime).Format("2006-01-02 15:04:05")
|
||||||
data.StartTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.FinishTime != (model.LocalTime{}) {
|
if v.FinishTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.FinishTime)
|
data.FinishTime = time.Time(v.FinishTime).Format("2006-01-02 15:04:05")
|
||||||
data.FinishTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CancelTime != (model.LocalTime{}) {
|
if v.CancelTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CancelTime)
|
data.CancelTime = time.Time(v.CancelTime).Format("2006-01-02 15:04:05")
|
||||||
data.CancelTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.AddFinishTime != (model.LocalTime{}) {
|
if v.AddFinishTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.AddFinishTime)
|
data.AddFinishTime = time.Time(v.AddFinishTime).Format("2006-01-02 15:04:05")
|
||||||
data.AddFinishTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dataSlice = append(dataSlice, data)
|
dataSlice = append(dataSlice, data)
|
||||||
@ -1886,28 +1857,23 @@ func (r *ExportService) OrderPrescription(d []*model.OrderPrescription) (string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.PharmacistVerifyTime != (model.LocalTime{}) {
|
if v.PharmacistVerifyTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PharmacistVerifyTime)
|
data.PharmacistVerifyTime = time.Time(v.PharmacistVerifyTime).Format("2006-01-02 15:04:05")
|
||||||
data.PharmacistVerifyTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.PlatformFailTime != (model.LocalTime{}) {
|
if v.PlatformFailTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.PlatformFailTime)
|
data.PlatformFailTime = time.Time(v.PlatformFailTime).Format("2006-01-02 15:04:05")
|
||||||
data.PlatformFailTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.DoctorCreatedTime != (model.LocalTime{}) {
|
if v.DoctorCreatedTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.DoctorCreatedTime)
|
data.DoctorCreatedTime = time.Time(v.DoctorCreatedTime).Format("2006-01-02 15:04:05")
|
||||||
data.DoctorCreatedTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.ExpiredTime != (model.LocalTime{}) {
|
if v.ExpiredTime != (model.LocalTime{}) {
|
||||||
t := time.Time(v.ExpiredTime)
|
data.ExpiredTime = time.Time(v.ExpiredTime).Format("2006-01-02 15:04:05")
|
||||||
data.ExpiredTime = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理厨房药品列表
|
// 处理厨房药品列表
|
||||||
@ -2004,8 +1970,7 @@ func (r *ExportService) Product(d []*model.Product) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v.CreatedAt != (model.LocalTime{}) {
|
if v.CreatedAt != (model.LocalTime{}) {
|
||||||
t := time.Time(v.CreatedAt)
|
data.CreatedAt = time.Time(v.CreatedAt).Format("2006-01-02 15:04:05")
|
||||||
data.CreatedAt = t
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dataSlice = append(dataSlice, data)
|
dataSlice = append(dataSlice, data)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user