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

修改报表

This commit is contained in:
马巧 2025-07-24 10:35:53 +08:00
parent 9915812808
commit f7391b5506
5 changed files with 457 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -3,7 +3,7 @@
<connectionStrings>
<!-- 数据库连接字符串 -->
<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
<add name="database" connectionString="server=192.168.50.84;port=3306;database=xiangtanTest;userid=root;password=root" />
<add name="database" connectionString="server=127.0.0.1;port=3306;database=xtTest;userid=root;password=qq1223" />
</connectionStrings>
<!--<runtime>
--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--

4
DM_Weight/Report/GridReportUtil.cs
View File

@ -384,8 +384,8 @@ namespace DM_Weight.Report
SQL = $@"
SELECT re.create_time as OptDate, di.drug_name as DrugName,di.Drug_spec as DrugSpec,dt.Set_manu_no as ManuNo,re.patient_name as PName,
CONCAT(use_dose,dose_unit) as UDose,CONCAT(residual_dose,dose_unit) as ReDose,if(residual_dose>0,'是','否') as Disposal,
re.anaesthetist_name as AName,re.operator_name as OName,re.supervisor_name as CName,of.operator as EmpRecive,'彭蕾' as EmpMedicRecive,re.disposal_time as DisposalTime,of.win_no as WinNo
from surgical_residual re inner join drug_info di on re.drug_id=di.drug_id left join hkc_order_finish of on re.order_no=of.order_no and of.state=2 left join order_detail_sm dt on re.order_no=dt.order_no
re.anaesthetist_name as AName,re.operator_name as OName,re.supervisor_name as CName,of.operator as EmpRecive,'彭蕾' as EmpMedicRecive,re.disposal_time as DisposalTime,SUBSTRING_INDEX(of.win_no, '号', 1) as WinNo,re.card_no as cardNo
from surgical_residual re inner join drug_info di on re.drug_id=di.drug_id inner join hkc_order_finish of on re.order_no=of.order_no and of.state=2 left join order_detail_sm dt on re.order_no=dt.order_no
where re.create_time > '{startDate}' and re.create_time< '{endDate}'";

632
DM_Weight/ReportTemp/account_book_new.grf
View File

