maqiao
/
XiangTan_JiaoJie_Bak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改报表、改取余液表数据对待核对，余液表添加dm_status、quantity字段。 

account_book_g2表添加Use_Dose、Residual_Dose字段
This commit is contained in:
马巧 2025-09-24 13:57:57 +08:00
parent d8d08559f3
commit 157f88d629
15 changed files with 3569 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DM_Weight/App.xaml.cs
View File

@ -174,6 +174,11 @@ namespace DM_Weight
containerRegistry.RegisterForNavigation<CheckSelfOrderWindow, CheckSelfOrderWindowViewModel>();
//管理员根据药箱进行核对处方
containerRegistry.RegisterForNavigation<CheckOrderNewWindowNew, CheckOrderNewWindowNewViewModel>();
//麻醉师核对其名下单子
containerRegistry.RegisterForNavigation<CheckSelfOrderWindowNew, CheckSelfOrderWindowNewViewModel>();
#endregion

10
DM_Weight/Models/AccountBookG2.cs
View File

@ -154,5 +154,15 @@ namespace DM_Weight.Models
/// </summary>
[SugarColumn(ColumnName = "shoushuJian")]
public string ShoushuJian { get;set; }
/// <summary>
/// 使用剂量
/// </summary>
[SugarColumn(ColumnName = "Use_Dose")]
public string UseDose { get; set; }
/// <summary>
/// 剩余剂量
/// </summary>
[SugarColumn(ColumnName = "Residual_Dose")]
public string ResidualDose { get; set; }
}
}

41
DM_Weight/Models/SurgicalResidual.cs
View File

@ -1,14 +1,15 @@
using System;
using Prism.Mvvm;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;
namespace DM_Weight.Models
{
[SugarTable("surgical_residual")]
public class SurgicalResidual
public class SurgicalResidual : BindableBase
{
//[SugarColumn(ColumnName = "id")]
//public int Id { get; set; }
@ -23,7 +24,7 @@ namespace DM_Weight.Models
//public string residual_dose { get; set; }
[SugarColumn(ColumnName = "create_time")]
public string CreateTime { get; set; }
public DateTime CreateTime { get; set; }
//使用量
[SugarColumn(ColumnName = "use_dose")]
public string UseDose { get; set; }
@ -35,11 +36,35 @@ namespace DM_Weight.Models
//余液处置时间
[SugarColumn(ColumnName = "disposal_time")]
public string DisposalTime { get; set; }
//数量
[SugarColumn(ColumnName = "quantity")]
public int Quantity { get; set; }
//病人ID
[SugarColumn(ColumnName = "patient_id")]
public string PatientId { get; set; }
//病人
[SugarColumn(ColumnName = "patient_name")]
public string PName { get; set; }
//性别
[SugarColumn(ColumnName = "sex")]
public string Sex { get; set; }
//毒麻柜使用的状态
[SugarColumn(ColumnName = "dm_status")]
public int DmStatus { get; set; }
//批次
[SugarColumn(ColumnName = "manu_no")]
public string ManuNo { get; set; }
//麻醉师工号
[SugarColumn(ColumnName = "anaesthetist_code")]
public string DoctorCode { get; set; }
//药品信息
[Navigate(NavigateType.ManyToOne, nameof(DrugId))]
public DrugInfo DrugInfo { get; set; }
//使用量+单位
[SugarColumn(IsIgnore = true)]
public string UseDoseInfo
{
get => UseDose==null ? "" : UseDose + DoseUnit;
get => UseDose == null ? "" : UseDose + DoseUnit;
}
/// <summary>
/// 剩余量+单位
@ -49,5 +74,11 @@ namespace DM_Weight.Models
{
get => ResidualDose == null ? "" : ResidualDose + DoseUnit;
}
/// <summary>
/// 是否选中
/// </summary>
private bool _itemIsChecked;
[SugarColumn(IsIgnore = true)]
public bool ItemIsChecked { get => _itemIsChecked; set => SetProperty(ref _itemIsChecked, value); }
}
}

14
DM_Weight/Models/TotalDrug.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DM_Weight.Models
{
public class TotalDrug
{
public string DrugName { get; set; }
public int TotalCount { get; set; }
}
}

8
DM_Weight/Report/GridReportUtil.cs
View File

