器械清点单麻醉记录单数据源整理

AIMS/OperationDoing/AnasRecordBill/frmAnasRecordBill.cs

@@ -76,7 +76,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
         private void frmAnasRecordBillNew_Load(object sender, EventArgs e)
         {
             //系统演示 收费功能
-            if (PublicMethod.OperatorNo=="admin")
+            if (PublicMethod.OperatorNo == "admin")
             {
                 btnChage.Visible = true;
             }
@@ -643,7 +643,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
                 }
                 if (Inevent != null)
                 {
-                    BOperationRecord.Update("InRoomTime=@InRoom,OperationBeginTime=@OperationBegin,OperationEndTime=@OperationEnd,OutRoomTime=@OutRoom  where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.HasValue ? (object)_record.InRoomTime.Value : (object)DateTime.Now, "@OperationBegin", _record.OperationBeginTime.HasValue ? (object)_record.OperationBeginTime.Value : (object)DBNull.Value, "@OperationEnd", _record.OperationEndTime.HasValue ? (object)_record.OperationEndTime.Value : (object)DBNull.Value, "@OutRoom", _record.OutRoomTime.HasValue ? (object)_record.OutRoomTime.Value : (object)DBNull.Value, "@id", _record.Id));
+                    BOperationRecord.Update("InRoomTime=@InRoom,AnesthesiaBeginTime=@AnesthesiaBeginTime,OperationBeginTime=@OperationBegin,OperationEndTime=@OperationEnd,AnesthesiaEndTime=@AnesthesiaEndTime,OutRoomTime=@OutRoom  where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.HasValue ? (object)_record.InRoomTime.Value : (object)DateTime.Now, "@AnesthesiaBeginTime", _record.AnesthesiaBeginTime.HasValue ? (object)_record.AnesthesiaBeginTime.Value : (object)DBNull.Value, "@OperationBegin", _record.OperationBeginTime.HasValue ? (object)_record.OperationBeginTime.Value : (object)DBNull.Value, "@OperationEnd", _record.OperationEndTime.HasValue ? (object)_record.OperationEndTime.Value : (object)DBNull.Value, "@AnesthesiaEndTime", _record.AnesthesiaEndTime.HasValue ? (object)_record.AnesthesiaEndTime.Value : (object)DBNull.Value, "@OutRoom", _record.OutRoomTime.HasValue ? (object)_record.OutRoomTime.Value : (object)DBNull.Value, "@id", _record.Id));
                 }
             }
         }
@@ -1895,9 +1895,9 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
             }
         }
         private void btnChage_Click(object sender, EventArgs e)
-        { 
+        {
             frmChargRecordPrint frmchargRecord = new frmChargRecordPrint(_record);
-            frmchargRecord.TemplateType = "麻醉"; 
+            frmchargRecord.TemplateType = "麻醉";
             frmchargRecord.Show();
             frmchargRecord.BringToFront();
         }

AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs

@@ -1721,6 +1721,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
             if (templateManage != null)
             {
                 _record.InstrumentList.ApplianceRecordList = GetApplianceRecord();
+                _record.InstrumentList.JsonTextData = PublicToDoument.SerializeControl(panel18, _record, new List<string>());
             }
             mPanes = new List<MasterPane>();
             UpPanes = new List<MasterPane>();
@@ -1843,6 +1844,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
             if (templateManage != null)
             {
                 _record.InstrumentList.ApplianceRecordList = GetApplianceRecord();
+                _record.InstrumentList.JsonTextData = PublicToDoument.SerializeControl(panel18, _record, new List<string>());
             }
             try
             {

AIMS/OperationDoing/AnasRecordBill/frmOperationInfoNew.cs

@@ -407,6 +407,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
                     OPInfo.AnesthesiaMethodChangeTime = dtpTime.Value;
                 }
 
+                OPInfo.OperatorId = PublicMethod.OperatorName;
                 if (OPInfo.Id == null)
                 {
                     OPInfo.Id = BOperationRecordInfo.Insert(OPInfo);

AIMS/OperationDoing/oldSystemCode/PublicToDoument.cs

@@ -318,13 +318,5 @@ namespace AIMS.OperationDoing.AnasRecordBill
             }
         }
     }
-
+     
-    public class JsonTextForDoc
-    {
-        public string Id { get; set; }
-        public string Value { get; set; }
-        public string Type { get; set; }
-        public string Tag { get; set; }
-        public string Text { get; set; }
-    }
 }

AIMS/OremrUserControl/PrescriptionDocument.cs

@@ -1,4 +1,5 @@
-using AIMSModel;
+using AIMSExtension;
+using AIMSModel;
 using DrawGraph;
 using System;
 using System.Collections.Generic;

AIMSEntity/DAL/Extension/DOperationRecord.cs

@@ -69,11 +69,9 @@ namespace AIMSDAL
                             + "(SELECT TOP 1 fe.EventBeginTime FROM FactEvents fe LEFT JOIN Events e ON e.Id =fe.EventId WHERE e.Name='出室' and PatientId=" + PatientId + " and EventTypeId=" + TypeId + " ) as OutRoomTime, "
                             + "(SELECT TOP 1 fe.EventBeginTime FROM FactEvents fe LEFT JOIN Events e ON e.Id =fe.EventId WHERE e.Name='手术开始' and PatientId=" + PatientId + " and EventTypeId=" + TypeId + " ) as OperationBeginTime, "
                             + "(SELECT TOP 1 fe.EventBeginTime FROM FactEvents fe LEFT JOIN Events e ON e.Id =fe.EventId WHERE e.Name='手术结束' and PatientId=" + PatientId + "  and EventTypeId=" + TypeId + " ) as OperationEndTime, " +
-                            "od.OperationLevelName, od.OpeAfterMode, od.SpecialSituation," +
+                            " od.DiagnoseInfoName, od.OperationInfoName,od.AnaesthesiaMethodName, od.OperationCutTypeName," +
-                            "od.PunctureBodyPosition, od.PuncturePosition, od.CatheterDepth,od.NeedleSize, od.NeedleDirection, od.AnaesthesiaPlane," +
-                            "od.AnaesthesiaEffect, od.DiagnoseInfoName, od.OperationInfoName,od.AnaesthesiaMethodName, od.OperationCutTypeName," +
                             "od.OperationBodyPositionName, od.OperationPositionName, od.OperationDoctor,od.Assistant, od.AnesthesiaDoctor, od.Nurse,od.Nurse2," +
