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

1.修改处方报表中病历号字段由patient_no改为patient_id. 

2.配置文件添加是否自动写标签数量AutoWriteNum，根据该字段标识开机后是否重写标签数量
This commit is contained in:
maqiao 2024-10-31 10:02:28 +08:00
parent 102905d800
commit cc88fca01d
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -61,6 +61,8 @@
<add key="fingerIp" value="192.168.50.201"/> <add key="fingerIp" value="192.168.50.201"/>
<!--一个抽屉对应标签数--> <!--一个抽屉对应标签数-->
<add key="labelCount" value="2"/> <add key="labelCount" value="2"/>
<!--是否自动写标签数量-->
<add key="AutoWriteNum" value="true"/>
</appSettings> </appSettings>
</configuration> </configuration>

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -301,7 +301,7 @@ namespace DM_Weight.Report
}); });
Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf"); Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf");
SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.patient_id,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName
,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson ,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson
from order_info oi inner join order_detail od on oi.order_no=od.Order_No from order_info oi inner join order_detail od on oi.order_no=od.Order_No
LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id

2
DM_Weight/ReportTemp/account_book_order.grf
View File

@ -43,7 +43,7 @@
{ {
"Name":"病历号", "Name":"病历号",
"Type":"Integer", "Type":"Integer",
"DBFieldName":"patient_no" "DBFieldName":"patient_id"
}, },
{ {
"Name":"疾病名称", "Name":"疾病名称",

16
DM_Weight/ViewModels/MainWindowViewModel.cs
View File

@ -88,8 +88,11 @@ namespace DM_Weight.ViewModels
_regionManager.RequestNavigate("MainRegion", "BeforeLogin"); _regionManager.RequestNavigate("MainRegion", "BeforeLogin");
})); }));
string bAutoWriteNum = ConfigurationManager.AppSettings["AutoWriteNum"] ?? "false";
Task.Factory.StartNew(() => BindStock()); if (bAutoWriteNum == "true")
{
Task.Factory.StartNew(() => BindStock());
}
} }
void doMyPrismEvent2(AlertMsg msg) void doMyPrismEvent2(AlertMsg msg)
@ -111,11 +114,12 @@ namespace DM_Weight.ViewModels
//写标签数量 //写标签数量
async Task BindStock() async Task BindStock()
{ {
List<ChannelStock> singleChannels = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.BoardType == 5&&cs.Quantity>0) List<ChannelStock> singleChannels = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.BoardType == 5 && cs.Quantity > 0)
.Where(cs => cs.DrugId !=null) .Where(cs => cs.DrugId != null)
.Where(cs=>cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList(); .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList();
singleChannels = singleChannels.GroupBy(cs => new { cs.DrawerNo, cs.ColNo }) singleChannels = singleChannels.GroupBy(cs => new { cs.DrawerNo, cs.ColNo })
.Select(cs => { .Select(cs =>
{
var ret = cs.First(); var ret = cs.First();
ret.Quantity = cs.Sum(xt => xt.Quantity); ret.Quantity = cs.Sum(xt => xt.Quantity);
return ret; return ret;