diff --git a/DM_Weight/Models/RejectionReport.cs b/DM_Weight/Models/RejectionReport.cs index 4d7d7ae..75455c9 100644 --- a/DM_Weight/Models/RejectionReport.cs +++ b/DM_Weight/Models/RejectionReport.cs @@ -49,7 +49,7 @@ namespace DM_Weight.Models /// 还药时间 /// [SugarColumn(ColumnName = "ReturnTime")] - public DateTime ReturnTime { get; set; } + public string ReturnTime { get; set; } /// /// 还药者 /// diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index f599d95..86b0604 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -558,7 +558,7 @@ namespace DM_Weight.ViewModels //还药信息 rejectionReport.InfactNum = cs.BaseQuantity - oi._OrderDetail.Quantity; rejectionReport.EmptyNum = oi._OrderDetail.Quantity; - rejectionReport.ReturnTime = DateTime.Now; + rejectionReport.ReturnTime = DateTime.Now.ToString(); rejectionReport.ReturnUser = rejectionReport.SendUser; rejectionReport.ReturnReceiveUser = rejectionReport.ReceiveUser;// SendMachineRecord.Operator.ToString(); rejectionReport.DrugId = oi._OrderDetail.DrugId;