-                            "od.OperatorNo,od.OperatorName,od.OperateDate,od.Remarks,od.State,OperationDoctorId ,[AssistantId] ,[AnesthesiaDoctorId] ,[InstrumentNurseId],[TourNurseId],DiagnoseInfoId,OperationInfoId,AnaesthesiaMethodId,OrtherDoctor,OrtherDoctorId,OperationPositionId,OperationBodyPositionId,ASALevel,SpecialCase,Fasting,BloodType   FROM V_OperationDoing od WHERE od.PatientId=" + PatientId + " and od.RecoverId='" + TypeId + "'";
+                            "od.OperatorNo,od.OperatorName,od.OperateDate,od.State,OperationDoctorId ,[AssistantId] ,[AnesthesiaDoctorId] ,[InstrumentNurseId],[TourNurseId],DiagnoseInfoId,OperationInfoId,AnaesthesiaMethodId,OrtherDoctor,OrtherDoctorId,OperationPositionId,OperationBodyPositionId,ASALevel,SpecialCase,Fasting,BloodType   FROM V_OperationDoing od WHERE od.PatientId=" + PatientId + " and od.RecoverId='" + TypeId + "'";
             return HelperDB.DbHelperSQL.GetDataTable(strSql);
         }
 

AIMSEntity/Extensions/ParameterList.cs

@@ -48,6 +48,27 @@ namespace AIMSModel
             this.Add(parameterName5, parameterValue5);
             this.Add(parameterName6, parameterValue6);
         }
+        public ParameterList(string parameterName1, object parameterValue1, string parameterName2, object parameterValue2,string parameterName3, object parameterValue3, string parameterName4, object parameterValue4, string parameterName5, object parameterValue5, string parameterName6, object parameterValue6, string parameterName7, object parameterValue7 )
+        {
+		    this.Add(parameterName1, parameterValue1);
+			this.Add(parameterName2, parameterValue2);
+			this.Add(parameterName3, parameterValue3);
+            this.Add(parameterName4, parameterValue4);
+            this.Add(parameterName5, parameterValue5);
+            this.Add(parameterName6, parameterValue6);
+            this.Add(parameterName7, parameterValue7); 
+        }
+        public ParameterList(string parameterName1, object parameterValue1, string parameterName2, object parameterValue2,string parameterName3, object parameterValue3, string parameterName4, object parameterValue4, string parameterName5, object parameterValue5, string parameterName6, object parameterValue6, string parameterName7, object parameterValue7, string parameterName8, object parameterValue8)
+        {
+		    this.Add(parameterName1, parameterValue1);
+			this.Add(parameterName2, parameterValue2);
+			this.Add(parameterName3, parameterValue3);
+            this.Add(parameterName4, parameterValue4);
+            this.Add(parameterName5, parameterValue5);
+            this.Add(parameterName6, parameterValue6);
+            this.Add(parameterName7, parameterValue7);
+            this.Add(parameterName8, parameterValue8);
+        }
     }
 	/// <summary>
     /// 递归查询的方式，Parent：查询实体的同时也查询实体的外键属性；Child：查询实体的同时也查询子实体集合；None只查询实体

AIMSExtension/AIMSExtension.csproj

@@ -125,6 +125,7 @@
     <Compile Include="GPFunData.cs" />
     <Compile Include="HisDBHelper.cs" />
     <Compile Include="IndexType.cs" />
+    <Compile Include="JsonTextForDoc.cs" />
     <Compile Include="MyCache.cs" />
     <Compile Include="MyCodeName.cs" />
     <Compile Include="MyNameIntValue.cs" />

AIMSExtension/JsonTextForDoc.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AIMSExtension
+{
+    public class JsonTextForDoc
+    {
+        public string Id { get; set; }
+        public string Value { get; set; }
+        public string Type { get; set; }
+        public string Tag { get; set; }
+        public string Text { get; set; }
+    }
+}

DrawGraph/AreaManage/DBManage.cs

@@ -126,10 +126,10 @@ namespace DrawGraph
                     {
                         i += AddPerson(_operationRecord, _operationRecord.TourNurse, 7);
                     }
-                    else if (items[1] == "AnesthesiaDoctorAssistant")
+                    ////else if (items[1] == "AnesthesiaDoctorAssistant")
-                    {
+                    ////{
-                        i += AddPerson(_operationRecord, _operationRecord.AnesthesiaDoctorAssistant, 11);
+                    ////    i += AddPerson(_operationRecord, _operationRecord.AnesthesiaDoctorAssistant, 11);
-                    }
+                    ////}
                     else if (items[1] == "Operation")
                     {
                         i += AddOperation(_operationRecord, _operationRecord.Operation);

DrawGraph/AreaManage/DrugsManage.cs

@@ -147,7 +147,7 @@ namespace DrawGraph
                     if (item.GiveDrugType == "术后镇痛药")
                     {
                         myOpeRecord.AfterDrugsListstr.Add(string.Format("({0}){1} {2} {3}{4}{5}", x + 1, (item.DrugBeginTime == item.DrugEndTime) ? item.DrugBeginTime.ToShortTimeString() : item.DrugBeginTime.ToShortTimeString() + "->" + item.DrugEndTime.ToShortTimeString(), item.DrugName.Trim(), dose, "", item.DrugChannel == null ? "" : " " + item.DrugChannel.ToString()));
-                        myOpeRecord.AnalgesiaModeDrugs += string.Format("{0}{1} ", item.DrugName.Trim(), dose);
+                        myOpeRecord.AnalgesiaDrug += string.Format("{0}{1} ", item.DrugName.Trim(), dose);
                         x++;
                     }
                 }
@@ -262,7 +262,7 @@ namespace DrawGraph
 
                 if (myOpeRecord.BeforeDrugs == null || myOpeRecord.BeforeDrugs == "") myOpeRecord.BeforeDrugs = "无";
                 template.SetObjValue(myOpeRecord, "OperationRecord.BeforeDrugs", myOpeRecord.BeforeDrugs, myOpeRecord.BeforeDrugs);