@ -378,8 +378,8 @@ namespace DM_Weight.Report
string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
string SQL = $@" select ab.drug_id, ab.type,
di.drug_name AS DrugName,di.Drug_spec AS DrugSpec,di.big_unit AS BigUnit,di.small_unit AS SmallUnit,
DATE_FORMAT(ab.create_date,'%Y/%m/%d') AS YearMD,ab.manu_no AS ManuNo,DATE_FORMAT(ab.eff_date,'%Y%m%d') AS effDate,IF(ab.type=1,ab.add_quantity,'') AS InQuantity,ab.shoushuJian AS shoushuJian,
re.Patient_name AS PName,re.sex AS Sex,re.age AS Age,re.use_dose AS UseDose,re.residual_dose AS ResidualDose,re.create_time AS DiposalTime
DATE_FORMAT(ab.create_date,'%Y/%m/%d') AS YearMD,ab.manu_no AS ManuNo,DATE_FORMAT(ab.eff_date,'%Y%m%d') AS effDate,IF(ab.type=2,'',ab.add_quantity) AS InQuantity,ab.shoushuJian AS shoushuJian,
re.Patient_name AS PName,re.sex AS Sex,re.age AS Age,IF(ab.type=3,ab.use_dose,re.use_dose) AS UseDose,IF(ab.type=3,ab.residual_dose,re.residual_dose) AS ResidualDose,re.create_time AS DiposalTime
,re.operator_name, ab.manu_stock AS Stock,ab.total_stock AS empty,ab.total_stock,UL.User_name AS SendUser,
IF(ab.type=1,UL.User_name,UL2.User_name) AS InCheckUser,
re.supervisor_name AS CheckUser,ab.manu_stock,ab.total_stock,ab.user_id1,ab.user_id2,ab.out_Quantity
@ -391,13 +391,13 @@ namespace DM_Weight.Report
LEFT JOIN order_info_sm oi on ab.invoice_no=oi.order_no
LEFT JOIN user_list UL ON ab.user_id1=UL.ID
LEFT JOIN user_list UL2 ON ab.user_id2=UL.ID
LEFT JOIN surgical_residual re on ab.invoice_no=re.order_no WHERE ab.machine_id='DM3' and ab.type in(1,2) and
LEFT JOIN surgical_residual re on ab.invoice_no=re.order_no WHERE ab.machine_id='DM3' and ab.type in(1,2,3) and
ab.create_time>'{p_startDate}' AND ab.create_time<'{p_endDate}' ";
if (!string.IsNullOrEmpty(drug_id))
{
SQL += " AND ab.drug_id='" + drug_id + "' ";
}
SQL += " ORDER BY ab.create_date asc,ab.drug_id,ab.Manu_No,ab.id ";
SQL += " ORDER BY ab.type,ab.drug_id,ab.Manu_No,ab.id ";
Report.DetailGrid.Recordset.QuerySQL = SQL;
Report.PrintPreview(true);

712
DM_Weight/ReportTemp/account_book_new - 副本.grf Normal file
View File

