인증저장 이미지 가져오는 로직 수정

동의서 이력 환자별 전체 검색 api 수정

CLIP.e-Form.Consent.Dfh.Web/ConsentSvc.asmx.cs

@@ -142,7 +142,7 @@ namespace CLIP.eForm.Consent.Dfh.WebService
 
     // 환자, 상태에 따른 동의서 목록 검색
     [WebMethod(Description = "환자/상태에 따른 동의서 목록 검색")]
-    public List<ConsentVO> GetConsentList(string patientCode, string startDt, string endDt, string consetState, string jobkindcd) {
+    public List<ConsentVO> GetConsentList(string patientCode, string startDt, string endDt, string consentState, string jobkindcd) {
       List<ConsentVO> result;
 
       try {
@@ -152,7 +152,7 @@ namespace CLIP.eForm.Consent.Dfh.WebService
           param.Add("patientCode", patientCode);
           param.Add("startDt", startDt);
           param.Add("endDt", endDt);
-          param.Add("consentState", consetState);
+          param.Add("consentState", consentState);
           if (jobkindcd == "1140" || jobkindcd == "1113") {
             isnurs = "Y";
           }
@@ -217,7 +217,17 @@ namespace CLIP.eForm.Consent.Dfh.WebService
 
             // @"\\192.168.0.222\00. 공용폴더\04. 프로그램 및 관련 매뉴얼\5. oracle\oracle"
             //string orgFile = @"\\192.168.100.32\image_a03\fnuImage\201610\13" + "\\" + img.ImageFilename;
-            string orgFile = img.ImagePath + "\\" + img.ImageFilename;
+            string lastChar = img.ImagePath.Substring(img.ImagePath.Length-1);
+            CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Debug(string.Format("CLIP.eForm GetConsentImage lastChar: {0}", lastChar));
+            string orgFile = "";
+            if (lastChar.Equals("\\"))
+            {
+              orgFile = img.ImagePath + img.ImageFilename;
+            } else
+            {
+              orgFile = img.ImagePath + "\\" + img.ImageFilename;
+            }
+            
             CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Debug(string.Format("CLIP.eForm GetConsentImage orgFile: {0}", orgFile));
             string tempImgNm = orgFile.Substring(orgFile.IndexOf("\\") + 1).Replace("\\", "");
             if (!System.IO.File.Exists(Server.MapPath("./DataTempImage/") + tempImgNm)) {

CLIP.e-Form.Consent.Dfh.Web/OracleQuery/CLIP.e-Form.Hospital.Dfh.User.xml

@@ -226,7 +226,7 @@
                  to_char(to_date(#todd#, 'yyyymmdd'), 'yyyy-mm-dd')
        ]]>
       <isNotEqual property="status" compareValue="ALL">
-      <![CDATA[
+        <![CDATA[
              and a.consent_state in ($status$)
       ]]>
       </isNotEqual>

CLIP.e-Form.Consent.Dfh.Web/Properties/PublishProfiles/CONSENT-DFH.pubxml.user

@@ -12,22 +12,22 @@
       <publishTime>10/12/2016 16:08:42</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Dac.dll">
-      <publishTime>10/12/2020 09:45:15</publishTime>
+      <publishTime>03/17/2021 17:37:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Dac.pdb">
-      <publishTime>10/12/2020 09:45:15</publishTime>
+      <publishTime>03/17/2021 17:37:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Entity.dll">
-      <publishTime>10/12/2020 09:45:15</publishTime>
+      <publishTime>03/17/2021 17:37:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Entity.pdb">
-      <publishTime>10/12/2020 09:45:15</publishTime>
+      <publishTime>03/17/2021 17:37:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Web.dll">
-      <publishTime>10/12/2020 09:45:16</publishTime>
+      <publishTime>03/17/2021 17:38:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Consent.Dfh.Web.pdb">
-      <publishTime>10/12/2020 09:45:16</publishTime>
+      <publishTime>03/17/2021 17:38:43</publishTime>
     </File>
     <File Include="bin/CLIP.e-Form.Server.Data.dll">
       <publishTime>08/04/2016 16:47:12</publishTime>
@@ -57,10 +57,10 @@
       <publishTime>08/04/2016 16:47:14</publishTime>
     </File>
     <File Include="Conf/ConsentSvcOracleMap.config">
-      <publishTime>09/02/2020 09:50:18</publishTime>
+      <publishTime>03/17/2021 15:49:51</publishTime>
     </File>
     <File Include="Conf/HospitalSvcOracleMap.config">
-      <publishTime>09/02/2020 09:50:13</publishTime>
+      <publishTime>03/17/2021 15:49:48</publishTime>
     </File>
     <File Include="Conf/Providers.config">
       <publishTime>08/04/2016 16:47:12</publishTime>
@@ -96,7 +96,7 @@
       <publishTime>10/12/2016 16:08:44</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Consent.Dfh.FormRepository.xml">
-      <publishTime>03/22/2018 16:07:14</publishTime>
+      <publishTime>03/17/2021 16:33:43</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Consent.Dfh.ResultMap.xml">
       <publishTime>11/30/2016 16:37:52</publishTime>
@@ -105,13 +105,13 @@
       <publishTime>09/07/2020 11:17:55</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Hospital.Dfh.PatList.xml">
-      <publishTime>09/04/2019 13:42:38</publishTime>
+      <publishTime>02/25/2021 10:42:43</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Hospital.Dfh.ResultMap.xml">
       <publishTime>10/12/2020 09:41:48</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Hospital.Dfh.User.xml">
-      <publishTime>10/12/2020 09:42:46</publishTime>
+      <publishTime>03/17/2021 16:27:28</publishTime>
     </File>
     <File Include="OracleQuery/CLIP.e-Form.Server.Code.xml">
       <publishTime>08/04/2016 16:47:12</publishTime>
@@ -138,7 +138,7 @@
       <publishTime>08/04/2016 16:47:12</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>10/12/2020 09:45:18</publishTime>
+      <publishTime>03/17/2021 17:37:48</publishTime>
     </File>
   </ItemGroup>
 </Project>

CLIP.e-Form.Consent.Dfh.Web/obj/Debug/Package/PackageTmp/OracleQuery/CLIP.e-Form.Hospital.Dfh.User.xml

@@ -226,7 +226,7 @@
                  to_char(to_date(#todd#, 'yyyymmdd'), 'yyyy-mm-dd')
        ]]>
       <isNotEqual property="status" compareValue="ALL">
-      <![CDATA[
+        <![CDATA[
              and a.consent_state in ($status$)
       ]]>
       </isNotEqual>