-                template.SetObjValue(myOpeRecord, "OperationRecord.AnalgesiaModeDrugs", myOpeRecord.AnalgesiaModeDrugs, myOpeRecord.AnalgesiaModeDrugs);
+                template.SetObjValue(myOpeRecord, "OperationRecord.AnalgesiaDrug", myOpeRecord.AnalgesiaDrug, myOpeRecord.AnalgesiaDrug);
                 DrawDrugSapDose();
             }
             catch (Exception ex)

DrawGraph/AreaManage/OperationRecord.cs

@@ -29,6 +29,7 @@ namespace DrawGraph
         private string contacts;
         private string contactsPhone;
         private string isFasting;
+        private string age;
 
         //申请信息
         private string patientType;
@@ -120,8 +121,6 @@ namespace DrawGraph
         private string spareEight;
         private string spareNine;
         private string spareTen;
-        private int PageCount;
-        private string age;
 
         private List<FactEvents> factEventsList;
         private List<FactDrug> factDrugList;
@@ -130,8 +129,8 @@ namespace DrawGraph
         private List<AnaseDataQualityRecord> anaseDataQualityRecordList;
         private OperationRecordInfo opeRecordInfo;
         private OperationRecoverInInfo opeRecoverInInfo;
-        private OperationRecoverOutInfo opeRecoverOutInfo; 
+        private OperationRecoverOutInfo opeRecoverOutInfo;
-         private OperationRecordInstrumentList instrumentList;
+        private OperationRecordInstrumentList instrumentList;
 
         public List<string> EventListstr = new List<string>();
         public List<string> DrugsListstr = new List<string>();
@@ -171,11 +170,7 @@ namespace DrawGraph
         [ClassAttributs(Description = "总页数")]
         public int currentPage { get; set; }
         [ClassAttributs(Description = "当前页数")]
-        public int pageCount
+        public int pageCount { get; set; }
-        {
-            get { return PageCount; }
-            set { PageCount = value; }
-        }
 
         [ClassAttributs(Description = "手术记录编号，自增")]
         /// <summary>
@@ -194,7 +189,7 @@ namespace DrawGraph
         {
             get { return patientId; }
             set { patientId = value; }
-        } 
+        }
         [NoCreatControlAttributs]
         /// <summary>
         /// 是否是恢复室 1不是 2是
@@ -771,12 +766,12 @@ namespace DrawGraph
             set { beforeDrugs = value; }
         }
 
-        public string analgesiaModeDrugs;
+        public string analgesiaDrug;
         [ClassAttributs(Description = "镇痛用药")]
-        public string AnalgesiaModeDrugs
+        public string AnalgesiaDrug
         {
-            get { return analgesiaModeDrugs; }
+            get { return analgesiaDrug ; }
-            set { analgesiaModeDrugs = value; }
+            set {  analgesiaDrug = value; }
         }
 
         [ClassAttributs(Description = "麻醉助手")]
@@ -1126,7 +1121,7 @@ namespace DrawGraph
             }
             set
             {
-                 opeRecoverInInfo = value;
+                opeRecoverInInfo = value;
             }
         }
         [ClassAttributs(Description = "出恢复信息类")]
@@ -1138,7 +1133,7 @@ namespace DrawGraph
             }
             set
             {
-                 opeRecoverOutInfo = value;
+                opeRecoverOutInfo = value;
             }
         }
         [ClassAttributs(Description = "器械清点单类")]
@@ -1153,30 +1148,6 @@ namespace DrawGraph
                 instrumentList = value;
             }
         }
-        /// <summary>
-        /// 选择的药品名称和显示行索引表示的Hashtable
-        /// </summary>
-        [NoCreatControlAttributs]
-        [XmlIgnore]
-        public Hashtable hashSelectDrugs;
-        /// <summary>
-        /// 选择的输液名称和显示行索引表示的Hashtable
-        /// </summary>
-        [NoCreatControlAttributs]
-        [XmlIgnore]
-        public Hashtable hashSelectSaps;
-        /// <summary>
-        /// 选择的出量名称和显示行索引表示的Hashtable用于画图
-        /// </summary>
-        [NoCreatControlAttributs]
-        [XmlIgnore]
-        public Hashtable hashSelectFluids;
-        /// <summary>
-        /// 存储事件的哈希表
-        /// </summary>
-        [NoCreatControlAttributs]
-        [XmlIgnore]
-        public Hashtable hashEventLists;
 
         public OperationRecord()
         {
@@ -1209,7 +1180,7 @@ namespace DrawGraph
             FluidListstr = new List<string>();
             PunctureAndIntubatio = new List<string>();
             BeforeDrugs = "";
-            AnalgesiaModeDrugs = "";
+            AnalgesiaDrug = "";
         }
         /// <summary>
         /// 清除各种对象数据
