AIMSBS/AIMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日常维护

Browse Source
This commit is contained in:
leomon 2023-07-21 16:07:26 +08:00
parent 2abc90c7d6
commit a695c33b24
11 changed files with 141 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AIMS/AIMS.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<AtuoUpdate> <AtuoUpdate>
<ConnectionString>Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020;</ConnectionString> <ConnectionString>Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020;</ConnectionString>
<DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString> <DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString>
<HisConnectionStringOracel>Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;</HisConnectionStringOracel> <HisConnectionStringOracel>Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;</HisConnectionStringOracel>
<LastLoginNo></LastLoginNo> <LastLoginNo></LastLoginNo>

21
AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs
View File

@ -1103,7 +1103,7 @@ namespace AIMS.OperationAanesthesia
LoadAnesRescue(); LoadAnesRescue();
} }
private System.Windows.Forms.Timer timerLoadAnesRescue; //private System.Windows.Forms.Timer timerLoadAnesRescue;
public void LoadAnesRescue() public void LoadAnesRescue()
{ {
@ -1114,18 +1114,19 @@ namespace AIMS.OperationAanesthesia
circularProgress2.Visible = true; circularProgress2.Visible = true;
zgcAnaesRecord.Visible = false; zgcAnaesRecord.Visible = false;
zgcAnaesRecord2.Visible = false; zgcAnaesRecord2.Visible = false;
timerLoadAnesRescue = new System.Windows.Forms.Timer(components);
timerLoadAnesRescue.Enabled = true;//调试时设置为FALSE ，
timerLoadAnesRescue.Interval = 200;
timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick;
timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick;
timerLoadAnesRescue.Start();
//TimerLoadAnesRescue_Tick(null, null); TimerLoadAnesRescue_Tick(null, null);
//timerLoadAnesRescue = new System.Windows.Forms.Timer(components);
//timerLoadAnesRescue.Enabled = true;//调试时设置为FALSE ，
//timerLoadAnesRescue.Interval = 200;
//timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick;
//timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick;
//timerLoadAnesRescue.Start();
} }
private void TimerLoadAnesRescue_Tick(object sender, EventArgs e) private void TimerLoadAnesRescue_Tick(object sender, EventArgs e)
{ {
timerLoadAnesRescue.Dispose(); //timerLoadAnesRescue.Dispose();
try try
{ {
if (PatientId > 0 && State == AIMSExtension.EditState.ADD) if (PatientId > 0 && State == AIMSExtension.EditState.ADD)

7
AIMS/OperationAanesthesia/frmFactEventsNew.cs
View File

@ -42,6 +42,7 @@ namespace AIMS.PublicUI.UI
/// 修改事件 /// 修改事件
/// </summary> /// </summary>
public event EventParamHandler EventParam; public event EventParamHandler EventParam;
public bool IsDeleteConcet = false;
public frmFactEventsNew() public frmFactEventsNew()
{ {
@ -390,7 +391,7 @@ namespace AIMS.PublicUI.UI
er.clearAddObj(zgcAnaesRecord); er.clearAddObj(zgcAnaesRecord);
BFactEvents.Delete(er); BFactEvents.Delete(er);
DelEventTime(er); DelEventTime(er);
EventParam(); IsDeleteConcet = true;
_record.FactEventsList.Remove(er); _record.FactEventsList.Remove(er);
dgvEvents.Rows.Remove(dgvEvents.CurrentRow); dgvEvents.Rows.Remove(dgvEvents.CurrentRow);
} }
@ -825,6 +826,10 @@ namespace AIMS.PublicUI.UI
//} //}
//this.Hide(); //this.Hide();
//e.Cancel = true; //e.Cancel = true;
if (IsDeleteConcet == true)
{
EventParam();
}
} }
public bool equelEvents(FactEvents oldDrug, FactEvents newDrug) public bool equelEvents(FactEvents oldDrug, FactEvents newDrug)

4
AIMS/OperationAanesthesia/frmInstrumentRecord.Designer.cs generated
View File

@ -1527,7 +1527,7 @@
this.txtTourNurse2.Name = "txtTourNurse2"; this.txtTourNurse2.Name = "txtTourNurse2";
this.txtTourNurse2.Size = new System.Drawing.Size(120, 22); this.txtTourNurse2.Size = new System.Drawing.Size(120, 22);
this.txtTourNurse2.TabIndex = 847; this.txtTourNurse2.TabIndex = 847;
this.txtTourNurse2.DoubleClick += new System.EventHandler(this.txtTourNurse_Click); this.txtTourNurse2.DoubleClick += new System.EventHandler(this.txtTourNurse2_Click);
// //
// txtOperationDoctor2 // txtOperationDoctor2
// //
@ -1579,7 +1579,7 @@
this.txtInstrumentNurse2.Name = "txtInstrumentNurse2"; this.txtInstrumentNurse2.Name = "txtInstrumentNurse2";
this.txtInstrumentNurse2.Size = new System.Drawing.Size(120, 22); this.txtInstrumentNurse2.Size = new System.Drawing.Size(120, 22);
this.txtInstrumentNurse2.TabIndex = 848; this.txtInstrumentNurse2.TabIndex = 848;
this.txtInstrumentNurse2.DoubleClick += new System.EventHandler(this.txtInstrumentNurse_Click); this.txtInstrumentNurse2.DoubleClick += new System.EventHandler(this.txtInstrumentNurse2_Click);
// //
// panelQXList2 // panelQXList2
// //

92
AIMS/OperationAanesthesia/frmInstrumentRecord.cs
View File

@ -3,10 +3,8 @@ using AIMS.OperationFront.UI;
using AIMS.OremrUserControl; using AIMS.OremrUserControl;
using AIMS.PublicUI.UI; using AIMS.PublicUI.UI;
using AIMSBLL; using AIMSBLL;
using AIMSDAL;
using AIMSExtension; using AIMSExtension;
using AIMSModel; using AIMSModel;
using DevComponents.DotNetBar;
using DevComponents.Editors.DateTimeAdv; using DevComponents.Editors.DateTimeAdv;
using DocumentManagement; using DocumentManagement;
using DrawGraph; using DrawGraph;
@ -15,11 +13,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Drawing.Printing; using System.Drawing.Printing;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Windows.Forms; using System.Windows.Forms;
namespace AIMS.OperationAanesthesia namespace AIMS.OperationAanesthesia
@ -1654,9 +1650,9 @@ namespace AIMS.OperationAanesthesia
} }
_record.InstrumentList2.ApplianceRecordList = GetApplianceRecord2(); _record.InstrumentList2.ApplianceRecordList = GetApplianceRecord2();
BApplianceRecord.InsertListData(_record.InstrumentList2.ApplianceRecordList); BApplianceRecord.InsertListData(_record.InstrumentList2.ApplianceRecordList);
DBManage.AddPerson(_record, SelectOperationDoctorData, 1); //DBManage.AddPerson(_record, SelectOperationDoctorData, 1);
DBManage.AddPerson(_record, SelectInstrumentNurseData, 6); //DBManage.AddPerson(_record, SelectInstrumentNurseData, 6);
DBManage.AddPerson(_record, SelectTourNurseData, 7); //DBManage.AddPerson(_record, SelectTourNurseData, 7);
} }
catch (Exception ex) catch (Exception ex)
@ -1695,8 +1691,8 @@ namespace AIMS.OperationAanesthesia
if (txtOperationPosition.Text != "") txtOperationPosition.Text = txtOperationPosition.Text.Substring(0, txtOperationPosition.Text.LastIndexOf(" ,")); if (txtOperationPosition.Text != "") txtOperationPosition.Text = txtOperationPosition.Text.Substring(0, txtOperationPosition.Text.LastIndexOf(" ,"));
txtOperationDoctor2.Text = txtOperationDoctor.Text; txtOperationDoctor2.Text = txtOperationDoctor.Text;
txtInstrumentNurse2.Text = txtInstrumentNurse.Text; //txtInstrumentNurse2.Text = txtInstrumentNurse.Text;
txtTourNurse2.Text = txtTourNurse.Text; //txtTourNurse2.Text = txtTourNurse.Text;
} }
else else
{ {
@ -1705,8 +1701,8 @@ namespace AIMS.OperationAanesthesia
templateManage.Bind(); templateManage.Bind();
zgcAnaesRecord.Refresh(); zgcAnaesRecord.Refresh();
txtOperationDoctor.Text = txtOperationDoctor2.Text; txtOperationDoctor.Text = txtOperationDoctor2.Text;
txtInstrumentNurse.Text = txtInstrumentNurse2.Text; //txtInstrumentNurse.Text = txtInstrumentNurse2.Text;
txtTourNurse.Text = txtTourNurse2.Text; //txtTourNurse.Text = txtTourNurse2.Text;
} }
} }
@ -2044,7 +2040,7 @@ namespace AIMS.OperationAanesthesia
int idxStart = txtTourNurse.Text.LastIndexOf(","); int idxStart = txtTourNurse.Text.LastIndexOf(",");
txtTourNurse.Text = txtTourNurse.Text.Substring(0, idxStart); txtTourNurse.Text = txtTourNurse.Text.Substring(0, idxStart);
} }
txtTourNurse2.Text = txtTourNurse.Text; //txtTourNurse2.Text = txtTourNurse.Text;
} }
private List<int> SelectInstrumentNurseData = new List<int>(); //一助 private List<int> SelectInstrumentNurseData = new List<int>(); //一助
@ -2072,7 +2068,7 @@ namespace AIMS.OperationAanesthesia
int idxStart = txtInstrumentNurse.Text.LastIndexOf(","); int idxStart = txtInstrumentNurse.Text.LastIndexOf(",");
txtInstrumentNurse.Text = txtInstrumentNurse.Text.Substring(0, idxStart); txtInstrumentNurse.Text = txtInstrumentNurse.Text.Substring(0, idxStart);
} }
txtInstrumentNurse2.Text = txtInstrumentNurse.Text; //txtInstrumentNurse2.Text = txtInstrumentNurse.Text;
} }
private PublicUI.UI.frmSelectPerson frmOperationDoctor; private PublicUI.UI.frmSelectPerson frmOperationDoctor;
@ -2103,25 +2099,61 @@ namespace AIMS.OperationAanesthesia
txtOperationDoctor2.Text = txtOperationDoctor.Text; txtOperationDoctor2.Text = txtOperationDoctor.Text;
} }
/// <summary> private PublicUI.UI.frmSelectPerson frmTourNurse2;
/// 根据工作类型 选择医生术者赋值TextBox private List<int> SelectTourNurseData2 = new List<int>(); //一助
/// </summary> private void txtTourNurse2_Click(object sender, EventArgs e)
/// <param name="controlTextBox">医生术者TextBox</param>
/// <param name="workersType">工作类型</param>
public void setDoctor(TextBox controlTextBox, string workersType)
{ {
PublicUI.UI.frmSelectPerson frmOperationDoctor = new PublicUI.UI.frmSelectPerson(); frmTourNurse2 = new PublicUI.UI.frmSelectPerson();
frmOperationDoctor.PersonType = workersType; frmTourNurse2.PersonType = "手术室护士";
frmOperationDoctor.SelectDepartmentName = "手术室"; frmTourNurse2.SelectDepartmentName = "手术室";
frmOperationDoctor.SelectPersonData = new List<int>(); frmTourNurse2.SelectPersonData = SelectTourNurseData2;
frmOperationDoctor.ShowDialog(); frmTourNurse2.FormClosed += new FormClosedEventHandler(frmTourNurse2_FormClosed);
frmTourNurse2.ShowDialog();
foreach (int RowId in frmOperationDoctor.SelectPersonData)
{
controlTextBox.Text = BPerson.GetModel(RowId).Name;
}
} }
void frmTourNurse2_FormClosed(object sender, FormClosedEventArgs e)
{
txtTourNurse2.Text = "";
if (frmTourNurse2.SelectPersonData.Count > 0)
{
SelectTourNurseData2 = frmTourNurse2.SelectPersonData;
foreach (int RowId in frmTourNurse2.SelectPersonData)
{
txtTourNurse2.Text += BPerson.SelectSingle(RowId).Name + ",";
}
int idxStart = txtTourNurse2.Text.LastIndexOf(",");
txtTourNurse2.Text = txtTourNurse2.Text.Substring(0, idxStart);
}
}
private List<int> SelectInstrumentNurseData2 = new List<int>(); //一助
private PublicUI.UI.frmSelectPerson frmInstrumentNurse2;
private void txtInstrumentNurse2_Click(object sender, EventArgs e)
{
frmInstrumentNurse2 = new PublicUI.UI.frmSelectPerson();
frmInstrumentNurse2.PersonType = "手术室护士";
frmInstrumentNurse2.SelectDepartmentName = "手术室";
frmInstrumentNurse2.SelectPersonData = SelectInstrumentNurseData2;
frmInstrumentNurse2.FormClosed += new FormClosedEventHandler(frmInstrumentNurse2_FormClosed);
frmInstrumentNurse2.ShowDialog();
}
void frmInstrumentNurse2_FormClosed(object sender, FormClosedEventArgs e)
{
txtInstrumentNurse2.Text = "";
if (frmInstrumentNurse2.SelectPersonData.Count > 0)
{
SelectInstrumentNurseData2 = frmInstrumentNurse2.SelectPersonData;
foreach (int RowId in frmInstrumentNurse2.SelectPersonData)
{
txtInstrumentNurse2.Text += BPerson.SelectSingle(RowId).Name + ",";
}
int idxStart = txtInstrumentNurse2.Text.LastIndexOf(",");
txtInstrumentNurse2.Text = txtInstrumentNurse2.Text.Substring(0, idxStart);
}
}
private void button9_Click(object sender, EventArgs e) private void button9_Click(object sender, EventArgs e)
{ {
if (superTabMain.SelectedTab.Name == "spTabQXQDD") if (superTabMain.SelectedTab.Name == "spTabQXQDD")
@ -2220,7 +2252,7 @@ namespace AIMS.OperationAanesthesia
if (_record != null) if (_record != null)
{ {
EMRExtension.OpenFeesRecord(_record, "护士"); EMRExtension.OpenFeesRecord(_record, "护士");
} }
} }
private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e) private void frmAnasRecordInstrument_VisibleChanged(object sender, EventArgs e)

