修改手术室报表日期字段取
This commit is contained in:
parent
8eb345484c
commit
1f384fffd0
|
|
@ -399,8 +399,8 @@ namespace DM_Weight.Report
|
||||||
DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
|
DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
|
||||||
string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
|
string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
|
||||||
string SQL = $@" select ab.drug_id, ab.type,
|
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 oldYearMD,
|
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 oldYearMD,
|
||||||
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,
|
DATE_FORMAT(ab.create_time,'%Y/%m/%d %H:%i:%s') 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.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,
|
,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,
|
IF(ab.type=1,UL.User_name,UL2.User_name) AS InCheckUser,
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"批次",
|
"Name":"批次",
|
||||||
"Width":2.19604
|
"Width":1.98438
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"有效期",
|
"Name":"有效期",
|
||||||
|
|
@ -216,7 +216,8 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"Column8",
|
"Name":"Column8",
|
||||||
"Width":1.79917
|
"Width":1.79917,
|
||||||
|
"Visible":false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ColumnContent":{
|
"ColumnContent":{
|
||||||
|
|
@ -224,8 +225,9 @@
|
||||||
"ColumnContentCell":[
|
"ColumnContentCell":[
|
||||||
{
|
{
|
||||||
"Column":"日期",
|
"Column":"日期",
|
||||||
"EndEllipsis":true,
|
"WordWrap":true,
|
||||||
"TextAlign":"MiddleCenter",
|
"TextAlign":"MiddleCenter",
|
||||||
|
"ShrinkFontToFit":true,
|
||||||
"DataField":"日期"
|
"DataField":"日期"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue