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

去掉账册中药品类型查询

This commit is contained in:
maqiao 2024-07-18 14:38:38 +08:00
parent ae95b8c268
commit 5babb44a9a
2 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
DM_Weight/ViewModels/AccountWindowViewModel.cs
View File

@ -180,32 +180,32 @@ namespace DM_Weight.ViewModels
RequestData(); RequestData();
} }
} }
/// <summary> ///// <summary>
/// 药品类型 ///// 药品类型
/// </summary> ///// </summary>
private List<DrugType> _drugTypeList = new List<DrugType>() //private List<DrugType> _drugTypeList = new List<DrugType>()
{ //{
new DrugType{ TypeValue=1,TypeName="精一"}, // new DrugType{ TypeValue=1,TypeName="精一"},
new DrugType{TypeValue=2,TypeName="精二"} // new DrugType{TypeValue=2,TypeName="精二"}
}; //};
public List<DrugType>? DrugTypeList //public List<DrugType>? DrugTypeList
{ //{
get => _drugTypeList; // get => _drugTypeList;
set // set
{ // {
SetProperty(ref _drugTypeList, value); // SetProperty(ref _drugTypeList, value);
} // }
} //}
private DrugType? _drugType; //private DrugType? _drugType;
public DrugType? _DrugType //public DrugType? _DrugType
{ //{
get => _drugType; set // get => _drugType; set
{ // {
SetProperty(ref _drugType, value); // SetProperty(ref _drugType, value);
RequestData(); // RequestData();
} // }
} //}
//MachineRecordService _machineRecordService; //MachineRecordService _machineRecordService;
@ -221,7 +221,7 @@ namespace DM_Weight.ViewModels
void RequestData() void RequestData()
{ {
int totalCount = 0; int totalCount = 0;
AccountList = ReportAccountBook(StartDate, EndDate, AccountType == null ? 0 : AccountType.AccountTypeValue, _DrugType == null ? 0 : _DrugType.TypeValue, DrugInfo == null ? "" : DrugInfo.DrugId.ToString() ?? ""); AccountList = ReportAccountBook(StartDate, EndDate, AccountType == null ? 0 : AccountType.AccountTypeValue, DrugInfo == null ? "" : DrugInfo.DrugId.ToString() ?? "");
//for (int i = 0; i < accountList.Count; i++) //for (int i = 0; i < accountList.Count; i++)
//{ //{
// if (accountList[i].DrugInfo is null) // if (accountList[i].DrugInfo is null)
@ -321,7 +321,7 @@ namespace DM_Weight.ViewModels
{ {
} }
private List<AccountBookG2> ReportAccountBook(DateTime? startDate, DateTime? endDate, int type, int drugType, string drug_id = "") private List<AccountBookG2> ReportAccountBook(DateTime? startDate, DateTime? endDate, int type, string drug_id = "")
{ {
DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1"); DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1); DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
@ -355,10 +355,6 @@ namespace DM_Weight.ViewModels
SQL += " AND type=4 "; SQL += " AND type=4 ";
} }
} }
if (drugType > 0)
{
SQL += $" AND di.Drug_type={drugType}";
}
SQL += " ORDER BY ac.create_date desc,ac.drug_id"; SQL += " ORDER BY ac.create_date desc,ac.drug_id";

10
DM_Weight/Views/AccountWindow.xaml
View File

@ -63,21 +63,13 @@
SelectedItem="{Binding DrugInfo}" SelectedItem="{Binding DrugInfo}"
DisplayMemberPath="DrugName" DisplayMemberPath="DrugName"
/>--> />-->
<!--<ComboBox <ComboBox
Margin="6 0 6 0" Margin="6 0 6 0"
Grid.Column="2" Grid.Column="2"
materialDesign:HintAssist.Hint="药品名称/拼音码/药品编码" materialDesign:HintAssist.Hint="药品名称/拼音码/药品编码"
ItemsSource="{Binding DrugInfos}" ItemsSource="{Binding DrugInfos}"
SelectedItem="{Binding DrugInfo}" SelectedItem="{Binding DrugInfo}"
DisplayMemberPath="DrugName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp" DisplayMemberPath="DrugName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
/>-->
<ComboBox
Margin="6 0 6 0"
Grid.Column="2"
materialDesign:HintAssist.Hint="药品类型"
ItemsSource="{Binding DrugTypeList}"
SelectedItem="{Binding _DrugType}"
DisplayMemberPath="TypeName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
/> />
<ComboBox <ComboBox
Margin="12 0 0 0" Margin="12 0 0 0"