新增注射剂报表model并在核对处方时写入表数据

This commit is contained in:
maqiao 2024-09-19 11:49:45 +08:00
parent 85821c040f
commit ece3d477a2
2 changed files with 135 additions and 3 deletions

View File

@ -0,0 +1,102 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DM_Weight.Models
{
[SugarTable("rejection_report")]
public class RejectionReport
{
/// <summary>
/// 主键
/// </summary>
[SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
public int Id { get; set; }
/// <summary>
/// 发药时间
/// </summary>
[SugarColumn(ColumnName = "SendDate")]
public DateTime SendDate { get; set; }
/// <summary>
/// 发药者
/// </summary>
[SugarColumn(ColumnName = "SendUser")]
public string SendUser { get;set; }
/// <summary>
/// 领药者
/// </summary>
[SugarColumn(ColumnName = "ReceiveUser")]
public string ReceiveUser { get; set; }
/// <summary>
/// 实发数
/// </summary>
[SugarColumn(ColumnName = "RealNum")]
public int RealNum { get;set; }
/// <summary>
/// 实物数
/// </summary>
[SugarColumn(ColumnName = "InfactNum")]
public int InfactNum { get; set; }
/// <summary>
/// 空安瓿
/// </summary>
[SugarColumn(ColumnName = "EmptyNum")]
public int EmptyNum { get; set; }
/// <summary>
/// 还药时间
/// </summary>
[SugarColumn(ColumnName = "ReturnTime")]
public DateTime ReturnTime { get; set; }
/// <summary>
/// 还药者
/// </summary>
[SugarColumn(ColumnName = "ReturnUser")]
public string ReturnUser { get; set; }
/// <summary>
/// 接收者
/// </summary>
[SugarColumn(ColumnName = "ReturnReceiveUser")]
public string ReturnReceiveUser { get;set; }
/// <summary>
/// 补充者
/// </summary>
[SugarColumn(ColumnName = "AddUser")]
public string AddUser { get; set; }
/// <summary>
/// 核对者
/// </summary>
[SugarColumn(ColumnName = "AddCheckUser")]
public string AddCheckUser { get; set; }
/// <summary>
/// 操作时间
/// </summary>
[SugarColumn(ColumnName = "OperationTime")]
public DateTime OperationTime { get; set; }
[SugarColumn(ColumnName = "DrugId")]
public string DrugId { get; set; }
/// <summary>
/// 药品名称
/// </summary>
[SugarColumn(ColumnName = "DrugName")]
public string DrugName { get; set;}
/// <summary>
/// 药品规格
/// </summary>
[SugarColumn(ColumnName = "DrugSpec")]
public string DrugSpec { get;set; }
/// <summary>
/// 总基数
/// </summary>
[SugarColumn(ColumnName = "BaseNum")]
public string BaseNum { get; set; }
/// <summary>
/// 药箱号
/// </summary>
[SugarColumn(ColumnName = "DrawerNo")]
public int DrawerNo { get; set; }
}
}

View File

@ -499,7 +499,12 @@ namespace DM_Weight.ViewModels
//Expression<Func<ChannelStock, bool>> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrugId == oi._OrderDetail.DrugId && cs.ManuNo == oi._OrderDetail.SetManuNo && cs.EffDate == oi._OrderDetail.SetEffDate && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cs.DrawerNo == DrawerNo).First();
ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>()
.Where(cs => cs.DrugId == oi._OrderDetail.DrugId
&& cs.ManuNo == oi._OrderDetail.SetManuNo
&& cs.EffDate == oi._OrderDetail.SetEffDate
&& cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")
&& cs.DrawerNo == DrawerNo).First();
if (cs == null)
{
empChannelStock += $"{oi.OrderNo},{oi._OrderDetail.DrugId},{oi._OrderDetail.SetManuNo},{oi._OrderDetail.SetEffDate}";
@ -530,8 +535,33 @@ namespace DM_Weight.ViewModels
}).ExecuteCommand();
#region 使
//1查询取走药箱时间
DateTime? strEffDate= SqlSugarHelper.Db.Queryable<MachineRecord>().Where(mr => mr.DrawerNo == cs.DrawerNo && mr.Type == 55 && mr.OptionType == 0).Select(mr => mr.EffDate).First();
//查询发药时间
MachineRecord SendMachineRecord = SqlSugarHelper.Db.Queryable<MachineRecord>().Where(mr => mr.DrawerNo == cs.DrawerNo && mr.Type == 2)
.OrderByDescending(mr => mr.OperationTime)
.First();
string retUser = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cl => cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cl.DrawerNo == cs.DrawerNo)
.Select(cl => cl.BelongUser).First();
//发药信息
RejectionReport rejectionReport = new RejectionReport();
rejectionReport.SendDate = SendMachineRecord.OperationTime;
rejectionReport.SendUser = SendMachineRecord.Operator.ToString();
rejectionReport.ReceiveUser = retUser;
rejectionReport.RealNum = cs.BaseQuantity;
//还药信息
rejectionReport.InfactNum = cs.BaseQuantity - oi._OrderDetail.Quantity;
rejectionReport.EmptyNum = oi._OrderDetail.Quantity;
rejectionReport.ReturnTime = DateTime.Now;
rejectionReport.ReturnUser = retUser;
rejectionReport.ReturnReceiveUser = SendMachineRecord.Operator.ToString();
rejectionReport.DrugId = oi._OrderDetail.DrugId;
rejectionReport.DrugName = oi._OrderDetail.DrugInfo.DrugName;
rejectionReport.DrugSpec = oi._OrderDetail.DrugInfo.DrugSpec;
rejectionReport.OperationTime = DateTime.Now;
int iRejectionReport = SqlSugarHelper.Db.Insertable(rejectionReport).ExecuteCommand();
#endregion
}