47
AIMS/OperationAfter/frmExportConfig.cs
View File

@ -99,25 +99,32 @@ namespace AIMS.OperationAfter.UI
private void tsbSave_Click(object sender, EventArgs e) private void tsbSave_Click(object sender, EventArgs e)
{ {
EndEdit(); try
exportConfig.Name = txtName.Text; {
exportConfig.Note = DataGridViewPath; EndEdit();
ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2); exportConfig.Name = txtName.Text;
string ss = JsonConvert.SerializeObject(dgvSetting); exportConfig.Note = DataGridViewPath;
exportConfig.Value = ss; ExportConfig dgvSetting = CreateDataGridViewSetting(dataGridView2);
exportConfig.IsValid = 1; string ss = JsonConvert.SerializeObject(dgvSetting);
exportConfig.OperatorNo = PublicMethod.OperatorNo; exportConfig.Value = ss;
exportConfig.OperatorName = PublicMethod.OperatorName; exportConfig.IsValid = 1;
exportConfig.OperateDate = DateTime.Now; exportConfig.OperatorNo = PublicMethod.OperatorNo;
exportConfig.Extend1 = PublicMethod.RoleId.ToString(); exportConfig.OperatorName = PublicMethod.OperatorName;
exportConfig.OperateDate = DateTime.Now;
exportConfig.Extend1 = PublicMethod.RoleId.ToString();
if (exportConfig.Id != null && exportConfig.Id.Value > 0) if (exportConfig.Id != null && exportConfig.Id.Value > 0)
{ {
BSysConfig.Update(exportConfig); BSysConfig.Update(exportConfig);
}
else
{
exportConfig.Id = BSysConfig.Insert(exportConfig);
}
} }
else catch (Exception ex)
{ {
exportConfig.Id = BSysConfig.Insert(exportConfig); throw;
} }
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
@ -138,9 +145,9 @@ namespace AIMS.OperationAfter.UI
export.PrintName = column.Cells["headerTextDataGridViewTextBoxColumn"].Value.ToString(); export.PrintName = column.Cells["headerTextDataGridViewTextBoxColumn"].Value.ToString();
export.Width = int.Parse(column.Cells["widthDataGridViewTextBoxColumn"].Value.ToString()); export.Width = int.Parse(column.Cells["widthDataGridViewTextBoxColumn"].Value.ToString());
export.IsVisible = bool.Parse(column.Cells["visibleDataGridViewCheckBoxColumn"].Value.ToString()); export.IsVisible = bool.Parse(column.Cells["visibleDataGridViewCheckBoxColumn"].Value.ToString());
export.IsPrint = bool.Parse(column.Cells["printShow"].Value.ToString()); export.IsPrint = column.Cells["printShow"].Value==null?false:bool.Parse(column.Cells["printShow"].Value.ToString());
export.PrintWidth = int.Parse(column.Cells["printWidth"].Value.ToString()); export.PrintWidth =column.Cells["printWidth"].Value==null?8: int.Parse(column.Cells["printWidth"].Value.ToString());
export.PrintSize = int.Parse(column.Cells["PrintSize"].Value.ToString()); export.PrintSize =column.Cells["PrintSize"].Value==null?8: int.Parse(column.Cells["PrintSize"].Value.ToString());
dataGridViewSetting.Exports.Add(export); dataGridViewSetting.Exports.Add(export);
} }