@@ -1233,8 +1204,8 @@ namespace DrawGraph
         {
             if (zgcAnas == null || zgcAnas != zgc) zgcAnas = zgc;
             delAddObj("allDrugDose");
-            delAddObj("allOutDose"); 
+            delAddObj("allOutDose");
-            delAddObj("allqtDrugDose"); 
+            delAddObj("allqtDrugDose");
             for (int i = 1; i <= 19; i++)
             {
                 delAddObj("Out" + i);

DrawGraph/AreaManage/OperationRecordInstrumentList.cs

@@ -4,99 +4,809 @@ using System.Collections.Generic;
 
 namespace DrawGraph
 {
-	[Serializable]
+    [Serializable]
     public partial class OperationRecordInstrumentList
-	{
+    {
-        private int? id; 
+        private int? id;
-        private int? operationRecordId; 
+        private int? operationRecordId;
-        private string applianceUseType; 
+        private string applianceUseType;
-        private string tagPicture; 
+        private string tagPicture;
-        private string remark; 
+        private string remark;
-        private string jsonTextData; 
+        private string jsonTextData;
-        private string operatorNo; 
+        private string operatorNo;
-        private string operatorName; 
+        private string operatorName;
         private DateTime? operateDate;
+        private string operationName;
+        private string operationNameRermark;
+        private string diseaseName;
+        private string operationSite;
+        private string skinBackInfo;
+        private string beforSkinInfo;
+        private string deepVeniPuncture;
+        private string specialInfected;
+        private string gastricCanal;
+        private string catheterization;
+        private string inBloodType;
+        private string inBloodName;
+        private string inBloodXXB;
+        private string inBloodXFHXB;
+        private string inBloodXJ;
+        private string inBloodLCD;
+        private string inBloodZTX;
+        private string inBloodQT;
+        private string inBloodDose;
+        private string veinInfuse;
+        private string inDose;
+        private string outDose;
+        private string imagingData;
+        private string specimen;
+        private string specimenCount;
+        private string pathologyCount;
+        private string specimenState;
+        private string specimanToFrozen;
+        private string specimanToPathology;
+        private string submitForInspection;
+        private string submitPerson;
+        private string opeOutState;
+        private string opeSpecialGoods;
+        private string specialProblems;
+        private string antibioticUserTime;
+        private string beforInvasive;
+        private string tourniquetBegin1;
+        private string tourniquetEnd1;
+        private string tourniquetBegin2;
+        private string tourniquetEnd2;
+        private string tourniquetBegin3;
+        private string tourniquetEnd3;
+        private string tourniquetPosition;
+        private string negativePlatePosition;
+        private string inWardTime;
+        private string eMRInfo;
+        private string consciousness;
+        private string bloodPressure;
+        private string pulse;
+        private string breathing;
+        private string skinType;
+        private string hbsAg;
+        private string afterSkinStatus;
+        private string drainage;
+        private string inBloodPosition;
+        private string asepticBagMonitor;
+        private string drugAllergy;
+        private string operationDoctor;
+        private string instrumentNurse;
+        private string instrumentNurseSucceed;
+        private string instrumentNurseSucceedTime;
+        private string tourNurse;
+        private string tourNurseSucceed;
+        private string tourNurseSucceedTime;
+        private string outInstrumentNurse;
+        private string outInstrumentNurseSucceed;
+        private string outTourNurse;
+        private string outTourNurseSucceed;
+        private string otherInfo;
+        private string operationNurse;
+        private string wardNurse;
 
-		public List<ApplianceRecord> ApplianceRecordList;
+        public List<ApplianceRecord> ApplianceRecordList;
 
         [NoCreatControlAttributs]
         public int? Id
-		{
+        {
-		    get{ return id; }
+            get { return id; }
-			set{ id=value; }
+            set { id = value; }
         }
         [NoCreatControlAttributs]
         public int? OperationRecordId
-		{
+        {
-		    get{ return operationRecordId; }
+            get { return operationRecordId; }
-			set{ operationRecordId=value; }
+            set { operationRecordId = value; }
-		}
+        }
         /// <summary>
         /// 器械包Id
         /// </summary>
-        [NoCreatControlAttributs] 
+        [NoCreatControlAttributs]
         public string ApplianceUseType
-		{
+        {
-		    get{ return applianceUseType; }
+            get { return applianceUseType; }
-			set{ applianceUseType=value; }
+            set { applianceUseType = value; }
-		}
+        }
         /// <summary>
         /// 人体标记图
         /// </summary>
-        [NoCreatControlAttributs] 
+        [NoCreatControlAttributs]
-		public string TagPicture
+        public string TagPicture
-		{
+        {
-		    get{ return tagPicture; }
+            get { return tagPicture; }
-			set{ tagPicture=value; }
+            set { tagPicture = value; }
-		}
+        }
         [ClassAttributs(Description = "人体标记图")]
-        public string  TagPicturePanel  { get; set; }
+        public string TagPicturePanel { get; set; }
         [ClassAttributs(Description = "灭菌包列表")]
-        public string PackPanel   { get; set; }
+        public string PackPanel { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
         [ClassAttributs(Description = "备注")]
-		public string Remark
+        public string Remark
-		{
+        {
-		    get{ return remark; }
+            get { return remark; }
-			set{ remark=value; }
+            set { remark = value; }
-		}
+        }
-	    /// <summary>
+        /// <summary>
         /// 格式化文本
         /// </summary>
-        [NoCreatControlAttributs] 
+        [NoCreatControlAttributs]
-		public string JsonTextData
+        public string JsonTextData
-		{
+        {
-		    get{ return jsonTextData; }
+            get { return jsonTextData; }
-			set{ jsonTextData=value; }
+            set { jsonTextData = value; }
-		}
+        }
         /// <summary>
         /// 操作工号3
         /// </summary>
         [NoCreatControlAttributs]
-		public string OperatorNo
+        public string OperatorNo
-		{
+        {
-		    get{ return operatorNo; }
+            get { return operatorNo; }
-			set{ operatorNo=value; }
+            set { operatorNo = value; }
-		}
+        }
         /// <summary>
         /// 操作人名称
         /// </summary>
         [NoCreatControlAttributs]
         public string OperatorName
-		{
+        {
-		    get{ return operatorName; }
+            get { return operatorName; }
-			set{ operatorName=value; }
+            set { operatorName = value; }
-		}
+        }
         /// <summary>
         /// 操作时间
         /// </summary>
         [NoCreatControlAttributs]
         public DateTime? OperateDate
-		{
+        {
-		    get{ return operateDate; }
+            get { return operateDate; }
-			set{ operateDate=value; }
+            set { operateDate = value; }
-		}
+        }
-	}
+        /// <summary>
+        /// 手术名称
+        /// </summary>                     
+         [ClassAttributs(Description = "手术名称")]  
+        public string OperationName
+        {
+            get { return operationName; }
+            set { operationName = value; }
+        }
+        /// <summary>
+        /// 手术名称备注
+        /// </summary>                            
+         [ClassAttributs(Description = "手术名称备注")]
+        public string OperationNameRermark
+        {
+            get { return operationNameRermark; }
+            set { operationNameRermark = value; }
+        }
+        /// <summary>
+        /// 术后诊断
+        /// </summary>                      
+         [ClassAttributs(Description = "术后诊断")]
+        public string DiseaseName
+        {
+            get { return diseaseName; }
+            set { diseaseName = value; }
+        }
+        /// <summary>
+        /// 手术体位
+        /// </summary>                            
+         [ClassAttributs(Description = "手术体位")]
+        public string OperationSite
+        {
+            get { return operationSite; }
+            set { operationSite = value; }
+        }
+        /// <summary>
+        /// 备皮情况
+        /// </summary>                         
+         [ClassAttributs(Description = "备皮情况")]
+        public string SkinBackInfo
+        {
+            get { return skinBackInfo; }
+            set { skinBackInfo = value; }
+        }
+        /// <summary>
+        /// 术前皮肤完整情况
+        /// </summary>                        
+         [ClassAttributs(Description = "术前皮肤完整情况")]
+        public string BeforSkinInfo
+        {
+            get { return beforSkinInfo; }
+            set { beforSkinInfo = value; }
+        }
+        /// <summary>
+        /// 深静脉穿刺
+        /// </summary>                                
+         [ClassAttributs(Description = "深静脉穿刺")]
+        public string DeepVeniPuncture
+        {
+            get { return deepVeniPuncture; }
+            set { deepVeniPuncture = value; }
+        }
+        /// <summary>
+        /// 特殊感染
+        /// </summary>                                   
+         [ClassAttributs(Description = "特殊感染")]
+        public string SpecialInfected
+        {
+            get { return specialInfected; }
+            set { specialInfected = value; }
+        }
+        /// <summary>
+        /// 胃管
+        /// </summary>     
+         [ClassAttributs(Description = "胃管")]
+        public string GastricCanal
+        {
+            get { return gastricCanal; }
+            set { gastricCanal = value; }
+        }
+        /// <summary>
+        /// 导尿
+        /// </summary>                          
+         [ClassAttributs(Description = "导尿")]
+        public string Catheterization
+        {
+            get { return catheterization; }
+            set { catheterization = value; }
+        }
+        /// <summary>
+        /// 输血血型
+        /// </summary>                                 
+         [ClassAttributs(Description = "输血血型")]
+        public string InBloodType
+        {
+            get { return inBloodType; }
+            set { inBloodType = value; }
+        }
+        /// <summary>
+        /// 输血成分名称
+        /// </summary>                           
+         [ClassAttributs(Description = "输血成分名称")]
+        public string InBloodName
+        {
+            get { return inBloodName; }
+            set { inBloodName = value; }
+        }
+        /// <summary>
+        /// 输血成分名称血小板
+        /// </summary>                         
+         [ClassAttributs(Description = "输血成分名称血小板")]
+        public string InBloodXXB
+        {
+            get { return inBloodXXB; }
+            set { inBloodXXB = value; }
+        }
+        /// <summary>
+        /// 输血成分名称悬浮红细胞
+        /// </summary>                                      
+         [ClassAttributs(Description = "输血成分名称悬浮红细胞")]
+        public string InBloodXFHXB
+        {
+            get { return inBloodXFHXB; }
+            set { inBloodXFHXB = value; }
+        }
+        /// <summary>
+        /// 输血成分名称血浆
+        /// </summary>                                 
+         [ClassAttributs(Description = "输血成分名称血浆")]
+        public string InBloodXJ
+        {
+            get { return inBloodXJ; }
+            set { inBloodXJ = value; }
+        }
+        /// <summary>
+        /// 输血成分名称冷沉淀
+        /// </summary>                                   
+         [ClassAttributs(Description = "输血成分名称冷沉淀")]
+        public string InBloodLCD
+        {
+            get { return inBloodLCD; }
+            set { inBloodLCD = value; }
+        }
+        /// <summary>
+        /// 输血成分名称自体血
+        /// </summary>                              
+         [ClassAttributs(Description = "输血成分名称自体血")]
+        public string InBloodZTX
+        {
+            get { return inBloodZTX; }
+            set { inBloodZTX = value; }
+        }
+        /// <summary>
+        /// 输血成分名称其他
+        /// </summary>                                
+         [ClassAttributs(Description = "输血成分名称其他")]
+        public string InBloodQT
+        {
+            get { return inBloodQT; }
+            set { inBloodQT = value; }
+        }
+        /// <summary>
+        /// 输血量
+        /// </summary>                             
+         [ClassAttributs(Description = "输血量")]
+        public string InBloodDose
+        {
+            get { return inBloodDose; }
+            set { inBloodDose = value; }
+        }
+        /// <summary>
+        /// 静脉输液
+        /// </summary>                                     
+         [ClassAttributs(Description = "静脉输液")]
+        public string VeinInfuse
+        {
+            get { return veinInfuse; }
+            set { veinInfuse = value; }
+        }
+        /// <summary>
+        /// 液体
+        /// </summary>                                  
+         [ClassAttributs(Description = "液体")]
+        public string InDose
+        {
+            get { return inDose; }
+            set { inDose = value; }
+        }
+        /// <summary>
+        /// 出量
+        /// </summary>                                
+         [ClassAttributs(Description = "出量")]
+        public string OutDose
+        {
+            get { return outDose; }
+            set { outDose = value; }
+        }
+        /// <summary>
+        /// 影像资料
+        /// </summary>                                   
+         [ClassAttributs(Description = "影像资料")]
+        public string ImagingData
+        {
+            get { return imagingData; }
+            set { imagingData = value; }
+        }
+        /// <summary>
+        /// 有无标本
+        /// </summary>                                  
+         [ClassAttributs(Description = "有无标本")]
+        public string Specimen
+        {
+            get { return specimen; }
+            set { specimen = value; }
+        }
+        /// <summary>
+        /// 标本数量
+        /// </summary>                                   
+         [ClassAttributs(Description = "标本数量")]
+        public string SpecimenCount
+        {
+            get { return specimenCount; }
+            set { specimenCount = value; }
+        }
+        /// <summary>
+        /// 病理数量
+        /// </summary>                                      
+         [ClassAttributs(Description = "病理数量")]
+        public string PathologyCount
+        {
+            get { return pathologyCount; }
+            set { pathologyCount = value; }
+        }
+        /// <summary>
+        /// 标本去处
+        /// </summary>                                         
+         [ClassAttributs(Description = "标本去处")]
+        public string SpecimenState
+        {
+            get { return specimenState; }
+            set { specimenState = value; }
+        }
+        /// <summary>
+        /// 标本送冰冻
+        /// </summary>                               
+         [ClassAttributs(Description = "标本送冰冻")]
+        public string SpecimanToFrozen
+        {
+            get { return specimanToFrozen; }
+            set { specimanToFrozen = value; }
+        }
+        /// <summary>
+        /// 标本送病理
+        /// </summary>                                  
+         [ClassAttributs(Description = "标本送病理")]
+        public string SpecimanToPathology
+        {
+            get { return specimanToPathology; }
+            set { specimanToPathology = value; }
+        }
+        /// <summary>
+        /// 是否送检
+        /// </summary>                                  
+         [ClassAttributs(Description = "是否送检")]
+        public string SubmitForInspection
+        {
+            get { return submitForInspection; }
+            set { submitForInspection = value; }
+        }
+        /// <summary>
+        /// 送检者
+        /// </summary>                                         
+         [ClassAttributs(Description = "送检者")]
+        public string SubmitPerson
+        {
+            get { return submitPerson; }
+            set { submitPerson = value; }
+        }
+        /// <summary>
+        /// 术后送回
+        /// </summary>                                  
+         [ClassAttributs(Description = "术后送回")]
+        public string OpeOutState
+        {
+            get { return opeOutState; }
+            set { opeOutState = value; }
+        }
+        /// <summary>
+        /// 术中使用特殊物品
+        /// </summary>                              
+         [ClassAttributs(Description = "术中使用特殊物品")]
+        public string OpeSpecialGoods
+        {
+            get { return opeSpecialGoods; }
+            set { opeSpecialGoods = value; }
+        }
+        /// <summary>
+        /// 特殊问题处理
+        /// </summary>                                   
+         [ClassAttributs(Description = "特殊问题处理")]
+        public string SpecialProblems
+        {
+            get { return specialProblems; }
+            set { specialProblems = value; }
+        }
+        /// <summary>
+        /// 预防性抗生素术前用药时间
+        /// </summary>                                
+         [ClassAttributs(Description = "预防性抗生素术前用药时间")]
+        public string AntibioticUserTime
+        {
+            get { return antibioticUserTime; }
+            set { antibioticUserTime = value; }
+        }
+        /// <summary>
+        /// 术前有创筛查
+        /// </summary>                               
+         [ClassAttributs(Description = "术前有创筛查")]
+        public string BeforInvasive
+        {
+            get { return beforInvasive; }
+            set { beforInvasive = value; }
+        }
+        /// <summary>
+        /// 止血带开始时间
+        /// </summary>                           
+         [ClassAttributs(Description = "止血带开始时间")]
+        public string TourniquetBegin1
+        {
+            get { return tourniquetBegin1; }
+            set { tourniquetBegin1 = value; }
+        }
+        /// <summary>
+        /// 止血带结束时间
+        /// </summary>                                         
+         [ClassAttributs(Description = "止血带结束时间")]
+        public string TourniquetEnd1
+        {
+            get { return tourniquetEnd1; }
+            set { tourniquetEnd1 = value; }
+        }
+        /// <summary>
+        /// 止血带开始时间2
+        /// </summary>                                    
+         [ClassAttributs(Description = "止血带开始时间2")]
+        public string TourniquetBegin2
+        {
+            get { return tourniquetBegin2; }
+            set { tourniquetBegin2 = value; }
+        }
+        /// <summary>
+        /// 止血带结束时间2
+        /// </summary>                                  
+         [ClassAttributs(Description = "止血带结束时间2")]
+        public string TourniquetEnd2
+        {
+            get { return tourniquetEnd2; }
+            set { tourniquetEnd2 = value; }
+        }
+        /// <summary>
+        /// 止血带开始时间3
+        /// </summary>                                     
+         [ClassAttributs(Description = "止血带开始时间3")]
+        public string TourniquetBegin3
+        {
+            get { return tourniquetBegin3; }
+            set { tourniquetBegin3 = value; }
+        }
+        /// <summary>
+        /// 止血带结束时间3
+        /// </summary>                                  
+         [ClassAttributs(Description = "止血带结束时间3")]
+        public string TourniquetEnd3
+        {
+            get { return tourniquetEnd3; }
+            set { tourniquetEnd3 = value; }
+        }
+        /// <summary>
+        /// 止血带部位
+        /// </summary>                                      
+         [ClassAttributs(Description = "止血带部位")]
+        public string TourniquetPosition
+        {
+            get { return tourniquetPosition; }
+            set { tourniquetPosition = value; }
+        }
+        /// <summary>
+        /// 负极板部位
+        /// </summary>                                    
+         [ClassAttributs(Description = "负极板部位")]
+        public string NegativePlatePosition
+        {
+            get { return negativePlatePosition; }
+            set { negativePlatePosition = value; }
+        }
+        /// <summary>
+        /// 回病房时间
+        /// </summary>                                  
+         [ClassAttributs(Description = "回病房时间")]
+        public string InWardTime
+        {
+            get { return inWardTime; }
+            set { inWardTime = value; }
+        }
+        /// <summary>
+        /// 病历资料
+        /// </summary>                                     
+         [ClassAttributs(Description = "病历资料")]
+        public string EMRInfo
+        {
+            get { return eMRInfo; }
+            set { eMRInfo = value; }
+        }
+        /// <summary>
+        /// 意识
+        /// </summary>                                  
+         [ClassAttributs(Description = "意识")]
+        public string Consciousness
+        {
+            get { return consciousness; }
+            set { consciousness = value; }
+        }
+        /// <summary>
+        /// 血压
+        /// </summary>                             
+         [ClassAttributs(Description = "血压")]
+        public string BloodPressure
+        {
+            get { return bloodPressure; }
+            set { bloodPressure = value; }
+        }
+        /// <summary>
+        /// 脉搏
+        /// </summary>                               
+         [ClassAttributs(Description = "脉搏")]
+        public string Pulse
+        {
+            get { return pulse; }
+            set { pulse = value; }
+        }
+        /// <summary>
+        /// 呼吸
+        /// </summary>                           
+         [ClassAttributs(Description = "呼吸")]
+        public string Breathing
+        {
+            get { return breathing; }
+            set { breathing = value; }
+        }
+        /// <summary>
+        /// 皮肤
+        /// </summary>                       
+         [ClassAttributs(Description = "皮肤")]
+        public string SkinType
+        {
+            get { return skinType; }
+            set { skinType = value; }
+        }
+        /// <summary>
+        /// HbsAg
+        /// </summary>                                    
+         [ClassAttributs(Description = "HbsAg")]
+        public string HbsAg
+        {
+            get { return hbsAg; }
+            set { hbsAg = value; }
+        }
+        /// <summary>
+        /// 皮肤情况
+        /// </summary>                                 
+         [ClassAttributs(Description = "皮肤情况")]
+        public string AfterSkinStatus
+        {
+            get { return afterSkinStatus; }
+            set { afterSkinStatus = value; }
+        }
+        /// <summary>
+        /// 引流
+        /// </summary>                                 
+         [ClassAttributs(Description = "引流")]
+        public string Drainage
+        {
+            get { return drainage; }
+            set { drainage = value; }
+        }
+        /// <summary>
+        /// 静脉输液(血)/部位
+        /// </summary>                                    
+         [ClassAttributs(Description = "静脉输液(血)/部位")]
+        public string InBloodPosition
+        {
+            get { return inBloodPosition; }
+            set { inBloodPosition = value; }
+        }
+        /// <summary>
+        /// 无菌包监测合格
+        /// </summary>                                 
+         [ClassAttributs(Description = "无菌包监测合格")]
+        public string AsepticBagMonitor
+        {
+            get { return asepticBagMonitor; }
+            set { asepticBagMonitor = value; }
+        }
+        /// <summary>
+        /// 药物过敏史
+        /// </summary>                               
+         [ClassAttributs(Description = "药物过敏史")]
+        public string DrugAllergy
+        {
+            get { return drugAllergy; }
+            set { drugAllergy = value; }
+        }
+        /// <summary>
+        /// 主刀医生
+        /// </summary>                                        
+         [ClassAttributs(Description = "主刀医生")]
+        public string OperationDoctor
+        {
+            get { return operationDoctor; }
+            set { operationDoctor = value; }
+        }
+        /// <summary>
+        /// 器械护士
+        /// </summary>                                     
+         [ClassAttributs(Description = "器械护士")]
+        public string InstrumentNurse
+        {
+            get { return instrumentNurse; }
+            set { instrumentNurse = value; }
+        }
+        /// <summary>
+        /// 器械护士接台
+        /// </summary>                                 
+         [ClassAttributs(Description = "器械护士接台")]
+        public string InstrumentNurseSucceed
+        {
+            get { return instrumentNurseSucceed; }
+            set { instrumentNurseSucceed = value; }
+        }
+        /// <summary>
+        /// 器械护士接台时间
+        /// </summary>                                    
+         [ClassAttributs(Description = "器械护士接台时间")]
+        public string InstrumentNurseSucceedTime
+        {
+            get { return instrumentNurseSucceedTime; }
+            set { instrumentNurseSucceedTime = value; }
+        }
+        /// <summary>
+        /// 巡回护士
+        /// </summary>                               
+         [ClassAttributs(Description = "巡回护士")]
+        public string TourNurse
+        {
+            get { return tourNurse; }
+            set { tourNurse = value; }
+        }
+        /// <summary>
+        /// 巡回护士接台
+        /// </summary>                        
+         [ClassAttributs(Description = "巡回护士接台")]
+        public string TourNurseSucceed
+        {
+            get { return tourNurseSucceed; }
+            set { tourNurseSucceed = value; }
+        }
+        /// <summary>
+        /// 巡回护士接台时间
+        /// </summary>                                     
+         [ClassAttributs(Description = "巡回护士接台时间")]
+        public string TourNurseSucceedTime
+        {
+            get { return tourNurseSucceedTime; }
+            set { tourNurseSucceedTime = value; }
+        }
+        /// <summary>
+        /// 结束器械护士
+        /// </summary>                                
+         [ClassAttributs(Description = "结束器械护士")]
+        public string OutInstrumentNurse
+        {
+            get { return outInstrumentNurse; }
+            set { outInstrumentNurse = value; }
+        }
+        /// <summary>
+        /// 结束器械护士接台
+        /// </summary>                                 
+         [ClassAttributs(Description = "结束器械护士接台")]
+        public string OutInstrumentNurseSucceed
+        {
+            get { return outInstrumentNurseSucceed; }
+            set { outInstrumentNurseSucceed = value; }
+        }
+        /// <summary>
+        /// 结束巡回护士
+        /// </summary>                            
+         [ClassAttributs(Description = "结束巡回护士")]
+        public string OutTourNurse
+        {
+            get { return outTourNurse; }
+            set { outTourNurse = value; }
+        }
+        /// <summary>
+        /// 结束巡回护士接台
+        /// </summary>                              
+         [ClassAttributs(Description = "结束巡回护士接台")]
+        public string OutTourNurseSucceed
+        {
+            get { return outTourNurseSucceed; }
+            set { outTourNurseSucceed = value; }
+        }
+        /// <summary>
+        /// 其他
+        /// </summary>                                   
+         [ClassAttributs(Description = "其他")]
+        public string OtherInfo
+        {
+            get { return otherInfo; }
+            set { otherInfo = value; }
+        }
+        /// <summary>
+        /// 手术护士
+        /// </summary>                                   
+         [ClassAttributs(Description = "手术护士")]
+        public string OperationNurse
+        {
+            get { return operationNurse; }
+            set { operationNurse = value; }
+        }
+        /// <summary>
+        /// 病房护士
+        /// </summary>                              
+         [ClassAttributs(Description = "病房护士")]
+        public string WardNurse
+        {
+            get { return wardNurse; }
+            set { wardNurse = value; }
+        }
+    }
 }

DrawGraph/AreaManage/SapManage.cs

@@ -131,7 +131,7 @@ namespace DrawGraph
                 List<string> DrugListstr = new List<string>();
                 DrugListstr.Add("【手术用药】");
                 myOpeRecord.BeforeDrugs = "";
-                myOpeRecord.AnalgesiaModeDrugs = ""; 
+                myOpeRecord.AnalgesiaDrug = ""; 
                 //当前时间段加药集合
                 myOpeRecord.FactDrugList.ForEach(drug =>
                 {

DrawGraph/AreaManage/TempDataManage.cs

@@ -1,4 +1,6 @@
 using AIMSExtension;
+using DevComponents.Editors.DateTimeAdv;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,6 +19,7 @@ namespace DrawGraph
         private bool valChang = false; //值不变 
 
         AbleEditPackObj ableEdit2;
+        AbleEditPackObj ableEdit3;
         public TempDataManage() { }
         public TempDataManage(object _operationRecor, DrawGraph.ZedGraphControl _zedControl, TemplateManage _template, string _name) : base(_operationRecor, _zedControl, _template, _name)
         { }
@@ -26,6 +29,7 @@ namespace DrawGraph
             //自己要用的手术对象
             myOpeRecord = OpeRecord as OperationRecord;
             ableEdit2 = template.GetPackObjectOTag<AbleEditPackObj>("TempDataManage_AbleEditPackObj_357_OperationRecord_InstrumentList_TagPicturePanel");
+            ableEdit3 = template.GetPackObjectOTag<AbleEditPackObj>("TempDataManage_AbleEditPackObj_397_OperationRecord_InstrumentList_PackPanel");
         }
         #region 重写的事件
         /// <summary>
@@ -73,6 +77,19 @@ namespace DrawGraph
                     ZUtil.DrawImage("bjtp", ableEdit2.RealEndX, ableEdit2.RealY, (ableEdit2.RealEndX - ableEdit2.RealX), (ableEdit2.RealEndY - ableEdit2.RealY) / 2, ZedControl, TextPrefix.IM + "InstrumentListTagPicturePanel2");
                 }
             }
+            if (ableEdit3 != null)
+            {
+                for (int i = 593; i < 617; i++)
+                {
+                    TextPackObj packObj = template.GetPackObjectOTag<TextPackObj>("TempDataManage_TextPackObj_" + i);
+                    if (packObj != null)
+                    {
+                        packObj.PackText = "";
+                        packObj.PackValue = "";
+                        packObj.Draw();
+                    }
+                }
+            }
             List<PackObjBase> ables = PackManage.ListPob.Where<PackObjBase>(s => s is AbleEditPackObj).ToList<PackObjBase>();
             foreach (PackObjBase pack in ables)
             {
@@ -181,16 +198,33 @@ namespace DrawGraph
         {
             if (myOpeRecord != null && myOpeRecord.Id != null)
             {
-                GraphObj gos = ZedControl.MasterPane.GraphObjList[TextPrefix.IM + "InstrumentListTagPicturePanel"];
+                if (ableEdit2 != null)
-                if (gos != null)
                 {
-                    ZedControl.MasterPane.GraphObjList.Remove(gos);
+                    GraphObj gos = ZedControl.MasterPane.GraphObjList[TextPrefix.IM + "InstrumentListTagPicturePanel"];
+                    if (gos != null)
+                    {
+                        ZedControl.MasterPane.GraphObjList.Remove(gos);
+                    }
+                    if (myOpeRecord.InstrumentList != null && myOpeRecord.InstrumentList.TagPicture != null && myOpeRecord.InstrumentList.TagPicture != "")
+                    {
+                        MemoryStream ms = new MemoryStream(Convert.FromBase64String(myOpeRecord.InstrumentList.TagPicture));
+                        System.Drawing.Image image = System.Drawing.Image.FromStream(ms);
+                        ZUtil.DrawImage(image, ableEdit2.RealX, ableEdit2.RealY, (ableEdit2.RealEndX - ableEdit2.RealX), (ableEdit2.RealEndY - ableEdit2.RealY), ZedControl, TextPrefix.IM + "InstrumentListTagPicturePanel");
+                    }
                 }
-                if (myOpeRecord.InstrumentList != null && ableEdit2 != null && myOpeRecord.InstrumentList.TagPicture != null && myOpeRecord.InstrumentList.TagPicture != "")
+                if (ableEdit3 != null && myOpeRecord.InstrumentList != null && myOpeRecord.InstrumentList.JsonTextData != null && myOpeRecord.InstrumentList.JsonTextData != "")
                 {
-                    MemoryStream ms = new MemoryStream(Convert.FromBase64String(myOpeRecord.InstrumentList.TagPicture));
+                    //593-616
-                    System.Drawing.Image image = System.Drawing.Image.FromStream(ms);
+                    List<JsonTextForDoc> list = JsonConvert.DeserializeObject<List<JsonTextForDoc>>(myOpeRecord.InstrumentList.JsonTextData);
-                    ZUtil.DrawImage(image, ableEdit2.RealX, ableEdit2.RealY, (ableEdit2.RealEndX - ableEdit2.RealX), (ableEdit2.RealEndY - ableEdit2.RealY), ZedControl, TextPrefix.IM + "InstrumentListTagPicturePanel");
+                    foreach (JsonTextForDoc m in list)
+                    {
+                        if (m.Id.Trim() == "")
+                            continue;
+                        TextPackObj packObj = template.GetPackObjectOTag<TextPackObj>(m.Tag);
+                        packObj.PackText = m.Value;
+                        packObj.PackValue = m.Value;
+                        packObj.Draw();
+                    }
                 }
             }
             List<PackObjBase> ables = PackManage.ListPob.Where<PackObjBase>(s => s is AbleEditPackObj).ToList<PackObjBase>();
@@ -199,7 +233,7 @@ namespace DrawGraph
                 pack.Draw();
             }
         }
-        
+
         /// <summary>
         /// 公共验证方法
         /// </summary>

DrawGraph/DrawGraph.csproj

@@ -67,6 +67,7 @@
     <Compile Include="AreaManage\DeletePhysios.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="AreaManage\OperationRecordOld.cs" />
     <Compile Include="AreaManage\TempDataManage.cs" />
     <Compile Include="AreaManage\OperationRecordInfo.cs" />
     <Compile Include="AreaManage\OperationRecordInstrumentList.cs" />