@ -0,0 +1,712 @@
{
"Version":"6.8.1.1",
"Font":{
"Name":"宋体",
"Size":105000,
"Weight":400,
"Charset":134
},
"Printer":{
"Oriention":"Landscape",
"TopMargin":0.3175,
"RightMargin":1,
"BottomMargin":0.3969
},
"DetailGrid":{
"CenterView":true,
"Recordset":{
"QuerySQL":"SELECT \r\n dmr.`drawer_no` AS drawerNo,\r\n dmr.`col_no` AS colNo,\r\n dmr.`type` AS `type`,\r\n CONCAT(dmr.`quantity`,IF(dmr.`type`=32,\"(空瓶)\",\"\")) AS quantity,\r\n dmr.`manu_no` AS manuNo,\r\n dmr.`eff_date` AS effDate,\r\n dmr.`operation_time` AS operationTime,\r\n di.`drug_name` AS drugName,\r\n di.`drug_spec` AS drugSpec,\r\n di.`pack_unit` AS packUnit,\r\n di.`manufactory` AS manuFactory,\r\n di.`max_stock` AS baseQuantity,\r\n dmr.`drug_id` AS drugId,\r\n ul.`user_name` AS nickname\r\nFROM\r\n dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` in (31, 32)\r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate",
"Field":[
{
"Name":"药品名称",
"DBFieldName":"DrugName"
},
{
"Name":"日期",
"DBFieldName":"YearMD"
},
{
"Name":"批号",
"DBFieldName":"ManuNo"
},
{
"Name":"效期",
"Format":"yyyy/MM/dd",
"DBFieldName":"effDate"
},
{
"Name":"领入",
"DBFieldName":"InQuantity"
},
{
"Name":"规格",
"DBFieldName":"DrugSpec"
},
{
"Name":"大单位",
"DBFieldName":"BigUnit"
},
{
"Name":"小单位",
"DBFieldName":"SmallUnit"
},
{
"Name":"基数",
"DBFieldName":"BaseQuantity"
},
{
"Name":"手术间",
"DBFieldName":"shoushuJian"
},
{
"Name":"患者姓名",
"DBFieldName":"PName"
},
{
"Name":"性别",
"DBFieldName":"Sex"
},
{
"Name":"年龄",
"DBFieldName":"Age"
},
{
"Name":"住院号",
"DBFieldName":"ZYH"
},
{
"Name":"科室",
"DBFieldName":"KS"
},
{
"Name":"使用剂量",
"DBFieldName":"UseDose"
},
{
"Name":"剩余剂量",
"DBFieldName":"ResidualDose"
},
{
"Name":"余液处理时间",
"DBFieldName":"DiposalTime"
},
{
"Name":"医师",
"DBFieldName":"YS"
},
{
"Name":"复核人",
"DBFieldName":"CheckUser"
},
{
"Name":"实物",
"DBFieldName":"Stock"
},
{
"Name":"空瓶",
"DBFieldName":"empty"
},
{
"Name":"发药人",
"DBFieldName":"SendUser"
},
{
"Name":"领药人",
"DBFieldName":"InUser"
},
{
"Name":"领药复核人",
"DBFieldName":"InCheckUser"
},
{
"Name":"空瓶回收人",
"DBFieldName":"emptyUser"
},
{
"Name":"批次库存",
"DBFieldName":"CurrentStock"
}
]
},
"Column":[
{
"Name":"日期",
"Width":2.77813
},
{
"Name":"批次",
"Width":2.19604
},
{
"Name":"有效期",
"Width":2.77813
},
{
"Name":"领入",
"Width":0.820208
},
{
"Name":"手术间",
"Width":0.79375
},
{
"Name":"患者姓名",
"Width":1.61396
},
{
"Name":"性别",
"Width":1.00542
},
{
"Name":"年龄",
"Width":0.79375
},
{
"Name":"住院号",
"Width":1.5875
},
{
"Name":"科室",
"Width":2.2225
},
{
"Name":"使用剂量",
"Width":1.82563
},
{
"Name":"剩余剂量",
"Width":1.5875
},
{
"Name":"余液处理时间",
"Width":2.59292
},
{
"Name":"医师",
"Width":1.5875
},
{
"Name":"复核人",
"Width":1.79917
},
{
"Name":"空瓶回收人",
"Width":1.5875
},
{
"Name":"Column7",
"Width":1.61396
},
{
"Name":"实物",
"Width":1.40229
},
{
"Name":"空瓶",
"Width":1.19063
},
{
"Name":"发药人",
"Width":1.79917
},
{
"Name":"Column2",
"Width":1.79917
},
{
"Name":"Column8",
"Width":1.79917
}
],
"ColumnContent":{
"Height":2.01083,
"ColumnContentCell":[
{
"Column":"日期",
"TextAlign":"MiddleCenter",
"DataField":"日期"
},
{
"Column":"批次",
"TextAlign":"MiddleCenter",
"DataField":"批号"
},
{
"Column":"有效期",
"TextAlign":"MiddleCenter",
"DataField":"效期"
},
{
"Column":"领入",
"TextAlign":"MiddleCenter",
"DataField":"领入"
},
{
"Column":"手术间",
"TextAlign":"MiddleCenter",
"DataField":"手术间"
},
{
"Column":"患者姓名",
"TextAlign":"MiddleCenter",
"DataField":"患者姓名"
},
{
"Column":"性别",
"TextAlign":"MiddleCenter",
"DataField":"性别"
},
{
"Column":"年龄",
"DataField":"年龄"
},
{
"Column":"住院号",
"DataField":"住院号"
},
{
"Column":"科室",
"DataField":"科室"
},
{
"Column":"使用剂量",
"DataField":"使用剂量"
},
{
"Column":"剩余剂量",
"DataField":"剩余剂量"
},
{
"Column":"余液处理时间",
"DataField":"余液处理时间"
},
{
"Column":"医师",
"DataField":"医师"
},
{
"Column":"复核人",
"DataField":"复核人"
},
{
"Column":"空瓶回收人",
"DataField":"空瓶回收人"
},
{
"Column":"Column7"
},
{
"Column":"实物",
"DataField":"实物"
},
{
"Column":"空瓶",
"DataField":"空瓶"
},
{
"Column":"发药人",
"DataField":"发药人"
},
{
"Column":"Column2",
"DataField":"领药复核人"
},
{
"Column":"Column8",
"DataField":"批次库存"
}
]
},
"ColumnTitle":{
"Height":2.59292,
"RepeatStyle":"OnPage",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"日期",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"日期"
},
{
"GroupTitle":false,
"Column":"批次",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"批号"
},
{
"GroupTitle":false,
"Column":"有效期",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"有效期"
},
{
"GroupTitle":false,
"Column":"领入",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"领\r\n入"
},
{
"GroupTitle":true,
"Name":"Column1",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"手术间",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"手\r\n术\r\n间"
},
{
"GroupTitle":false,
"Column":"患者姓名",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"患者\r\n姓名"
},
{
"GroupTitle":false,
"Column":"性别",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"性\r\n别"
},
{
"GroupTitle":false,
"Column":"年龄",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"年\r\n龄"
},
{
"GroupTitle":false,
"Column":"住院号",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"住院号"
},
{
"GroupTitle":false,
"Column":"科室",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"科室"
},
{
"GroupTitle":false,
"Column":"使用剂量",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"使用\r\n剂量"
},
{
"GroupTitle":false,
"Column":"剩余剂量",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"剩余\r\n剂量"
},
{
"GroupTitle":false,
"Column":"余液处理时间",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"余液\r\n处理\r\n时间"
},
{
"GroupTitle":false,
"Column":"医师",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"医师"
},
{
"GroupTitle":false,
"Column":"复核人",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"复核人"
}
],
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"使用"
},
{
"GroupTitle":true,
"Name":"Column6",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"空瓶回收人",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"回收人"
},
{
"GroupTitle":false,
"Column":"Column7",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"药房\r\n回收人"
}
],
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"空瓶回收"
},
{
"GroupTitle":true,
"Name":"Column3",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"实物",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"实物"
},
{
"GroupTitle":false,
"Column":"空瓶",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"空瓶"
}
],
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"结存数"
},
{
"GroupTitle":false,
"Column":"发药人",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"发药人"
},
{
"GroupTitle":true,
"Name":"Column5",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"Column2",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"复核人"
}
],
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"领药人"
},
{
"GroupTitle":false,
"Column":"Column8",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"批次\r\n库存"
}
]
}
},
"PageHeader":{
"Height":0
},
"Parameter":[
{
"Name":"startDate",
"DataType":"DateTime",
"Format":"yyyy-MM-dd hh:mm:ss",
"Value":"2023/1/1"
},
{
"Name":"endDate",
"DataType":"DateTime",
"Format":"yyyy-MM-dd hh:mm:ss",
"Value":"2023/4/28 23:59:59"
},
{
"Name":"machine_id",
"Value":"DM1"
}
],
"ReportHeader":[
{
"Name":"ReportHeader1",
"Height":1.5875,
"Control":[
{
"Type":"MemoBox",
"Name":"MemoBox2",
"Dock":"Fill",
"Font":{
"Name":"宋体",
"Size":217500,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"湘谭县人民医院麻醉药品、精神药品专用账册、使用登记册（手术室）"
}
],
"RepeatOnPage":true
},
{
"Name":"ReportHeader2",
"Height":1.00542,
"Control":[
{
"Type":"MemoBox",
"Name":"MemoBox3",
"Dock":"Fill",
"Border":{
"Styles":"[DrawLeft|DrawTop|DrawRight]"
},
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"Text":"药品名称：[#药品名称#] 规格：[#规格#] 单位：[#大单位#] 基数：[#基数#]"
}
],
"RepeatOnPage":true
}
]
}

