2 Incheckningar 68082ef992 ... e621c6704a

Upphovsman SHA1 Meddelande Datum
  zackhua e621c6704a Merge branch 'socket-wait' 5 månader sedan
  zackhua de5234df7b 医嘱内容和附加 字段 json 格式化错误 解决 8 månader sedan

BIN
.vs/ZLPlugin_LisPacs_MR/v17/.suo


+ 3 - 20
.vs/ZLPlugin_LisPacs_MR/v17/DocumentLayout.json

@@ -5,10 +5,6 @@
     {
       "AbsoluteMoniker": "D:0:0:{DF58EAD2-DE8E-471B-882C-853AFF832EFE}|LisPacsDataUpload\\LisPacsDataUpload.csproj|d:\\codespace\\visualstudiospace\\zlsoft\\zlplugin_lispacs_mr\\lispacsdataupload\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{DF58EAD2-DE8E-471B-882C-853AFF832EFE}|LisPacsDataUpload\\LisPacsDataUpload.csproj|solutionrelative:lispacsdataupload\\form1.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{DF58EAD2-DE8E-471B-882C-853AFF832EFE}|LisPacsDataUpload\\LisPacsDataUpload.csproj|d:\\codespace\\visualstudiospace\\zlsoft\\zlplugin_lispacs_mr\\lispacsdataupload\\oraclehelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{DF58EAD2-DE8E-471B-882C-853AFF832EFE}|LisPacsDataUpload\\LisPacsDataUpload.csproj|solutionrelative:lispacsdataupload\\oraclehelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
   "DocumentGroupContainers": [
@@ -18,21 +14,8 @@
       "DocumentGroups": [
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 2,
+          "SelectedChildIndex": 1,
           "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "OracleHelper.cs",
-              "DocumentMoniker": "D:\\CodeSpace\\VisualStudioSpace\\zlsoft\\ZLPlugin_LisPacs_MR\\LisPacsDataUpload\\OracleHelper.cs",
-              "RelativeDocumentMoniker": "LisPacsDataUpload\\OracleHelper.cs",
-              "ToolTip": "D:\\CodeSpace\\VisualStudioSpace\\zlsoft\\ZLPlugin_LisPacs_MR\\LisPacsDataUpload\\OracleHelper.cs",
-              "RelativeToolTip": "LisPacsDataUpload\\OracleHelper.cs",
-              "ViewState": "AQIAADcBAAAAAAAAAAAQwEwBAAAVAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-11-22T03:26:46.96Z",
-              "EditorCaption": ""
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
@@ -45,9 +28,9 @@
               "RelativeDocumentMoniker": "LisPacsDataUpload\\Form1.cs",
               "ToolTip": "D:\\CodeSpace\\VisualStudioSpace\\zlsoft\\ZLPlugin_LisPacs_MR\\LisPacsDataUpload\\Form1.cs",
               "RelativeToolTip": "LisPacsDataUpload\\Form1.cs",
-              "ViewState": "AQIAAKwDAAAAAAAAAAAUwLcDAABVAAAA",
+              "ViewState": "AQIAAHYDAAAAAAAAAAAqwMgFAAAUAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-11-22T03:03:20.58Z",
+              "WhenOpened": "2024-12-18T06:56:40.235Z",
               "EditorCaption": ""
             }
           ]

BIN
LisPacsDataUpload/obj/Release/LisPacsDataUpload.csproj.AssemblyReference.cache


+ 10 - 3
ZLPlugin_LisPacs_MR/Tools.cs

@@ -160,7 +160,15 @@ namespace ZLPlugin_LisPacs_MR
                     }
                     else
                     {
-                        value += "\"" + rd.Fields[j].Name + "\":\"" + rd.Fields[j].Value + "\",";
+                        //value += "\"" + rd.Fields[j].Name + "\":\"" + rd.Fields[j].Value + "\",";
+                        if (rd.Fields[j].Name == "附项")
+                        {
+                            value += "\"" + rd.Fields[j].Name + "\":null,";
+                        }
+                        else
+                        {
+                            value += "\"" + rd.Fields[j].Name + "\":\"" + rd.Fields[j].Value + "\",";
+                        }
                     }
                 }
 
@@ -199,8 +207,7 @@ namespace ZLPlugin_LisPacs_MR
                             if (rd.Fields[j].Name == "医嘱内容")
                             {
                                 value += "\"" + rd.Fields[j].Name + "\":\"" + val.Replace("\"", " ") + "\",";
-                            }
-                            else if (rd.Fields[j].Name== "附项")
+                            }else if (rd.Fields[j].Name == "附项")
                             {
                                 value += "\"" + rd.Fields[j].Name + "\":null,";
 

BIN
ZLPlugin_LisPacs_MR/obj/Release/ZLPlugin_LisPacs_MR.csproj.AssemblyReference.cache