@ -7,9 +7,10 @@
"Charset":134
},
"Printer":{
"LeftMargin":0.3175,
"TopMargin":1,
"RightMargin":0.3969
"Oriention":"Landscape",
"TopMargin":0.3175,
"RightMargin":1,
"BottomMargin":0.3969
},
"DetailGrid":{
"CenterView":true,
@ -18,58 +19,25 @@
"Field":[
{
"Name":"药品名称",
"DBFieldName":"drug_name"
"DBFieldName":"DrugName"
},
{
"Name":"年月日",
"Name":"日期",
"DBFieldName":"YearMD"
},
{
"Name":"批号",
"DBFieldName":"manu_no"
"DBFieldName":"ManuNo"
},
{
"Name":"效期",
"Type":"DateTime",
"Format":"yyyy/MM/dd",
"DBFieldName":"effDate"
},
{
"Name":"期初数",
"DBFieldName":"BeforeQuantity"
},
{
"Name":"领取数",
"Name":"领入",
"DBFieldName":"InQuantity"
},
{
"Name":"总数",
"DBFieldName":"TotalQuantity"
},
{
"Name":"各专柜",
"DBFieldName":"TotalQuanttiy"
},
{
"Name":"数量",
"DBFieldName":"Quantity"
},
{
"Name":"领取药房",
"DBFieldName":"InStorage"
},
{
"Name":"药房发药人",
"DBFieldName":"StorageUser"
},
{
"Name":"手术室领药人",
"DBFieldName":"OperationIn"
},
{
"Name":"手术室核对人",
"DBFieldName":"OperationCheck"
},
{
"Name":"规格",
"DBFieldName":"DrugSpec"
@ -85,55 +53,178 @@
{
"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":"年月日"
"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":"有效期"
"Name":"空瓶回收人",
"Width":1.5875
},
{
"Name":"期初数"
"Name":"Column7",
"Width":1.61396
},
{
"Name":"领取数"
"Name":"实物",
"Width":1.40229
},
{
"Name":"总数"
"Name":"空瓶",
"Width":1.19063
},
{
"Name":"各专柜"
"Name":"发药人",
"Width":1.79917
},
{
"Name":"数量"
"Name":"Column2",
"Width":1.79917
},
{
"Name":"领取药房"
},
{
"Name":"药房发药人"
},
{
"Name":"手术室领药人"
},
{
"Name":"手术室核对人"
"Name":"Column8",
"Width":1.79917
}
],
"ColumnContent":{
"Height":2.01083,
"ColumnContentCell":[
{
"Column":"年月日",
"Column":"日期",
"TextAlign":"MiddleCenter",
"DataField":"年月日"
"DataField":"日期"
},
{
"Column":"批次",
@ -146,59 +237,93 @@
"DataField":"效期"
},
{
"Column":"期初数",
"Column":"领入",
"TextAlign":"MiddleCenter",
"DataField":"期初数"
"DataField":"领入"
},
{
"Column":"领取数",
"Column":"手术间",
"TextAlign":"MiddleCenter",
"DataField":"领取数"
"DataField":"手术间"
},
{
"Column":"总数",
"Column":"患者姓名",
"TextAlign":"MiddleCenter",
"DataField":"总数"
"DataField":"患者姓名"
},
{
"Column":"各专柜",
"Column":"性别",
"TextAlign":"MiddleCenter",
"DataField":"各专柜"
"DataField":"性别"
},
{
"Column":"数量",
"TextAlign":"MiddleCenter",
"DataField":"数量"
"Column":"年龄",
"DataField":"年龄"
},
{
"Column":"领取药房",
"TextAlign":"MiddleCenter",
"DataField":"领取药房"
"Column":"住院号",
"DataField":"住院号"
},
{
"Column":"药房发药人",
"TextAlign":"MiddleCenter",
"DataField":"药房发药人"
"Column":"科室",
"DataField":"科室"
},
{
"Column":"手术室领药人",
"TextAlign":"MiddleCenter",
"DataField":"手术室领药人"
"Column":"使用剂量",
"DataField":"使用剂量"
},
{
"Column":"手术室核对人",
"TextAlign":"MiddleCenter",
"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":1.40229,
"RepeatStyle":"OnGroupHeaderPage",
"Height":2.59292,
"RepeatStyle":"OnPage",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"年月日",
"Column":"日期",
"Font":{
"Name":"宋体",
"Size":120000,
@ -206,7 +331,7 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"年月日"
"Text":"日期"
},
{
"GroupTitle":false,
@ -234,7 +359,7 @@
},
{
"GroupTitle":false,
"Column":"期初数",
"Column":"领入",
"Font":{
"Name":"宋体",
"Size":120000,
@ -242,19 +367,7 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"期初数"
},
{
"GroupTitle":false,
"Column":"领取数",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"领取数"
"Text":"领\r\n入"
},
{
"GroupTitle":true,
@ -262,7 +375,7 @@
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"总数",
"Column":"手术间",
"Font":{
"Name":"宋体",
"Size":120000,
@ -270,11 +383,11 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"总数"
"Text":"手\r\n术\r\n间"
},
{
"GroupTitle":false,
"Column":"各专柜",
"Column":"患者姓名",
"Font":{
"Name":"宋体",
"Size":120000,
@ -282,11 +395,11 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"各专柜"
"Text":"患者\r\n姓名"
},
{
"GroupTitle":false,
"Column":"数量",
"Column":"性别",
"Font":{
"Name":"宋体",
"Size":120000,
@ -294,7 +407,103 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"数量"
"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":{
@ -304,11 +513,37 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"结存"
"Text":"使用"
},
{
"GroupTitle":false,
"Column":"领取药房",
"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,
@ -316,11 +551,37 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"领取药房"
"Text":"空瓶回收"
},
{
"GroupTitle":false,
"Column":"药房发药人",
"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,
@ -328,11 +589,11 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"药房\r\n发药人"
"Text":"结存数"
},
{
"GroupTitle":false,
"Column":"手术室领药人",
"Column":"发药人",
"Font":{
"Name":"宋体",
"Size":120000,
@ -340,11 +601,25 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"手术室\r\n领药人"
"Text":"发药人"
},
{
"GroupTitle":false,
"Column":"手术室核对人",
"GroupTitle":true,
"Name":"Column5",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"Column2",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"复核人"
}
],
"Font":{
"Name":"宋体",
"Size":120000,
@ -352,7 +627,19 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"手术室\r\n核对人"
"Text":"领药人"
},
{
"GroupTitle":false,
"Column":"Column8",
"Font":{
"Name":"宋体",
"Size":120000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"批次库存"
}
]
}
@ -381,15 +668,12 @@
"ReportHeader":[
{
"Name":"ReportHeader1",
"Height":3.41313,
"Height":1.5875,
"Control":[
{
"Type":"MemoBox",
"Name":"MemoBox2",
"Left":0.396875,
"Top":0.211667,
"Width":19.6056,
"Height":1.19063,
"Dock":"Fill",
"Font":{
"Name":"宋体",
"Size":217500,
@ -397,97 +681,29 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"手术麻醉科[#药品名称#]专用账册"
},
"Text":"湘谭县人民医院麻醉药品、精神药品专用账册、使用登记册（手术室）"
}
],
"RepeatOnPage":true
},
{
"Name":"ReportHeader2",
"Height":1.00542,
"Control":[
{
"Type":"StaticBox",
"Name":"StaticBox21",
"Left":5.3975,
"Top":1.905,
"Width":1.11125,
"Height":0.978958,
"Type":"MemoBox",
"Name":"MemoBox3",
"Dock":"Fill",
"Border":{
"Styles":"[DrawLeft|DrawTop|DrawRight]"
},
"Font":{
"Name":"宋体",
"Size":105000,
"Size":120000,
"Bold":true,
"Charset":134
},
"Text":"规格："
},
{
"Type":"FieldBox",
"Name":"FieldBox12",
"Left":6.48229,
"Top":1.905,
"Width":1.74625,
"Height":0.978958,
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"DataField":"规格"
},
{
"Type":"StaticBox",
"Name":"StaticBox22",
"Left":9.12813,
"Top":1.905,
"Width":1.21708,
"Height":0.978958,
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"Text":"单位："
},
{
"Type":"FieldBox",
"Name":"FieldBox13",
"Left":10.3188,
"Top":1.905,
"Width":1.42875,
"Height":0.978958,
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"DataField":"大单位"
},
{
"Type":"StaticBox",
"Name":"StaticBox23",
"Left":12.1179,
"Top":1.905,
"Width":1.32292,
"Height":0.978958,
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"Text":"基数："
},
{
"Type":"FieldBox",
"Name":"FieldBox14",
"Left":13.626,
"Top":1.905,
"Width":1.29646,
"Height":0.978958,
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"DataField":"基数"
"Text":"药品名称：[#药品名称#] 规格：[#规格#] 单位：[#大单位#] 基数：[#基数#]"
}
],
"RepeatOnPage":true

29
DM_Weight/ReportTemp/account_use_temp.grf
View File

@ -87,6 +87,10 @@
{
"Name":"余液处置时间",
"DBFieldName":"DisposalTime"
},
{
"Name":"住院号",
"DBFieldName":"cardNo"
}
]
},
@ -109,7 +113,7 @@
},
{
"Name":"手术间",
"Width":1.77271
"Width":1.00542
},
{
"Name":"病人姓名",
@ -154,6 +158,10 @@
{
"Name":"空安瓿药房接收者",
"Width":1.61396
},
{
"Name":"Column1",
"Width":2.35479
}
],
"ColumnContent":{
@ -239,6 +247,11 @@
"Column":"空安瓿药房接收者",
"TextAlign":"MiddleCenter",
"DataField":"空安瓿药房接收者"
},
{
"Column":"Column1",
"TextAlign":"MiddleCenter",
"DataField":"住院号"
}
]
},
@ -304,7 +317,7 @@
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"手术间"
"Text":"手\r\n术\r\n间"
},
{
"GroupTitle":false,
@ -437,6 +450,18 @@
},
"TextAlign":"MiddleCenter",
"Text":"空安瓿\r\n药房\r\n接收者"
},
{
"GroupTitle":false,
"Column":"Column1",
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"住院号"
}
]
}

6
DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
View File

@ -484,14 +484,14 @@ namespace DM_Weight.ViewModels
MachineId = jiaoStock.MachineId,
DrawerNo = jiaoStock.DrawerNo,
DrugId = jiaoStock.DrugId,
ManuNo = csStockList[i].ManuNo,
ManuNo = csStockList[j].ManuNo,
Operator = HomeWindowViewModel.Operator?.Id,
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = csStockList[i].TakeQuantity,
Quantity = csStockList[j].TakeQuantity,
Type = 55,
Status = 2,//给交接柜补药不用还空瓶，等真正用了以后再还空瓶，所以先把状态置为2
InvoiceId = $"毒麻柜{csStockList[i].Location}给交接柜{jiaoStock.DrawerNo}补药"
InvoiceId = $"毒麻柜{csStockList[j].Location}给交接柜{jiaoStock.DrawerNo}补药"
}).ExecuteCommand();
ChannelStock csStock = (ChannelStock)csStockList[j].Clone();