upload

Desktop/Worklist/App.config

@@ -12,7 +12,9 @@
 <!--        医院Id-->
         <add key="HospitalId" value="27400005" />
 <!--        检查类型 多个检查用,隔开   -->
-        <add key="Modality"  value="DX" />
+        <add key="Modality"  value="MR" />
+<!--        检查类型 用于填充studyUid   -->
+        <add key="ModalityStringInt"  value="1" />
 <!--        程序监听端口-->
         <add key="Port"      value="128" />
 <!--        程序监听地址 建议0.0.0.0 或者服务器ip-->
@@ -29,17 +31,17 @@
 <!--        JSON获取数据模式下JSON文件路径-->
         <add key="JSON"      value="exam.json"/>
 <!--        SQLServer获取数据模式下数据库IP-->
-        <add key="SQL_IP"    value="192.168.1.52"/>
-<!--        <add key="SQL_IP"    value="192.160.253.176"/>-->
+<!--        <add key="SQL_IP"    value="192.168.1.52"/>-->
+        <add key="SQL_IP"    value="192.160.253.176"/>
 <!--        SQLServer获取数据模式下数据库名-->
-        <add key="SQL_DB"    value="QiHIS"/>
 <!--        <add key="SQL_DB"    value="QiHIS"/>-->
+            <add key="SQL_DB"    value="QiHIS"/>
 <!--        SQLServer获取数据模式下数据库用户名-->
-        <add key="SQL_USER"  value="Lis999"/>
-<!--        <add key="SQL_USER"  value="his"/>-->
+<!--        <add key="SQL_USER"  value="Lis999"/>-->
+            <add key="SQL_USER"  value="his"/>
 <!--        SQLServer获取数据模式下数据库密码-->
-        <add key="SQL_Password"    value="054805"/>
-<!--        <add key="SQL_Password"    value="his"/>-->
+<!--        <add key="SQL_Password"    value="054805"/>-->
+        <add key="SQL_Password"    value="his"/>
 <!--        SQLServer获取数据模式下数据缓存接口地址-->
 <!--        <add key="Cache_Url"    value="http://192.168.1.18:8083/butt/setNameCache"/>-->
         <add key="Cache_Url"    value="https://risserver3.pacsonline.cn/butt/setNameCache"/>

Desktop/Worklist/Model/WorklistSQLServerHandler.cs

@@ -27,8 +27,8 @@ namespace Worklist_SCP.Model
         private static string HospitalName = ConfigurationManager.AppSettings["HospitalName"];
         private static string HospitalId = ConfigurationManager.AppSettings["HospitalId"];
         private static string ScheduledAET = ConfigurationManager.AppSettings["ScheduledAET"];
-        private static bool isChinese = "TRUE".Equals(ConfigurationManager.AppSettings["Chinese"]) ;
-
+        private static string ModalityStringInt = ConfigurationManager.AppSettings["ModalityStringInt"];
+        private static bool isChinese = "TRUE".Equals(ConfigurationManager.AppSettings["Chinese"]);
         private static void cache(List<View_PACS> hisBeans)
         {
             try
@@ -38,7 +38,7 @@ namespace Worklist_SCP.Model
                 List<Tmp> datas = new List<Tmp>();
                 foreach (View_PACS hisBean in hisBeans)
                 {
-                    datas.Add(new Tmp(hisBean.INPATIENTNO, hisBean.NAME));
+                    datas.Add(new Tmp(hisBean.INPATIENTNO, hisBean.NAME, hisBean.zyh, hisBean.cwh, hisBean.PARTOFCHECK));
                 }
 
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Cache_Url);
@@ -169,7 +169,7 @@ namespace Worklist_SCP.Model
         
 
         private static string generatStudyUid(string PatientID, string AccessionNumber, DateTime ExamDateAndTime) {
-            return "1.2.156.14702.3." + PatientID + "." + AccessionNumber + "." +  GetTimeStamp(ExamDateAndTime);
+            return "1.2.156.14702.3." + ModalityStringInt + "." + PatientID + "." + AccessionNumber + "." +  GetTimeStamp(ExamDateAndTime);
         }
 
 
@@ -230,7 +230,7 @@ namespace Worklist_SCP.Model
 
                 AddIfExistsInRequest(resultDataset, request, DicomTag.AccessionNumber, result.AccessionNumber);    // T2
                 AddIfExistsInRequest(resultDataset, request, DicomTag.InstitutionName, result.HospitalName);
-                AddIfExistsInRequest(resultDataset, request, DicomTag.InstitutionCodeSequence, result.HospitalId);
+                //AddIfExistsInRequest(resultDataset, request, DicomTag.InstitutionCodeSequence, result.HospitalId);
                 AddIfExistsInRequest(resultDataset, request, DicomTag.ReferringPhysicianName, result.ReferringPhysician); // T2
                 
                 //AddIfExistsInRequest(resultDataset, request, DicomTag.PatientName, TransferEncoding(Encoding.Default, Encoding.GetEncoding("GB18030") , result.Name)); //T1

Desktop/Worklist/Model/bean/Tmp.cs

@@ -5,9 +5,15 @@ public class Tmp
 {
     public string INPATIENTNO { get; set; }
     public string NAME { get; set; }
-    public Tmp(string INPATIENTNO, string NAME)
+    public string zyh { get; set; }
+    public string cwh { get; set; }
+    public string PARTOFCHECK { get; set; }
+    public Tmp(string INPATIENTNO, string NAME, string zyh, string cwh, string PARTOFCHECK)
     {
         this.INPATIENTNO = INPATIENTNO;
         this.NAME = NAME;
+        this.zyh = zyh;
+        this.cwh = cwh;
+        this.PARTOFCHECK = PARTOFCHECK;
     }
 }

Desktop/Worklist/Model/bean/View_PACS.cs

@@ -24,4 +24,6 @@ public class View_PACS
     public DateTime LODGEDATE { get; set; }
     public string BEDNO { get; set; }
     public string TIMES { get; set; }
+    public string zyh { get; set; }
+    public string cwh { get; set; }
 }

Desktop/Worklist/ZskkIOManager.cs

@@ -30,6 +30,7 @@ namespace Worklist_SCP
 
             {
 
+                //return Encoding.ASCII;
                 return Encoding.GetEncoding("GB18030");
 
             }