36
AIMS/OperationFront/frmOperationSchedulePlan.cs
View File

@ -3562,24 +3562,6 @@ namespace AIMS.OperationFront.UI
{ {
try try
{ {
dtpSearchTime.Value = DateTime.Now;
string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString();
labelWeek.Text = week;
if (RoomCardManage.IsAllowPassOpe == true)
{ btnpass.Visible = true; toolStripSeparator3.Visible = true; }
else
{ btnpass.Visible = false; toolStripSeparator3.Visible = false; }
SSSDept = BDepartment.Select(" NAME ='ÊÖÊõÊÒ' and IsValid=1 ", null, RecursiveType.None, 0);
MZKDept = BDepartment.Select(" NAME ='Âé×í¿Æ' and IsValid=1 ", null, RecursiveType.None, 0);
if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept;
ControlExtension.GetOperationSite(labelSite, CboOperationSite);
FirstLoad();
this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged);
RoomCardManage.IsAllowPat = RoomCardManage.GetRolePermission("Åų̻¼Õß"); RoomCardManage.IsAllowPat = RoomCardManage.GetRolePermission("Åų̻¼Õß");
RoomCardManage.IsAllowAns = RoomCardManage.GetRolePermission("ÅųÌÂé×í"); RoomCardManage.IsAllowAns = RoomCardManage.GetRolePermission("ÅųÌÂé×í");
RoomCardManage.IsAllowNur = RoomCardManage.GetRolePermission("Åų̻¤Ê¿"); RoomCardManage.IsAllowNur = RoomCardManage.GetRolePermission("Åų̻¤Ê¿");
@ -3608,6 +3590,24 @@ namespace AIMS.OperationFront.UI
{ {
mnuChangeOptRoomTo.Visible = false; mnuChangeOptRoomTo.Visible = false;
} }
dtpSearchTime.Value = DateTime.Now;
string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString();
labelWeek.Text = week;
if (RoomCardManage.IsAllowPassOpe == true)
{ btnpass.Visible = true; toolStripSeparator3.Visible = true; }
else
{ btnpass.Visible = false; toolStripSeparator3.Visible = false; }
SSSDept = BDepartment.Select(" NAME ='ÊÖÊõÊÒ' and IsValid=1 ", null, RecursiveType.None, 0);
MZKDept = BDepartment.Select(" NAME ='Âé×í¿Æ' and IsValid=1 ", null, RecursiveType.None, 0);
if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept;
ControlExtension.GetOperationSite(labelSite, CboOperationSite);
FirstLoad();
this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged);
} }
catch (Exception ex) catch (Exception ex)
{ {

6
DrawGraph/AreaManage/DrugsManage.cs
View File

@ -397,7 +397,7 @@ namespace DrawGraph
//addDrug1.clearDNAndDT(ZedControl); //addDrug1.clearDNAndDT(ZedControl);
drugsy = addDrug1.nowY; drugsy = addDrug1.nowY;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
temp.drawText2(H3pack.RealX + 0.006f, drugsy); temp.drawText2(H3pack.RealX + 0.003f, drugsy);
else else
ListAddDrugs(DrugListstr, i, temp); ListAddDrugs(DrugListstr, i, temp);
foreach (FactDrug item in temp.ChildFactDrugList) foreach (FactDrug item in temp.ChildFactDrugList)
@ -413,7 +413,7 @@ namespace DrawGraph
//因为相同则取得相同对象的Y,为当前的对象的高度 //因为相同则取得相同对象的Y,为当前的对象的高度
drugsy = addDrug1item.nowY; drugsy = addDrug1item.nowY;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
item.drawText2(H3pack.RealX + 0.006f, drugsy); item.drawText2(H3pack.RealX + 0.003f, drugsy);
else else
ListAddDrugs(DrugListstr, i, item); ListAddDrugs(DrugListstr, i, item);
continue; continue;
@ -426,7 +426,7 @@ namespace DrawGraph
if (isChildEqual == true) continue; if (isChildEqual == true) continue;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
{ {
temp.drawText(H3pack.RealX + 0.006f, drugsy); temp.drawText(H3pack.RealX + 0.003f, drugsy);
if (temp.DrugName != "氧气" && isEqual == false) if (temp.DrugName != "氧气" && isEqual == false)
rowDrugsIndex++; rowDrugsIndex++;
} }

8
DrawGraph/AreaManage/FactDrug.cs
View File

@ -314,10 +314,14 @@ namespace DrawGraph
if (this.DrugChannel != null && this.DrugChannel != "") DrName += "(" + this.DrugChannel + ")"; if (this.DrugChannel != null && this.DrugChannel != "") DrName += "(" + this.DrugChannel + ")";
if (this.DosageUnit != null && this.DosageUnit != "") DrName += "(" + this.DosageUnit + ")"; if (this.DosageUnit != null && this.DosageUnit != "") DrName += "(" + this.DosageUnit + ")";
if (this.BloodType != null && this.BloodType != "") DrName += "(" + this.BloodType + ")"; if (this.BloodType != null && this.BloodType != "") DrName += "(" + this.BloodType + ")";
float fsize = 6f;
if (DrName.Length > 20) fsize = 5f;
if (DrName.Length > 28) fsize = 4.6f;
if (DrugKind.Contains("麻") || DrugKind.Contains("精神")) if (DrugKind.Contains("麻") || DrugKind.Contains("精神"))
ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Red, 6f); ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Red, fsize);
else else
ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Black, 6f); ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Black, fsize);
} }
} }