1130
DM_Weight/ViewModels/CheckOrderNewWindowNewViewModel.cs Normal file
View File

File diff suppressed because it is too large Load Diff

27
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -576,6 +576,12 @@ namespace DM_Weight.ViewModels
#endregion
//}
//查询上一条账册中的空瓶数
AccountBookG2 accountBookEmpty = SqlSugarHelper.Db.Queryable<AccountBookG2>()
.Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
.Where(ab => ab.Type == 1 || ab.Type == 2)
.Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
.Where(ab => ab.ManuNo == cs.ManuNo).OrderByDescending(ab => ab.Id).First();
//修改凌晨生成的日结存与总结存数据
AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>()
.Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
@ -589,6 +595,9 @@ namespace DM_Weight.ViewModels
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - oi._OrderDetail.Quantity;
accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity + oi._OrderDetail.Quantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
accountBookG2Day.UseDose = (Convert.ToInt32(accountBookG2Day.UseDose) + Convert.ToInt32(oi._OrderDetail.surgicalResidual.UseDose)).ToString();
accountBookG2Day.ResidualDose = (Convert.ToInt32(accountBookG2Day.ResidualDose) + Convert.ToInt32(oi._OrderDetail.surgicalResidual.ResidualDose)).ToString();
accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi._OrderDetail.Quantity;
manuStock = accountBookG2Day.ManuStock;
}
else
@ -610,6 +619,8 @@ namespace DM_Weight.ViewModels
CreateTime = DateTime.Now,
InvoiceNo = "日结存",
OutQuantity = oi._OrderDetail.Quantity,
UseDose = oi._OrderDetail.surgicalResidual.UseDose,
ResidualDose = oi._OrderDetail.surgicalResidual.ResidualDose
}).ExecuteCommand();
if (iDayResult <= 0)
{
@ -617,11 +628,11 @@ namespace DM_Weight.ViewModels
}
}
//查询上一条账册中的空瓶数
AccountBookG2 accountBookEmpty = SqlSugarHelper.Db.Queryable<AccountBookG2>()
.Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
.Where(ab => ab.Type == 1 || ab.Type == 2)
.Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
.Where(ab => ab.ManuNo == cs.ManuNo).OrderByDescending(ab => ab.Id).First();
//AccountBookG2 accountBookEmpty = SqlSugarHelper.Db.Queryable<AccountBookG2>()
//.Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
//.Where(ab => ab.Type == 1 || ab.Type == 2)
//.Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
//.Where(ab => ab.ManuNo == cs.ManuNo).OrderByDescending(ab => ab.Id).First();
//保存账册
int iInsertResult = SqlSugarHelper.Db.Insertable(new AccountBookG2()
{
@ -1100,9 +1111,5 @@ namespace DM_Weight.ViewModels
// }
//}
}
public class TotalDrug
{
public string DrugName { get; set; }
public int TotalCount { get; set; }
}
}

1117
DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs Normal file
View File

File diff suppressed because it is too large Load Diff

1
DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
View File

@ -588,6 +588,7 @@ namespace DM_Weight.ViewModels
.Where(oi => oi.DoctorCode == currentDrawerUser)
.Where(oi => oi._OrderDetail.SetManuNo != null&&oi._OrderDetail.SetManuNo!="null")
.Where(oi=>oi._OrderDetail.Quantity>0)
.Where(oi=>oi._OrderDetail.surgicalResidual.SendNo== DrawerNo.ToString())
.OrderBy(oi => oi.OrderId)
.ToPageList(PageNum, PageSize, ref totalCount);