5
DrawGraph/AreaManage/IconManage.cs
View File

@ -128,12 +128,11 @@ namespace DrawGraph
double span = getYPositionByListIndex(1, eventy, eventendy, 2); double span = getYPositionByListIndex(1, eventy, eventendy, 2);
List<string> eventListstr = new List<string>(); List<string> eventListstr = new List<string>();
eventListstr.Add("【事件】"); eventListstr.Add("【事件】");
myOpeRecord.FactEventsList.Sort(new FactEventsComparer()); myOpeRecord.FactEventsList.Sort(new FactEventsComparer());
//循环加药集体 //循环加药集体
for (int i = 0; i < myOpeRecord.FactEventsList.Count; i++) for (int i = 0; i < myOpeRecord.FactEventsList.Count; i++)
{ {
FactEvents temp = myOpeRecord.FactEventsList[i]; FactEvents temp = myOpeRecord.FactEventsList[i];
//ShowRespDate(temp, null);
//判断该事件是否存在当前时间段 //判断该事件是否存在当前时间段
if (IfInTimeExist(temp.EventBeginTime.Value, temp.EventEndTime.Value) == false) continue; if (IfInTimeExist(temp.EventBeginTime.Value, temp.EventEndTime.Value) == false) continue;

6
DrawGraph/AreaManage/SapManage.cs
View File

@ -353,7 +353,7 @@ namespace DrawGraph
addDrug1.clearDNAndDT(ZedControl); addDrug1.clearDNAndDT(ZedControl);
drugsy = addDrug1.nowY; drugsy = addDrug1.nowY;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
temp.drawText(H3pack.RealX + 0.006f, drugsy); temp.drawText(H3pack.RealX + 0.003f, drugsy);
else else
ListAddDrugs(SapListstr, i, temp); ListAddDrugs(SapListstr, i, temp);
foreach (FactDrug item in temp.ChildFactDrugList) foreach (FactDrug item in temp.ChildFactDrugList)
@ -369,7 +369,7 @@ namespace DrawGraph
////因为相同则取得相同对象的Y,为当前的对象的高度 ////因为相同则取得相同对象的Y,为当前的对象的高度
drugsy = addDrug1item.nowY; drugsy = addDrug1item.nowY;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
item.drawText(H3pack.RealX + 0.006f, drugsy); item.drawText(H3pack.RealX + 0.003f, drugsy);
else else
ListAddDrugs(SapListstr, i, item); ListAddDrugs(SapListstr, i, item);
continue; continue;
@ -382,7 +382,7 @@ namespace DrawGraph
if (isChildEqual == true) continue; if (isChildEqual == true) continue;
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
{ {
temp.drawText(H3pack.RealX + 0.006f, drugsy); temp.drawText(H3pack.RealX + 0.003f, drugsy);
if (isEqual == false) if (isEqual == false)
rowDrugsIndex++; rowDrugsIndex++;
} }