4
DM_Weight/ViewModels/RoleManagerWindowViewModel.cs
View File

@ -201,7 +201,7 @@ namespace DM_Weight.ViewModels
{
Id = 11,
PremissionName = "操作手术间",
PremissionPath = "CheckSelfOrderWindow",
PremissionPath = "CheckSelfOrderWindowNew",
};
//核对处方
PremissionDm checkOrder = new PremissionDm
@ -209,7 +209,7 @@ namespace DM_Weight.ViewModels
Id = 12,
PremissionName = "核对处方",
//PremissionPath = "CheckOrderWindow",
PremissionPath = "CheckOrderNewWindow",
PremissionPath = "CheckOrderNewWindowNew",
};
//核对处方
PremissionDm addition = new PremissionDm

233
DM_Weight/Views/CheckOrderNewWindowNew.xaml Normal file
View File

@ -0,0 +1,233 @@
<UserControl x:Class="DM_Weight.Views.CheckOrderNewWindowNew"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
xmlns:local="clr-namespace:DM_Weight.Views"
mc:Ignorable="d"
xmlns:convert="clr-namespace:DM_Weight.Converter"
xmlns:prism="http://prismlibrary.com/">
<UserControl.Resources>
<convert:OrderStatusConverter x:Key="OrderStatusConverter" />
<convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
<convert:BoxNumConverter x:Key="BoxNumConverter" />
<convert:StatusConverter x:Key="StatusConverter" />
<Style x:Key="st" TargetType="GridViewColumnHeader">
<Style.Setters>
<Setter Property="Height">
<Setter.Value>55</Setter.Value>
</Setter>
<Setter Property="Background">
<Setter.Value>#31ccec</Setter.Value>
</Setter>
<Setter Property="Foreground">
<Setter.Value>white</Setter.Value>
</Setter>
</Style.Setters>
</Style>
</UserControl.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid Margin="6" Grid.Column="0">
<Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignPaperLightButton}">
<Setter Property="Foreground" Value="#00a0ea" />
<Setter Property="BorderBrush" Value="#00a0ea" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#d1e7f5" />
<Setter Property="BorderBrush" Value="#d1e7f5" />
</Trigger>
<DataTrigger Value="True">
<DataTrigger.Binding>
<MultiBinding Converter="{StaticResource DrawerSelectConverter}">
<Binding RelativeSource="{ RelativeSource Mode=Self }" Path="Content" />
<Binding Path="DrawerNo" />
</MultiBinding>
</DataTrigger.Binding>
<Setter Property="Background" Value="#d1e7f5" />
<Setter Property="BorderBrush" Value="#d1e7f5" />
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Resources>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<!--<RowDefinition />-->
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button Margin="0 0 3 0" Grid.Row="0" Grid.Column="0" Width="120" Content="一号手术间" Background="{Binding Button1Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="0" IsEnabled="{Binding IsEnabled1}"/>
<Button Margin="0 0 3 0" Grid.Row="1" Grid.Column="0" Width="120" Content="二号手术间" Background="{Binding Button2Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="1" IsEnabled="{Binding IsEnabled2}"/>
<Button Margin="0 0 3 0" Grid.Row="2" Grid.Column="0" Width="120" Content="三号手术间" Background="{Binding Button3Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="2" IsEnabled="{Binding IsEnabled3}"/>
<Button Margin="0 0 3 0" Grid.Row="3" Grid.Column="0" Width="120" Content="四号手术间" Background="{Binding Button4Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="3" IsEnabled="{Binding IsEnabled4}"/>
<Button Margin="0 0 3 0" Grid.Row="4" Grid.Column="0" Width="120" Content="五号手术间" Background="{Binding Button5Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="4" IsEnabled="{Binding IsEnabled5}"/>
<Button Margin="0 0 3 0" Grid.Row="5" Grid.Column="0" Width="120" Content="六号手术间" Background="{Binding Button6Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="5" IsEnabled="{Binding IsEnabled6}"/>
<Button Margin="0 0 3 0" Grid.Row="6" Grid.Column="0" Width="120" Content="七号手术间" Background="{Binding Button7Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="6" IsEnabled="{Binding IsEnabled7}"/>
<Button Margin="0 0 3 0" Grid.Row="7" Grid.Column="0" Width="120" Content="八号手术间" Background="{Binding Button8Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="7" IsEnabled="{Binding IsEnabled8}"/>
<Button Margin="0 0 3 0" Grid.Row="8" Grid.Column="0" Width="120" Content="九号手术间" Background="{Binding Button9Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="8" IsEnabled="{Binding IsEnabled9}"/>
<Button Margin="0 0 3 0" Grid.Row="0" Grid.Column="1" Width="120" Content="十号手术间" Background="{Binding Button10Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="9" IsEnabled="{Binding IsEnabled10}"/>
<Button Grid.Row="1" Grid.Column="1" Width="120" Content="十一号手术间" Background="{Binding Button11Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="10" IsEnabled="{Binding IsEnabled11}"/>
<Button Grid.Row="2" Grid.Column="1" Width="120" Content="十二号手术间" Background="{Binding Button12Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="11" IsEnabled="{Binding IsEnabled12}"/>
<Button Grid.Row="3" Grid.Column="1" Width="120" Content="十三号手术间" Background="{Binding Button13Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="12" IsEnabled="{Binding IsEnabled13}"/>
<Button Grid.Row="4" Grid.Column="1" Width="120" Content="十四号手术间" Background="{Binding Button14Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="13" IsEnabled="{Binding IsEnabled14}"/>
<Button Grid.Row="5" Grid.Column="1" Width="120" Content="十五号手术间" Background="{Binding Button15Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="14" IsEnabled="{Binding IsEnabled15}"/>
<Button Grid.Row="6" Grid.Column="1" Width="120" Content="十六号手术间" Background="{Binding Button16Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="15" IsEnabled="{Binding IsEnabled16}"/>
<Button Grid.Row="7" Grid.Column="1" Width="120" Content="十七号手术间" Background="{Binding Button17Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="16" IsEnabled="{Binding IsEnabled17}"/>
<Button Grid.Row="8" Grid.Column="1" Width="120" Content="十八号手术间" Background="{Binding Button18Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="17" IsEnabled="{Binding IsEnabled18}"/>
<!--<Button Grid.Row="8" Grid.Column="1" Width="120" Content="19号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="19" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=19}"/>
<Button Grid.Row="9" Grid.Column="1" Width="120" Content="20号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="20" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=20}"/>-->
</Grid>
<Grid Grid.Column="1" Margin="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Margin="0 6 0 6" Grid.Row="0" Grid.ColumnSpan="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*" />
<ColumnDefinition Width="4*" />
<ColumnDefinition Width="2*" />
</Grid.ColumnDefinitions>
<DatePicker
Grid.Column="0"
SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
SelectedDateFormat="Short"
Margin="6 0 0 0"
materialDesign:HintAssist.Hint="开单日期"
Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button
Margin="0 0 6 0"
VerticalAlignment="Center" Command="{Binding CheckOrder}"
Content="确认"
Style="{StaticResource MaterialDesignOutlinedLightButton}">
</Button>
<Button
Margin="0 0 6 0"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
ToolTip="刷新" Command="{Binding Query}">
<materialDesign:PackIcon Kind="Refresh" />
</Button>
</StackPanel>
</Grid>
<!--<Grid Grid.Row="1" Grid.Column="0" Margin="0 0 -100 0">-->
<!--<ScrollViewer VerticalScrollBarVisibility="Auto">-->
<ListView Grid.Row="1" Grid.Column="0" Margin="0"
ItemsSource="{Binding SurgicalResidualList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
SelectedItem="{Binding surgicalResidual}"
materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
materialDesign:ListViewAssist.ListViewItemPadding="0 15 0 0">
<ListView.Resources>
<Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
<Setter Property="Foreground" Value="White" />
</Style>
</ListView.Resources>
<i:Interaction.Triggers>
<i:EventTrigger EventName="SelectionChanged">
<i:InvokeCommandAction Command="{Binding RowSelected}" />
</i:EventTrigger>
</i:Interaction.Triggers>
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Header="选择" Width="30">
<GridViewColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding ItemIsChecked}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="80"
Header="姓名"
DisplayMemberBinding="{Binding PName}" />
<GridViewColumn Width="30"
DisplayMemberBinding="{Binding Sex}"
Header="性别"/>
<GridViewColumn Width="150"
DisplayMemberBinding="{Binding OrderNo}"
Header="单号"/>
<!--<GridViewColumn Width="240"
DisplayMemberBinding="{Binding DeptName}"
Header="科室"/>-->
<GridViewColumn Width="180"
DisplayMemberBinding="{Binding DrugInfo.DrugName}"
Header="药品名称"/>
<GridViewColumn Width="130"
DisplayMemberBinding="{Binding ManuNo}"
Header="药品批次"/>
<GridViewColumn Width="30"
DisplayMemberBinding="{Binding Quantity}"
Header="数量"/>
<GridViewColumn Width="80"
DisplayMemberBinding="{Binding UseDoseInfo}"
Header="使用量"/>
<GridViewColumn Width="80"
DisplayMemberBinding="{Binding ResidualDoseInfo}"
Header="剩余量"/>
<GridViewColumn Width="160"
DisplayMemberBinding="{Binding DisposalTime}"
Header="余液处置时间"/>
</GridView>
</ListView.View>
</ListView>
<ListView Grid.Column="1" Grid.Row="1" Margin="0 0 3 0"
ItemsSource="{Binding TotalDrugList,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
materialDesign:ListViewAssist.ListViewItemPadding="0 18 0 0">
<ListView.Resources>
<Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
<Setter Property="Foreground" Value="White" />
</Style>
</ListView.Resources>
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Width="180"
DisplayMemberBinding="{Binding DrugName}"
Header="药品名称"/>
<GridViewColumn Width="40"
DisplayMemberBinding="{Binding TotalCount}"
Header="合计"/>
</GridView>
</ListView.View>
</ListView>
<pagination:Pagination Grid.Row="2" Grid.ColumnSpan="2"
CurrentPage="{Binding PageNum}"
PageSize="{Binding PageSize}"
TotalPages="{Binding TotalCount}"
InfoTextIsEnabel="True"
/>
</Grid>
</Grid>
</UserControl>

28
DM_Weight/Views/CheckOrderNewWindowNew.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace DM_Weight.Views
{
/// <summary>
/// CheckOrderNewWindow.xaml 的交互逻辑
/// </summary>
public partial class CheckOrderNewWindowNew : UserControl
{
public CheckOrderNewWindowNew()
{
InitializeComponent();
}
}
}

232
DM_Weight/Views/CheckSelfOrderWindowNew.xaml Normal file
View File

@ -0,0 +1,232 @@
<UserControl x:Class="DM_Weight.Views.CheckSelfOrderWindowNew"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
xmlns:local="clr-namespace:DM_Weight.Views"
mc:Ignorable="d"
xmlns:convert="clr-namespace:DM_Weight.Converter"
xmlns:prism="http://prismlibrary.com/">
<UserControl.Resources>
<convert:OrderStatusConverter x:Key="OrderStatusConverter" />
<convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
<convert:BoxNumConverter x:Key="BoxNumConverter" />
<convert:StatusConverter x:Key="StatusConverter" />
<Style x:Key="st" TargetType="GridViewColumnHeader">
<Style.Setters>
<Setter Property="Height">
<Setter.Value>55</Setter.Value>
</Setter>
<Setter Property="Background">
<Setter.Value>#31ccec</Setter.Value>
</Setter>
<Setter Property="Foreground">
<Setter.Value>white</Setter.Value>
</Setter>
</Style.Setters>
</Style>
</UserControl.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid Margin="6" Grid.Column="0">
<Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignPaperLightButton}">
<Setter Property="Foreground" Value="#00a0ea" />
<Setter Property="BorderBrush" Value="#00a0ea" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#d1e7f5" />
<Setter Property="BorderBrush" Value="#d1e7f5" />
</Trigger>
<DataTrigger Value="True">
<DataTrigger.Binding>
<MultiBinding Converter="{StaticResource DrawerSelectConverter}">
<Binding RelativeSource="{ RelativeSource Mode=Self }" Path="Content" />
<Binding Path="DrawerNo" />
<Binding Path="CurrentDrawerNo"/>
</MultiBinding>
</DataTrigger.Binding>
<Setter Property="Background" Value="#d1e7f5" />
<Setter Property="BorderBrush" Value="#d1e7f5" />
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Resources>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<!--<RowDefinition />-->
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button Margin="0 0 3 0" Grid.Row="0" Grid.Column="0" Width="120" Content="一号手术间" Background="{Binding Button1Color}" Command="{Binding UpdateDrawerNo,ConverterParameter=1}" CommandParameter="1" IsEnabled="{Binding Button1Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="1" Grid.Column="0" Width="120" Content="二号手术间" Background="{Binding Button2Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="2" IsEnabled="{Binding Button2Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="2" Grid.Column="0" Width="120" Content="三号手术间" Background="{Binding Button3Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="3" IsEnabled="{Binding Button3Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="3" Grid.Column="0" Width="120" Content="四号手术间" Background="{Binding Button4Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="4" IsEnabled="{Binding Button4Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="4" Grid.Column="0" Width="120" Content="五号手术间" Background="{Binding Button5Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="5" IsEnabled="{Binding Button5Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="5" Grid.Column="0" Width="120" Content="六号手术间" Background="{Binding Button6Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="6" IsEnabled="{Binding Button6Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="6" Grid.Column="0" Width="120" Content="七号手术间" Background="{Binding Button7Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="7" IsEnabled="{Binding Button7Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="7" Grid.Column="0" Width="120" Content="八号手术间" Background="{Binding Button8Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="8" IsEnabled="{Binding Button8Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="8" Grid.Column="0" Width="120" Content="九号手术间" Background="{Binding Button9Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="9" IsEnabled="{Binding Button9Enable}"/>
<Button Margin="0 0 3 0" Grid.Row="0" Grid.Column="1" Width="120" Content="十号手术间" Background="{Binding Button10Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="10" IsEnabled="{Binding Button10Enable}"/>
<Button Grid.Row="1" Grid.Column="1" Width="120" Content="十一号手术间" Background="{Binding Button11Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="11" IsEnabled="{Binding Button11Enable}"/>
<Button Grid.Row="2" Grid.Column="1" Width="120" Content="十二号手术间" Background="{Binding Button12Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="12" IsEnabled="{Binding Button12Enable}"/>
<Button Grid.Row="3" Grid.Column="1" Width="120" Content="十三号手术间" Background="{Binding Button13Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="13" IsEnabled="{Binding Button13Enable}"/>
<Button Grid.Row="4" Grid.Column="1" Width="120" Content="十四号手术间" Background="{Binding Button14Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="14" IsEnabled="{Binding Button14Enable}"/>
<Button Grid.Row="5" Grid.Column="1" Width="120" Content="十五号手术间" Background="{Binding Button15Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="15" IsEnabled="{Binding Button15Enable}"/>
<Button Grid.Row="6" Grid.Column="1" Width="120" Content="十六号手术间" Background="{Binding Button16Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="16" IsEnabled="{Binding Button16Enable}"/>
<Button Grid.Row="7" Grid.Column="1" Width="120" Content="十七号手术间" Background="{Binding Button17Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="17" IsEnabled="{Binding Button17Enable}"/>
<Button Grid.Row="8" Grid.Column="1" Width="120" Content="十八号手术间" Background="{Binding Button18Color}" Command="{Binding UpdateDrawerNo}" CommandParameter="18" IsEnabled="{Binding Button18Enable}"/>
<!--<Button Grid.Row="8" Grid.Column="1" Width="120" Content="19号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="19" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=19}"/>
<Button Grid.Row="9" Grid.Column="1" Width="120" Content="20号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="20" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=20}"/>-->
</Grid>
<Grid Grid.Column="1" Margin="6">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Margin="0 6 0 6" Grid.Row="0" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*" />
<ColumnDefinition Width="3*" />
<ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions>
<DatePicker
Grid.Column="0"
SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
SelectedDateFormat="Short"
Margin="6 0 0 0"
materialDesign:HintAssist.Hint="开单日期"
Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
<StackPanel Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button
Margin="0 0 6 0"
VerticalAlignment="Center" Command="{Binding CheckOrder}"
Content="确认"
Style="{StaticResource MaterialDesignOutlinedLightButton}">
</Button>
<Button
Margin="2"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
Content="取消"
Command="{Binding CancleTake}" Cursor="Hand" />
<Button
Margin="0 0 6 0"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
ToolTip="刷新" Command="{Binding Query}">
<materialDesign:PackIcon Kind="Refresh" />
</Button>
</StackPanel>
</Grid>
<!--<Grid Grid.Row="1" Grid.Column="0" Margin="0 0 -100 0">-->
<ListView Grid.Row="1" Grid.Column="0" Margin="0"
ItemsSource="{Binding SurgicalResidualList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
SelectedItem="{Binding surgicalResidual}"
materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
materialDesign:ListViewAssist.ListViewItemPadding="0 15 0 0">
<ListView.Resources>
<Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
<Setter Property="Foreground" Value="White" />
</Style>
</ListView.Resources>
<i:Interaction.Triggers>
<i:EventTrigger EventName="SelectionChanged">
<i:InvokeCommandAction Command="{Binding RowSelected}" />
</i:EventTrigger>
</i:Interaction.Triggers>
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Header="选择" Width="30">
<GridViewColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding ItemIsChecked}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="80"
Header="姓名"
DisplayMemberBinding="{Binding PName}" />
<GridViewColumn Width="30"
DisplayMemberBinding="{Binding Sex}"
Header="性别"/>
<GridViewColumn Width="150"
DisplayMemberBinding="{Binding OrderNo}"
Header="单号"/>
<GridViewColumn Width="180"
DisplayMemberBinding="{Binding DrugInfo.DrugName}"
Header="药品名称"/>
<GridViewColumn Width="130"
DisplayMemberBinding="{Binding ManuNo}"
Header="药品批次"/>
<GridViewColumn Width="30"
DisplayMemberBinding="{Binding Quantity}"
Header="数量"/>
<GridViewColumn Width="80"
DisplayMemberBinding="{Binding UseDoseInfo}"
Header="使用量"/>
<GridViewColumn Width="80"
DisplayMemberBinding="{Binding ResidualDoseInfo}"
Header="剩余量"/>
<GridViewColumn Width="160"
DisplayMemberBinding="{Binding DisposalTime}"
Header="余液处置时间"/>
</GridView>
</ListView.View>
</ListView>
<ListView Grid.Column="1" Grid.Row="1" Margin="0 0 3 0"
ItemsSource="{Binding TotalDrugList,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"
materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
materialDesign:ListViewAssist.ListViewItemPadding="0 16 0 15">
<ListView.Resources>
<Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
<Setter Property="Foreground" Value="White" />
</Style>
</ListView.Resources>
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Width="180"
DisplayMemberBinding="{Binding DrugName}"
Header="药品名称"/>
<GridViewColumn Width="40"
DisplayMemberBinding="{Binding TotalCount}"
Header="合计"/>
</GridView>
</ListView.View>
</ListView>
<!--</Grid>-->
<pagination:Pagination Grid.Row="2" Grid.ColumnSpan="2"
CurrentPage="{Binding PageNum}"
PageSize="{Binding PageSize}"
TotalPages="{Binding TotalCount}"
InfoTextIsEnabel="True"
/>
</Grid>
</Grid>
</UserControl>

28
DM_Weight/Views/CheckSelfOrderWindowNew.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace DM_Weight.Views
{
/// <summary>
/// CheckSelfOrderWindow.xaml 的交互逻辑
/// </summary>
public partial class CheckSelfOrderWindowNew : UserControl
{
public CheckSelfOrderWindowNew()
{
InitializeComponent();
}
}
}