중간커밋

  - V2 적용 제외
  - 연속서식 작성 시 Device Type 에 타입과 버전정보, 기관코드 추가
  - 전자서명이미지 추가, 수정 API 추가

CLIP.e-Form.Consent.Dac/ConsentDac.cs

@@ -18,16 +18,16 @@ using System.Text;
 
 namespace CLIP.eForm.Consent.Dac {
   public class ConsentDac :DacBase {
-    public IList<ConsentVO> GetConsentSetList(ISqlMapper mapper, Hashtable param) {
-      return mapper.QueryForList<ConsentVO>("getUserFormSet", param);
+    public IList<ConsentFormListVO> GetConsentSetList(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForList<ConsentFormListVO>("getUserFormSet", param);
     }
 
-    public IList<ConsentVO> GetConsentBySearch(ISqlMapper mapper, Hashtable param) {
-      return mapper.QueryForList<ConsentVO>("GET_CONSENT_BY_SEARCH_LIST", param);
+    public IList<ConsentFormListVO> GetConsentBySearch(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForList<ConsentFormListVO>("GET_CONSENT_BY_SEARCH_LIST", param);
     }
 
-    public IList<ConsentVO> GetConsentList(ISqlMapper mapper, Hashtable param) {
-      return mapper.QueryForList<ConsentVO>("GET_CONSENT_LIST", param);
+    public IList<ConsentFormListVO> GetConsentList(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForList<ConsentFormListVO>("GET_CONSENT_LIST", param);
     }
 
     public object GetFormGuidByFormCd(ISqlMapper mapper, Hashtable param) {
@@ -58,8 +58,8 @@ namespace CLIP.eForm.Consent.Dac {
       return mapper.QueryForList<UnFinishedListVO>("GetUnfinishedListPerDoctor", param);
     }
 
-    public IList<ConsentVO> GetUnfinishedListPerUserName(ISqlMapper mapper, Hashtable param) {
-      return mapper.QueryForList<ConsentVO>("GetUnfinishedListPerUserName", param);
+    public IList<ConsentFormListVO> GetUnfinishedListPerUserName(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForList<ConsentFormListVO>("GetUnfinishedListPerUserName", param);
     }
 
     public String GetConsentStateCheck(ISqlMapper mapper, Hashtable param) {

CLIP.e-Form.Consent.Dac/UserDac.cs

@@ -124,6 +124,11 @@ namespace CLIP.eForm.Consent.Dac {
       return mapper.QueryForObject<UserSignDataVo>("SET_USER_SIGN_DATA", param);
     }
 
+    public String getUserName(ISqlMapper mapper, Hashtable param)
+    {
+      return mapper.QueryForObject<String>("GET_USER_NAME", param);
+    }
+
     #endregion
   }
 }

CLIP.e-Form.Consent.Entity/ConsentVO.cs

@@ -12,103 +12,74 @@ using System.ComponentModel;
 
 namespace CLIP.eForm.Consent.Entity
 {
-    /// <summary>
-    /// 동의서 전체목록 엔터티 클래스
-    /// </summary>
-    /// <remarks>
-    /// <p>[설계자]</p>
-    /// <p>  클립소프트 연구소 박민지 (minjipark@clipsoft.co.kr)</p>
-    /// <p>[원본 작성자]</p>
-    /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
-    /// <p>[수정 작성자]</p>
-    /// <p>  클립소프트 기술부 이인희</p>
-    /// <p>----------------------------------------------------------------------------------------</p>
-    /// <p>[HISTORY]</p>
-    /// <p> 2016-07-01	: 최초작성</p>
-    /// <p>----------------------------------------------------------------------------------------</p>
-    /// </remarks>
-    [Serializable]
-    public class ConsentVO
+  /// <summary>
+  /// 동의서 전체목록 엔터티 클래스
+  /// </summary>
+  /// <remarks>
+  /// <p>[설계자]</p>
+  /// <p>  클립소프트 연구소 박민지 (minjipark@clipsoft.co.kr)</p>
+  /// <p>[원본 작성자]</p>
+  /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
+  /// <p>[수정 작성자]</p>
+  /// <p>  클립소프트 기술부 이인희</p>
+  /// <p>----------------------------------------------------------------------------------------</p>
+  /// <p>[HISTORY]</p>
+  /// <p> 2016-07-01	: 최초작성</p>
+  /// <p>----------------------------------------------------------------------------------------</p>
+  /// </remarks>
+  [Serializable]
+  public class ConsentVO
+  {
+    public ConsentVO()
     {
-        public ConsentVO()
+      foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(this))
+      {
+        if (property.DisplayName == "ConsentMstRid" || property.DisplayName == "FormRid" || property.DisplayName == "OrderNo" || property.DisplayName == "PrntCnt" || property.DisplayName == "Cretno")
         {
-            foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(this))
-            {
-                if (property.DisplayName == "ConsentMstRid" 
-                  || property.DisplayName == "FormRid" 
-                  || property.DisplayName == "OrderNo" 
-                  || property.DisplayName == "printCnt"
-                  || property.DisplayName == "idx"
-                  || property.DisplayName == "formId"
-                  || property.DisplayName == "Cretno")
-                {
-                    property.SetValue(this, 0);
-                }
-                else
-                {
-                    property.SetValue(this, "");
-                }
-            }
+          property.SetValue(this, 0);
         }
-// V2 Entity
-    public int idx { get; set; }    // 즐겨찾기 삭제 시 사용 컬럼
-    public int formId { get; set; }
-    public string formCode { get; set; }
-    public string formName { get; set; }
-    public string formPrntNm { get; set; }
-    public int printCnt { get; set; }
-    public string certPass { get; set; }
-    public string pid { get; set; }
-    public string deptEngName { get; set; }
-    public string consentState { get; set; }
-    public int consentMstRid { get; set; }
-    public string ocrTag { get; set; }
-    public string patientName { get; set; }
-    public string modifyUserId { get; set; }
-    public string modifyUserNm { get; set; }
-    public string modifyDatetime { get; set; }
-    public string createDatetime { get; set; }
-    public string clnDate { get; set; }
-    public int cretNo { get; set; }
-    public string ordType { get; set; }
-    public string deptCd { get; set; }
-    public string mainDrId { get; set; }
-// V1 entity
-        //public int ConsentMstRid { get; set; }
-        public string ConsentName { get; set; }
-        //public string ConsentState { get; set; }
-        public string ConsentStateDisp { get; set; }
-        public string HosType { get; set; }
-        public string PatientCode { get; set; }
-        public string PatientName { get; set; }
-        public string VisitType { get; set; }
-        public string VisitTypeName { get; set; }
-        public string CosignDcId { get; set; }
-        public string CosignDcName { get; set; }
-        public string ClnDeptCd { get; set; }
-        public string ClnDeptNm { get; set; }
-        public string Doctor { get; set; }
-        public string Ward { get; set; }
-        public string RoomCd { get; set;  }
-        public string OcrNumber { get; set; }
-        public string CreateUserId { get; set; }
-        public string CreateDateTime { get; set; }
-        public string CreateUserName { get; set; }
-        //public string ClnDate { get; set; }
-        //public int Cretno { get; set; }
-        public string FormGuid { get; set; }
-        public string FormCd { get; set; }
-        public int FormRid { get; set; }
-        //public int PrntCnt { get; set; }
-        public int OrderNo { get; set; }
-        public string OrderCd { get; set; }
-        public string OrderNm { get; set; }
-        public string OcrTagYN { get; set; }
-        public string FormPrintName { get; set; }
-        public string UserDrFlag { get; set; }
-        public string PrntOnly { get; set; }
-        public string OpDiagName { get; set; }
-        public string OpName { get; set; }
-        public string OpRsrvNo { get; set; }
+        else
+        {
+          property.SetValue(this, "");
+        }
+      }
     }
+
+    public int ConsentMstRid { get; set; }
+    public string ConsentName { get; set; }
+    public string ConsentState { get; set; }
+    public string ConsentStateDisp { get; set; }
+    public string HosType { get; set; }
+    public string PatientCode { get; set; }
+    public string PatientName { get; set; }
+    public string VisitType { get; set; }
+    public string VisitTypeName { get; set; }
+    public string CosignDcId { get; set; }
+    public string CosignDcName { get; set; }
+    public string ClnDeptCd { get; set; }
+    public string ClnDeptNm { get; set; }
+    public string Doctor { get; set; }
+    public string Ward { get; set; }
+    public string RoomCd { get; set; }
+    public string OcrNumber { get; set; }
+    public string CreateUserId { get; set; }
+    public string CreateDateTime { get; set; }
+    public string CreateUserName { get; set; }
+    public string ClnDate { get; set; }
+    public int Cretno { get; set; }
+    public string FormGuid { get; set; }
+    public string FormCd { get; set; }
+    public int FormRid { get; set; }
+    public int PrntCnt { get; set; }
+    public int OrderNo { get; set; }
+    public string OrderCd { get; set; }
+    public string OrderNm { get; set; }
+    public string OcrTagYN { get; set; }
+    public string FormPrintName { get; set; }
+    public string UserDrFlag { get; set; }
+    public string PrntOnly { get; set; }
+    public string OpDiagName { get; set; }
+    public string OpName { get; set; }
+    public string OpRsrvNo { get; set; }
+  }
 }

CLIP.e-Form.Consent.UI/Agent App/TestPage.htm

@@ -42,7 +42,7 @@
 																 + "\"TEMP_SAVE\":\""      + "N"                            + "\","
 																 + "\"PRINT_CNT\":\""      + ""                             + "\","
 																 + "\"PRINT_YN\":\""       + "N"                            + "\","
-																 + "\"SYSINSTNM\":\""      + "본원교육"                      + "\","
+																 + "\"SYSINSTNM\":\""      + "본원"                      + "\","
 																 + "\"READONLY\":\""       + "N"                            + "\""
 																 + "},"
 										   + "\"USER_INFO\":"    + "{"    
@@ -83,7 +83,7 @@
                                  + "}"
                       + "}"
 
-                AxConsentAdapter.CallMethod("WINDOW_OPTION", "{\"SIZE\":\"MAXIMIZED\",\"TITLE\":\"CLIP e-Form™ Consent - 대구경북대학교병원 전자동의서\", \"CONTROLBOX\":\"TRUE\",\"MAXIMIZEBOX\":\"TRUE\", \"MINIMIZEBOX\":\"TRUE\"}");
+                AxConsentAdapter.CallMethod("WINDOW_OPTION", "{\"SIZE\":\"MAXIMIZED\",\"TITLE\":\"CLIP e-Form™ Consent - 영남대학교병원 전자동의서\", \"CONTROLBOX\":\"TRUE\",\"MAXIMIZEBOX\":\"TRUE\", \"MINIMIZEBOX\":\"TRUE\"}");
 
                 // runParam = JSON.stringify(paramJsonObjectMulti); //멀티서식을 테스트할 때 주석해제
                 AxConsentAdapter.CallMethod("EXEC_CONSENT", runParam);

CLIP.e-Form.Consent.UI/CLIP.e-Form.Consent.UI.csproj

@@ -265,6 +265,9 @@
     <Compile Include="WebMethodCommon.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Service References\HospitalSvcRef\CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
     <None Include="Service References\HospitalSvcRef\HospitalSvc.disco" />
     <None Include="Service References\ConsentSvcRef\ConsentSvc1.disco" />
     <None Include="Service References\ConsentSvcRef\ConsentSvc1.wsdl" />
@@ -289,9 +292,6 @@
     <None Include="Service References\ConsentSvcRef\CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentImageVO.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Service References\ConsentSvcRef\CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
     <None Include="Service References\ConsentSvcRef\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>

CLIP.e-Form.Consent.UI/Common.cs

@@ -44,166 +44,15 @@ namespace CLIP.eForm.Consent.UI {
             return dic;
         }
 
-        /// <summary>
-        /// Dictionary 에서 FOS 형식으로 인코딩
-        /// V2 버전, 다중 서식 목록 지원
-        /// </summary>
-        /// <param name="parameterMap">변환할 Disctionary</param>
-        /// <returns>변환된 FOS string</returns>
-        public static String createParameters(Dictionary<FOSParameter, String> parameterMap)
-        {
-          StringBuilder sb = new StringBuilder();
-
-          if (parameterMap == null)
-          {
-            return "";
-          }
-          foreach (FOSParameter paramKey in parameterMap.Keys)
-          {
-            sb.AppendFormat("<param key=\"{0}\"><![CDATA[{1}]]></param>", GetFOSName(paramKey, "DCUMC"), parameterMap[paramKey]);
-          }
-
-          return sb.ToString();
-        }
+    public static Boolean isCompressed = false;
 
         /// <summary>
-        /// V2 버전 FOS string 반환(임시)
+        /// param, guid값을 넘겨받아 그를 포함하는 fos를 리턴한다.
         /// </summary>
-        /// <param name="formServiceUrl"></param>
-        /// <param name="baseConsentSvcURL"></param>
-        /// <param name="globalParams"></param>
-        /// <param name="formIds"></param>
-        /// <param name="consentMstRids"></param>
+        /// <param name="guid"></param>
+        /// <param name="fosParams"></param>
         /// <returns></returns>
-        public static String getNewEptFosString(String formServiceUrl, string baseConsentSvcURL, Dictionary<FOSParameter, String> globalParams, List<String> formIds, List<String> consentMstRids)
-        {
-          StringBuilder sb = new StringBuilder();
-          sb.Append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-          sb.Append("<fos version=\"1.0\">");
-          sb.Append("<global>");
-          sb.Append(string.Format("<page-template path=\"{0}\" request-encode=\"utf-8\" response-encode=\"utf-8\">", formServiceUrl));
-          sb.Append("<template-get-parameters>");
-          sb.Append("<post-param key=\"parameter\"><![CDATA[{}]]></post-param>");
-          sb.Append("</template-get-parameters>");
-          sb.Append("<parameters>");
-          sb.Append("</parameters>");
-          sb.Append("</page-template>");
-          sb.Append("</global>");
-          sb.Append("<form-list>");
-
-          // 서식 open 시퀀스
-          var seq = 1;
-          var i = 0;
-          var path = baseConsentSvcURL + "FormSvc.aspx/";
-          foreach (string formId in formIds)
-          {
-            // 서식을 불러오기 위한 서식 정보 목록 요소
-            sb.Append(string.Format("<form name=\"{0}\" open-sequence=\"{1}\" path=\"{2}\" request-encode=\"utf-8\" response-encode=\"utf-8\" compression=\"false\">", "noname", seq++, path));
-            sb.Append("<parameters>");
-            sb.Append(createParameters(globalParams));
-            sb.Append("</parameters>");
-            sb.Append("<form-get-parameters>");
-            sb.Append("<post-param key=\"use-repository\"><![CDATA[false]]></post-param>");
-            // 서식을 불러오기 위한 서비스 파리미터 
-            sb.Append(String.Format("<post-param key=\"ConsentMstRid\"><![CDATA[{0}]]></post-param>", consentMstRids[i++].ToString()));
-            sb.Append("<post-param key=\"DUMMY\"><![CDATA[DUMMY]]></post-param>");
-
-            sb.Append("</form-get-parameters>");
-            sb.Append("</form>");
-          }
-
-          sb.Append("</form-list>");
-          sb.Append("</fos>");
-
-          return sb.ToString();
-        }
-
-        /// <summary>
-        /// V2 버전 FOS string 반환
-        /// </summary>
-        /// <param name="formServiceUrl">전자동의서 서버 URL</param>
-        /// <param name="globalParams">글로벌 파라미터 목록</param>
-        /// <param name="listParams">리스트 파라미터 목록</param>
-        /// <returns>생성된 fos string</returns>
-        public static String getNewFosString(String formServiceUrl, Dictionary<FOSParameter, String> globalParams, Dictionary<FOSParameter, string> fosFormParams, List<String> formIds)
-        {
-          StringBuilder sb = new StringBuilder();
-
-          sb.Append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-          sb.Append("<fos version=\"1.0\">");
-          sb.Append("<global>");
-          sb.Append(string.Format("<page-template path=\"{0}\" request-encode=\"utf-8\" response-encode=\"utf-8\">", formServiceUrl));
-          sb.Append("<template-get-parameters>");
-          sb.Append("<post-param key=\"parameter\"><![CDATA[{}]]></post-param>");
-          sb.Append("</template-get-parameters>");
-          sb.Append("</page-template>");
-          sb.Append("<parameters>");
-          sb.Append(createParameters(globalParams));
-          sb.Append("</parameters>");
-          sb.Append("</global>");
-          sb.Append("<form-list>");
-
-          // 서식 open 시퀀스
-          var seq = 1;
-          foreach (string formId in formIds)
-          {
-            // 서식을 불러오기 위한 서식 정보 목록 요소
-            sb.Append(string.Format("<form name=\"{0}\" open-sequence=\"{1}\" path=\"{2}\" request-encode=\"utf-8\" response-encode=\"utf-8\" compression=\"false\">", "noname", seq++, formServiceUrl));
-            // 서식을 불러오기 위한 서비스 파리미터 상위 요소(서비스 호출시 사용)
-            sb.Append("<form-get-parameters>");
-            sb.Append("<post-param key=\"parameter\"><![CDATA[{");
-            // 서식을 불러오기 위한 서비스 파리미터 
-            sb.Append(string.Format("\"formId\":{0}, \"formVersion\":\"{1}\"", formId, "-1"));
-            sb.Append("}]]></post-param>");
-            sb.Append("</form-get-parameters>");
-
-            // 서식에 사용되는 파라미터 목록 요소
-            sb.Append("<parameters>");
-            sb.Append(createParameters(globalParams));
-            sb.Append("</parameters>");
-
-            // 서식에 필요한 첨부 파일 목록 요소
-            //sb.Append("<attachments>");
-            //<record-files>  //음성 녹음 파일 목록 요소
-            //  <record-file>   // 음성 녹음 파일
-            //</record-files>
-            //<pen-drawing>   // 펜 정보를 불러올 수 있는 정보 목록 요소
-            //  <document/>   // 본문(기존 디자인 되어있는 여역)의 펜 정보를 불러올 수 있는 URL 정보를 가지고 있는 요소
-            //  <pen-drawing-get-parameters/>   // 본문(기존 디자인 되어있는 영역)의 펜 정보를 조회하기 위한 파라미터 묶음
-            //    <post-param>    // 본문(기존 디자인 되어있는 영역)의 펜 정보를 조회하기 위한 파라미터
-            //</pen-drawing>
-            //<page-template-list>    // 서식에 추가할 페이지 템플릿 리스트
-            //  <page_template>       // 서식에 추가할 페이지 템플릿 정보
-            //    <template-get-parameters>   // 페이지 템플릿 추가 시 사용되는 파라미터 묶음
-            //      <post-param>      // 페이지 템플릿 추가 시 사용되는 파라미터
-            //sb.Append("</attachments>");
-
-            // 서식에서 불로올 데이터 정보
-            //sb.Append("<form-data>");
-            //sb.Append("</form-data>");
-
-            // 서식에 반영되는 페이지 템플릿 목록을 조회하기 위한 상위 요소
-            //sb.Append("<page-template>");
-            //<template-get-parameters>  //서식에 반영되는 페이지 템플릿 목록을 조회하기 위한 파라미터 묶음
-            //  <post_param>    // 서식에 반영되는 페이지 템플릿 목록을 조회하기 위한 파라미터
-            //sb.Append("</page-template>");
-
-            sb.Append("</form>");
-          }
-
-          sb.Append("</form-list>");
-          sb.Append("</fos>");
-
-          return sb.ToString();
-        }
-
-    /// <summary>
-    /// param, guid값을 넘겨받아 그를 포함하는 fos를 리턴한다.
-    /// </summary>
-    /// <param name="guid"></param>
-    /// <param name="fosParams"></param>
-    /// <returns></returns>
-    public static string GetFosString(List<string> guids, string formServiceUrl, Dictionary<FOSParameter, string> fosGlobalParams, Dictionary<string, Dictionary<FOSParameter, string>> fosFormParams, string pInstCd) {
+        public static string GetFosString(List<string> guids, string formServiceUrl, Dictionary<FOSParameter, string> fosGlobalParams, Dictionary<string, Dictionary<FOSParameter, string>> fosFormParams, string pInstCd) {
             StringBuilder fos = new StringBuilder();
             fos.Append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
             fos.Append("<fos version=\"1.0\">");
@@ -404,6 +253,7 @@ namespace CLIP.eForm.Consent.UI {
         /// <returns></returns>
         public static string GetFosStringForEpt(Dictionary<string, string> actionParams, string formServiceUrl, Dictionary<FOSParameter, string> fosGlobalParams, string pInstCd) {
 
+            bool isCompress = Common.isCompressed;
             StringBuilder fos = new StringBuilder();
             fos.Append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
             fos.Append("<fos version=\"1.0\">");
@@ -423,6 +273,7 @@ namespace CLIP.eForm.Consent.UI {
             fos.Append("</global>");
             fos.Append("<form-list>");
             fos.Append(string.Format("<form name=\"noname\" open-sequence=\"1\" path=\"{0}\" request-encode=\"utf-8\" response-encode=\"utf-8\">", formServiceUrl));
+            //fos.Append(string.Format("<form name=\"noname\" open-sequence=\"1\" path=\"{0}\" request-encode=\"utf-8\" response-encode=\"utf-8\" {1}>", formServiceUrl, (isCompress) ? "compression =\"true\"" : ""));
             fos.Append("<parameters />");
             fos.Append("<form-get-parameters>");
             fos.Append("<post-param key=\"OP\"><![CDATA[VIEWER_DATA]]></post-param>");

CLIP.e-Form.Consent.UI/ConsentListTabElements/ConsentSelectTabConsentSearch.cs

@@ -234,14 +234,13 @@ namespace CLIP.eForm.Consent.UI {
           return;
         }
 
-        //ConsentFormListVO[] arrayData = consentWebService.GetConsentBySearch(consentType, keyWord, consentMain.ConsentExecuteInfo["dutinstcd"]);
-        ConsentVO[] arrayData = consentWebService.GetConsentBySearch("4", keyWord, "031");
+        ConsentFormListVO[] arrayData = consentWebService.GetConsentBySearch(consentType, keyWord, consentMain.ConsentExecuteInfo["dutinstcd"]);
 
         if (arrayData == null) {
           return;
         }
 
-        this.dataGridViewConsentSelectResult.DataSource = new SortableBindingList<ConsentSvcRef.ConsentVO>(arrayData);
+        this.dataGridViewConsentSelectResult.DataSource = new SortableBindingList<ConsentSvcRef.ConsentFormListVO>(arrayData);
       } catch (Exception ex) {
         throw ex;
       } finally {

CLIP.e-Form.Consent.UI/ConsentListTabElements/ConsentSelectTabPageAll.cs

@@ -309,7 +309,7 @@ namespace CLIP.eForm.Consent.UI {
 
             }
             //ConsentVO[] resultData = consentWebService.GetConsentList(patientCode
-            //                                                        , sDate
+            //                                                        , sDateF
             //                                                        , eDate
             //                                                        , consentState
             //                                                        , string.Empty
@@ -592,13 +592,14 @@ namespace CLIP.eForm.Consent.UI {
     }
 
     //동의서의 처방일자와 생성번호 등의 정보가 현재 정보와 일치하지 않은 경우, 미리보기를 위해서 데이터를 재조회한다.
-    private void CheckClnDateInfo(ConsentVO vo) {
+    private void CheckClnDateInfo(ConsentFormListVO vo) {
+      /*
       bool bSame = true;
 
-      if (!vo.clnDate.Replace("-", "").Equals(commandControl.CurrentTargetPatient.clnDate.Replace("-", "")))
+      if (!vo.ClnDate.Replace("-", "").Equals(commandControl.CurrentTargetPatient.clnDate.Replace("-", "")))
         bSame = false;
 
-      if (!vo.cretNo.ToString().Equals(commandControl.CurrentTargetPatient.cretno))
+      if (!vo.Cretno.ToString().Equals(commandControl.CurrentTargetPatient.cretno))
         bSame = false;
 
       if (!vo.ClnDeptCd.Equals(commandControl.CurrentTargetPatient.clnDeptCode))
@@ -609,11 +610,12 @@ namespace CLIP.eForm.Consent.UI {
 
       if (bSame == false) {
         //동의서 맵핑 정보를 상단의 선택된 진료일과 작성자 정보로 한다.
-        consentMain.PatientInfoCtrl.SetPatientByConsentInfo(vo.clnDate.Replace("-", ""),
+        consentMain.PatientInfoCtrl.SetPatientByConsentInfo(vo.ClnDate.Replace("-", ""),
                                                             vo.VisitType,
                                                             vo.ClnDeptCd,
-                                                            vo.cretNo.ToString());
+                                                            vo.Cretno.ToString());
       }
+      */
     }
     #endregion
 

CLIP.e-Form.Consent.UI/ConsentListTabElements/ConsentSelectTabPageUnfinished.cs

@@ -217,8 +217,8 @@ namespace CLIP.eForm.Consent.UI {
 
     #region 동의서 미리보기
     //선택된 Row의 ConsentVO 객체를 반환한다.
-    private ConsentVO GetCurrentConsentVO(int rowIndex) {
-      ConsentVO vo = null;
+    private ConsentFormListVO GetCurrentConsentVO(int rowIndex) {
+      ConsentFormListVO vo = null;
 
       if(rowIndex < 0) {
         return vo;
@@ -228,7 +228,7 @@ namespace CLIP.eForm.Consent.UI {
         this.dataGridViewConsentSelectResult.Rows[rowIndex].Selected = true;
         //this.dataGridViewConsentSelectResult.CurrentCell = this.dataGridViewConsentSelectResult.Rows[rowIndex].Cells[0];
 
-        vo = this.dataGridViewConsentSelectResult.Rows[rowIndex].DataBoundItem as ConsentVO;
+        vo = this.dataGridViewConsentSelectResult.Rows[rowIndex].DataBoundItem as ConsentFormListVO;
       }
 
       return vo;
@@ -238,7 +238,7 @@ namespace CLIP.eForm.Consent.UI {
     /// 선택된 ConsentVO 객체를 미리보기 실행한다.
     /// </summary>
     /// <param name="vo">The vo.</param>
-    private void ExecutePreviewWithSelectedConsent(ConsentVO vo) {
+    private void ExecutePreviewWithSelectedConsent(ConsentFormListVO vo) {
       if(consentMain == null) consentMain = ConsentMainControl.GetConsentMainInterface(this);
       if(commandControl == null) commandControl = consentMain.ConsentCommandCtrl as ConsentCommandCtrl;
 
@@ -247,41 +247,41 @@ namespace CLIP.eForm.Consent.UI {
 
       if(rdoUser.Checked) {
 
-        consentMain.ConsentExecuteInfo["patientNo"] = vo.PatientCode;
-        consentMain.ConsentExecuteInfo["clnDate"] = vo.clnDate.Replace("-", "");
-        consentMain.ConsentExecuteInfo["visitType"] = vo.VisitType;
-        consentMain.ConsentExecuteInfo["clnDept"] = vo.ClnDeptCd;
+        consentMain.ConsentExecuteInfo["patientNo"] = vo.pid;
+        consentMain.ConsentExecuteInfo["clnDate"] = vo.inDd.Replace("-", "");
+        consentMain.ConsentExecuteInfo["visitType"] = vo.ordType;
+        consentMain.ConsentExecuteInfo["clnDept"] = vo.ordDeptCd;
         consentMain.ConsentExecuteInfo["cretno"] = vo.cretNo.ToString();
-        consentMain.ConsentExecuteInfo["opRsrvNo"] = vo.OpRsrvNo;
+        consentMain.ConsentExecuteInfo["opRsrvNo"] = vo.opRsrvNo;
 
         consentMain.SetPatientInfo();
       }
 
       commandControl.CurrentPreviewConsent = new PreviewConsent {
-        formRid = vo.FormRid.ToString(),
-        formGuid = vo.FormGuid,
-        formCd = vo.FormCd.ToString(),
-        FormName = vo.ConsentName,
-        formPrintName = vo.FormPrintName,
+        formRid = vo.formRid.ToString(),
+        formGuid = vo.formGuid,
+        formCd = vo.formCd.ToString(),
+        FormName = vo.formName,
+        formPrintName = vo.formPrntNm,
         prntCnt = vo.printCnt,
         consentMstRid = vo.consentMstRid.ToString(),
         consentStateEngnm = vo.consentState,
-        orderNo = vo.OrderNo,
-        ocrCode = vo.OcrNumber,
-        inputId = vo.CreateUserId,
-        inputNm = vo.CreateUserName,
+        orderNo = vo.cretNo,
+        ocrCode = vo.ocrTag,
+        inputId = vo.createUserId,
+        inputNm = vo.createUserName,
         ReissueConsentMstRid = 0,
         RewriteConsentMstRid = 0,
-        ordType = vo.VisitType,
-        ocrtagPrntyn = vo.OcrTagYN,
-        userDrFlag = vo.UserDrFlag,
-        printOnly = vo.PrntOnly,
-        opDiagName = vo.OpDiagName,
+        ordType = vo.ordType,
+        ocrtagPrntyn = vo.ocrTagPrntYn,
+        userDrFlag = vo.userDrFlag,
+        printOnly = vo.printOnly,
+        opDiagName = vo.opDiagNm,
         //drOnly = vo.DrOnly,
-        opName = vo.OpName
+        opName = vo.opNm
       };
 
-      consentMain.PatientInfoCtrl.SetConsentDocumentName(vo.ConsentName);
+      consentMain.PatientInfoCtrl.SetConsentDocumentName(vo.formName);
 
       switch(vo.consentState.ToUpper()) {
         // 임시저장
@@ -335,30 +335,30 @@ namespace CLIP.eForm.Consent.UI {
     /// 미리보기를 위해서 데이터를 재조회한다.
     /// </summary>
     /// <param name="vo">조회할 ConsentVO 인스턴스</param>
-    private void CheckClnDateInfo(ConsentVO vo) {
+    private void CheckClnDateInfo(ConsentFormListVO vo) {
       if(consentMain == null) consentMain = ConsentMainControl.GetConsentMainInterface(this);
       if(commandControl == null) commandControl = consentMain.ConsentCommandCtrl as ConsentCommandCtrl;
       if(commandControl.CurrentTargetPatient == null) return;
 
       bool bSame = true;
 
-      if(!string.IsNullOrEmpty(vo.clnDate) && !vo.clnDate.Replace("-", "").Equals(commandControl.CurrentTargetPatient.clnDate.Replace("-", "")))
+      if(!string.IsNullOrEmpty(vo.inDd) && !vo.inDd.Replace("-", "").Equals(commandControl.CurrentTargetPatient.clnDate.Replace("-", "")))
         bSame = false;
 
       if(!vo.cretNo.ToString().Equals(commandControl.CurrentTargetPatient.cretno))
         bSame = false;
 
-      if(!string.IsNullOrEmpty(vo.ClnDeptCd) && !vo.ClnDeptCd.Equals(commandControl.CurrentTargetPatient.clnDeptCode))
+      if(!string.IsNullOrEmpty(vo.ordDeptCd) && !vo.ordDeptCd.Equals(commandControl.CurrentTargetPatient.clnDeptCode))
         bSame = false;
 
-      if(!string.IsNullOrEmpty(vo.VisitType) && !vo.VisitType.Equals(commandControl.CurrentTargetPatient.VisitType))
+      if(!string.IsNullOrEmpty(vo.ordType) && !vo.ordType.Equals(commandControl.CurrentTargetPatient.VisitType))
         bSame = false;
 
       if(bSame == false) {
         //동의서 맵핑 정보를 상단의 선택된 진료일과 작성자 정보로 한다.
-        consentMain.PatientInfoCtrl.SetPatientByConsentInfo(vo.clnDate.Replace("-", ""),
-                                                            vo.VisitType,
-                                                            vo.ClnDeptCd,
+        consentMain.PatientInfoCtrl.SetPatientByConsentInfo(vo.inDd.Replace("-", ""),
+                                                            vo.ordType,
+                                                            vo.ordDeptCd,
                                                             vo.cretNo.ToString());
       }
     }
@@ -378,7 +378,7 @@ namespace CLIP.eForm.Consent.UI {
       if(e.RowIndex < 0) {
         return;
       }
-      ConsentVO vo = GetCurrentConsentVO(e.RowIndex);
+      ConsentFormListVO vo = GetCurrentConsentVO(e.RowIndex);
 
       // dbs227, 출력된 동의서는 미리보기를 하지 않는다
       if(vo.consentState.Equals("PAPER_OUT")) {
@@ -391,7 +391,7 @@ namespace CLIP.eForm.Consent.UI {
         // 선택된 동의서가 현재 보여지고 있는 동의서와 다른 경우, 임시 저장 여부 확인
         if(!consentMain.ConsentExecuteInfo["readOnly"].Equals("Y") &&
             !string.IsNullOrEmpty(commandControl.CurrentTargetPatient.PatientCode) &&
-            commandControl.CurrentPreviewConsent != null && !commandControl.CurrentPreviewConsent.formRid.Equals(vo.FormRid.ToString()) &&
+            commandControl.CurrentPreviewConsent != null && !commandControl.CurrentPreviewConsent.formRid.Equals(vo.formRid.ToString()) &&
             (commandControl.CurrentPreviewConsent.consentState == string.Empty || commandControl.CurrentPreviewConsent.consentState == "TEMP")) {
           // dbs227, 임시저장 팝업 사용 안함
           //DialogResult result = MessageBox.Show(string.Format(Properties.Resources.msg_confirm_tempsave)
@@ -424,9 +424,9 @@ namespace CLIP.eForm.Consent.UI {
 
       if(e.RowIndex >= 0 && this.dataGridViewConsentSelectResult.Rows[e.RowIndex].Selected == true) {
 
-        ConsentVO vo = GetCurrentConsentVO(e.RowIndex);
+        ConsentFormListVO vo = GetCurrentConsentVO(e.RowIndex);
 
-        if(commandControl.CurrentPreviewConsent != null && commandControl.CurrentEndUser.UserNo.Equals(vo.CreateUserId)) {
+        if(commandControl.CurrentPreviewConsent != null && commandControl.CurrentEndUser.UserNo.Equals(vo.createUserId)) {
           // 임시저장의 경우 삭제의 메뉴와 이벤트를 할당한다
           if(vo.consentState.Equals("TEMP") || vo.consentState.Equals("ELECTR_CMP")) {
             ContextMenuStrip strip = new ContextMenuStrip();
@@ -485,7 +485,7 @@ namespace CLIP.eForm.Consent.UI {
           try {
             this.Cursor = Cursors.WaitCursor;
 
-            ConsentVO vo = GetCurrentConsentVO(this.dataGridViewConsentSelectResult.SelectedRows[0].Index);
+            ConsentFormListVO vo = GetCurrentConsentVO(this.dataGridViewConsentSelectResult.SelectedRows[0].Index);
             commandControl.CurrentPreviewConsent.ReissueConsentMstRid = vo.consentMstRid;
             //consentMain.ConsentCommandCtrl.DeleteRecordOfDeleteConsent(reason);
 

CLIP.e-Form.Consent.UI/ConsentMainControl.cs

@@ -104,10 +104,9 @@ namespace CLIP.eForm.Consent.UI
     /// <param name="callParam">The call parameter.</param>
     public ConsentMainControl(object callParam)
     {
+      //MessageBox.Show("Waiting");
       InitializeComponent();
 
-      MessageBox.Show("Waiting");
-
       bool isMultiParams = false;
       ToolTip _toolTip = new ToolTip();
       _toolTip.AutoPopDelay = 5000;
@@ -1009,29 +1008,28 @@ namespace CLIP.eForm.Consent.UI
       string widthValue = "9";    // 기본 굵기
       System.Drawing.Color color = Color.FromArgb(127, 255, 255, 1);  // 기본색
 
-      //디버그를 위해 잠시 막아둠
-      //if (hospitalWebService != null)
-      //{
-      //  apiResult = hospitalWebService.getPenOptions(ConsentExecuteInfo["dutinstcd"]);
-      //  if (apiResult.Length > 0)
-      //  {
-      //    penOtps = apiResult.Split(',');
-      //    int alpha = Convert.ToInt32(penOtps[1]);
-      //    int MULTI_CONST = 254;
-      //    int MULTI_PEPRC = 100;
-
-      //    string hexValue = penOtps[0].Replace("#", "");
-
-      //    color = Color.FromArgb(Convert.ToInt32(penOtps[1]),
-      //        Convert.ToInt32(hexValue.Substring(0, 2), 16),
-      //        Convert.ToInt32(hexValue.Substring(2, 2), 16),
-      //        Convert.ToInt32(hexValue.Substring(4, 2), 16));
-      //    //color = System.Drawing.ColorTranslator.FromHtml(penOtps[0]);
-      //    widthValue = penOtps[2];
-      //  }
-      //}
+      if (hospitalWebService != null)
+      {
+        apiResult = hospitalWebService.getPenOptions(ConsentExecuteInfo["dutinstcd"]);
+        if (apiResult.Length > 0)
+        {
+          penOtps = apiResult.Split(',');
+          int alpha = Convert.ToInt32(penOtps[1]);
+          int MULTI_CONST = 254;
+          int MULTI_PEPRC = 100;
+
+          string hexValue = penOtps[0].Replace("#", "");
+
+          color = Color.FromArgb(Convert.ToInt32(penOtps[1]),
+              Convert.ToInt32(hexValue.Substring(0, 2), 16),
+              Convert.ToInt32(hexValue.Substring(2, 2), 16),
+              Convert.ToInt32(hexValue.Substring(4, 2), 16));
+          //color = System.Drawing.ColorTranslator.FromHtml(penOtps[0]);
+          widthValue = penOtps[2];
+        }
+      }
+
 
-      eFormViewerCtrl.SetRunOption("RUN_AS_REPOSITORY_V2", "true"); //v2 설정
       //this.eFormViewerCtrl.SetRunOption("ENABLE_DEBUG_VIEW", "true");
       //this.eFormViewerCtrl.SetRunOption("DEFAULT_TOOL_BAR_VISIBLE", "true");
       this.eFormViewerCtrl.SetRunOption("USE_CREDITCARD_SIGNPAD", "false");
@@ -1057,8 +1055,8 @@ namespace CLIP.eForm.Consent.UI
       // dbs227, 경북대학교병원 요청사항
       // 마우스 우클릭 그리기 모드 변경
       this.eFormViewerCtrl.SetRunOption("SET_MOUSE_RIGHT_CHANGE_MODE", "Drawing");
-	  // true 로 설정 시 TabPoint 프로그램을 통한 듀얼 모니터 제어
-	  // false 로 설정 시 윈도우 드라이버로 듀얼 보니터 제어
+      // true 로 설정 시 TabPoint 프로그램을 통한 듀얼 모니터 제어
+      // false 로 설정 시 윈도우 드라이버로 듀얼 보니터 제어
       //this.eFormViewerCtrl.SetRunOption("USE_DUALVIEWER_ACU", "true");
 
       if (HasVerticalMonitor)
@@ -2048,17 +2046,11 @@ namespace CLIP.eForm.Consent.UI
             globalParams[FOSParameter.SignTime] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             globalParams[FOSParameter.PrintIp] = ConsentExecuteInfo["printIP"];
 
-            //string fos = Common.GetFosString(formGuids
-            //                               , PluginExecuteInfo["formServiceUrl"]
-            //                               , globalParams
-            //                               , null
-            //                               , ConsentExecuteInfo["dutinstcd"]);
-
-            //v2로 수정
-            string fos = Common.getNewFosString(PluginExecuteInfo["formServiceUrl"],
-              globalParams,
-              null,
-              new List<String> { consentCommandCtrl.CurrentPreviewConsent.formRid });
+            string fos = Common.GetFosString(formGuids
+                                           , PluginExecuteInfo["formServiceUrl"]
+                                           , globalParams
+                                           , null
+                                           , ConsentExecuteInfo["dutinstcd"]);
 
             // TODO 원무 인증 저장 pass
             // 원무 동의서는 인증저장을 하지 않는다
@@ -2636,6 +2628,12 @@ namespace CLIP.eForm.Consent.UI
         }
 
         ConsentExecuteInfo["printIP"] = printIp;
+
+        //버전정보
+        string[] versionName = Assembly.GetExecutingAssembly().FullName.Split(',')[1].Split('.');
+        string version = versionName[versionName.Length - 1];
+        ConsentExecuteInfo["DeviceType"] = "WIN," + version + "," + ConsentExecuteInfo["dutinstcd"];
+
       } catch (Exception ex) {
         throw ex;
       }

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="ConsentVO" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO, Service References.ConsentSvcRef.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/ConsentSvc1.wsdl

@@ -81,88 +81,7 @@
       <s:element name="GetConsentListByUserNameResponse">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetConsentListByUserNameResult" type="tns:ArrayOfConsentVO" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfConsentVO">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="ConsentVO" nillable="true" type="tns:ConsentVO" />
-        </s:sequence>
-      </s:complexType>
-      <s:complexType name="ConsentVO">
-        <s:sequence>
-          <s:element minOccurs="1" maxOccurs="1" name="idx" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="formId" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="formCode" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="formName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="formPrntNm" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="printCnt" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="certPass" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="pid" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="deptEngName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="consentState" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="consentMstRid" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="ocrTag" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="patientName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="modifyUserId" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="modifyUserNm" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="modifyDatetime" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="createDatetime" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="clnDate" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="cretNo" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="ordType" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="deptCd" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="mainDrId" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="ConsentName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="ConsentStateDisp" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="HosType" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="PatientCode" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="PatientName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="VisitType" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="VisitTypeName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="CosignDcId" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="CosignDcName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="ClnDeptCd" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="ClnDeptNm" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Doctor" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="Ward" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="RoomCd" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OcrNumber" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="CreateUserId" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="CreateDateTime" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="CreateUserName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="FormGuid" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="FormCd" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="FormRid" type="s:int" />
-          <s:element minOccurs="1" maxOccurs="1" name="OrderNo" type="s:int" />
-          <s:element minOccurs="0" maxOccurs="1" name="OrderCd" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OrderNm" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OcrTagYN" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="FormPrintName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="UserDrFlag" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="PrntOnly" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OpDiagName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OpName" type="s:string" />
-          <s:element minOccurs="0" maxOccurs="1" name="OpRsrvNo" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:element name="GetConsentList">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="patientCode" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="startDt" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="endDt" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="consentState" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="instCd" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="userId" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetConsentListResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetConsentListResult" type="tns:ArrayOfConsentFormListVO" />
+            <s:element minOccurs="0" maxOccurs="1" name="GetConsentListByUserNameResult" type="tns:ArrayOfConsentFormListVO" />
           </s:sequence>
         </s:complexType>
       </s:element>
@@ -206,6 +125,25 @@
           <s:element minOccurs="0" maxOccurs="1" name="DrOnly" type="s:string" />
         </s:sequence>
       </s:complexType>
+      <s:element name="GetConsentList">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="patientCode" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="startDt" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="endDt" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="consentState" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="instCd" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userId" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="GetConsentListResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="GetConsentListResult" type="tns:ArrayOfConsentFormListVO" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
       <s:element name="GetConsentBySearch">
         <s:complexType>
           <s:sequence>

CLIP.e-Form.Consent.UI/Service References/ConsentSvcRef/Reference.cs

@@ -97,876 +97,6 @@ namespace CLIP.eForm.Consent.UI.ConsentSvcRef {
         }
     }
     
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="ConsentVO", Namespace="http://tempuri.org/")]
-    [System.SerializableAttribute()]
-    public partial class ConsentVO : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
-        
-        [System.NonSerializedAttribute()]
-        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
-        
-        private int idxField;
-        
-        private int formIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string formCodeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string formNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string formPrntNmField;
-        
-        private int printCntField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string certPassField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string pidField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string deptEngNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string consentStateField;
-        
-        private int consentMstRidField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ocrTagField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string patientNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string modifyUserIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string modifyUserNmField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string modifyDatetimeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string createDatetimeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string clnDateField;
-        
-        private int cretNoField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ordTypeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string deptCdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string mainDrIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ConsentNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ConsentStateDispField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string HosTypeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string PatientCodeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string PatientName1Field;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string VisitTypeField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string VisitTypeNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string CosignDcIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string CosignDcNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ClnDeptCdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string ClnDeptNmField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string DoctorField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string WardField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string RoomCdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OcrNumberField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string CreateUserIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string CreateDateTime1Field;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string CreateUserNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string FormGuidField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string FormCdField;
-        
-        private int FormRidField;
-        
-        private int OrderNoField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OrderCdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OrderNmField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OcrTagYNField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string FormPrintNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string UserDrFlagField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string PrntOnlyField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OpDiagNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OpNameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string OpRsrvNoField;
-        
-        [global::System.ComponentModel.BrowsableAttribute(false)]
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
-            get {
-                return this.extensionDataField;
-            }
-            set {
-                this.extensionDataField = value;
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
-        public int idx {
-            get {
-                return this.idxField;
-            }
-            set {
-                if ((this.idxField.Equals(value) != true)) {
-                    this.idxField = value;
-                    this.RaisePropertyChanged("idx");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=1)]
-        public int formId {
-            get {
-                return this.formIdField;
-            }
-            set {
-                if ((this.formIdField.Equals(value) != true)) {
-                    this.formIdField = value;
-                    this.RaisePropertyChanged("formId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)]
-        public string formCode {
-            get {
-                return this.formCodeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.formCodeField, value) != true)) {
-                    this.formCodeField = value;
-                    this.RaisePropertyChanged("formCode");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)]
-        public string formName {
-            get {
-                return this.formNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.formNameField, value) != true)) {
-                    this.formNameField = value;
-                    this.RaisePropertyChanged("formName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)]
-        public string formPrntNm {
-            get {
-                return this.formPrntNmField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.formPrntNmField, value) != true)) {
-                    this.formPrntNmField = value;
-                    this.RaisePropertyChanged("formPrntNm");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=5)]
-        public int printCnt {
-            get {
-                return this.printCntField;
-            }
-            set {
-                if ((this.printCntField.Equals(value) != true)) {
-                    this.printCntField = value;
-                    this.RaisePropertyChanged("printCnt");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=6)]
-        public string certPass {
-            get {
-                return this.certPassField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.certPassField, value) != true)) {
-                    this.certPassField = value;
-                    this.RaisePropertyChanged("certPass");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=7)]
-        public string pid {
-            get {
-                return this.pidField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.pidField, value) != true)) {
-                    this.pidField = value;
-                    this.RaisePropertyChanged("pid");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=8)]
-        public string deptEngName {
-            get {
-                return this.deptEngNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.deptEngNameField, value) != true)) {
-                    this.deptEngNameField = value;
-                    this.RaisePropertyChanged("deptEngName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=9)]
-        public string consentState {
-            get {
-                return this.consentStateField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.consentStateField, value) != true)) {
-                    this.consentStateField = value;
-                    this.RaisePropertyChanged("consentState");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=10)]
-        public int consentMstRid {
-            get {
-                return this.consentMstRidField;
-            }
-            set {
-                if ((this.consentMstRidField.Equals(value) != true)) {
-                    this.consentMstRidField = value;
-                    this.RaisePropertyChanged("consentMstRid");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=11)]
-        public string ocrTag {
-            get {
-                return this.ocrTagField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ocrTagField, value) != true)) {
-                    this.ocrTagField = value;
-                    this.RaisePropertyChanged("ocrTag");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=12)]
-        public string patientName {
-            get {
-                return this.patientNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.patientNameField, value) != true)) {
-                    this.patientNameField = value;
-                    this.RaisePropertyChanged("patientName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=13)]
-        public string modifyUserId {
-            get {
-                return this.modifyUserIdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.modifyUserIdField, value) != true)) {
-                    this.modifyUserIdField = value;
-                    this.RaisePropertyChanged("modifyUserId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=14)]
-        public string modifyUserNm {
-            get {
-                return this.modifyUserNmField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.modifyUserNmField, value) != true)) {
-                    this.modifyUserNmField = value;
-                    this.RaisePropertyChanged("modifyUserNm");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=15)]
-        public string modifyDatetime {
-            get {
-                return this.modifyDatetimeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.modifyDatetimeField, value) != true)) {
-                    this.modifyDatetimeField = value;
-                    this.RaisePropertyChanged("modifyDatetime");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=16)]
-        public string createDatetime {
-            get {
-                return this.createDatetimeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.createDatetimeField, value) != true)) {
-                    this.createDatetimeField = value;
-                    this.RaisePropertyChanged("createDatetime");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=17)]
-        public string clnDate {
-            get {
-                return this.clnDateField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.clnDateField, value) != true)) {
-                    this.clnDateField = value;
-                    this.RaisePropertyChanged("clnDate");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=18)]
-        public int cretNo {
-            get {
-                return this.cretNoField;
-            }
-            set {
-                if ((this.cretNoField.Equals(value) != true)) {
-                    this.cretNoField = value;
-                    this.RaisePropertyChanged("cretNo");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=19)]
-        public string ordType {
-            get {
-                return this.ordTypeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ordTypeField, value) != true)) {
-                    this.ordTypeField = value;
-                    this.RaisePropertyChanged("ordType");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=20)]
-        public string deptCd {
-            get {
-                return this.deptCdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.deptCdField, value) != true)) {
-                    this.deptCdField = value;
-                    this.RaisePropertyChanged("deptCd");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=21)]
-        public string mainDrId {
-            get {
-                return this.mainDrIdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.mainDrIdField, value) != true)) {
-                    this.mainDrIdField = value;
-                    this.RaisePropertyChanged("mainDrId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=22)]
-        public string ConsentName {
-            get {
-                return this.ConsentNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ConsentNameField, value) != true)) {
-                    this.ConsentNameField = value;
-                    this.RaisePropertyChanged("ConsentName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=23)]
-        public string ConsentStateDisp {
-            get {
-                return this.ConsentStateDispField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ConsentStateDispField, value) != true)) {
-                    this.ConsentStateDispField = value;
-                    this.RaisePropertyChanged("ConsentStateDisp");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=24)]
-        public string HosType {
-            get {
-                return this.HosTypeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.HosTypeField, value) != true)) {
-                    this.HosTypeField = value;
-                    this.RaisePropertyChanged("HosType");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=25)]
-        public string PatientCode {
-            get {
-                return this.PatientCodeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.PatientCodeField, value) != true)) {
-                    this.PatientCodeField = value;
-                    this.RaisePropertyChanged("PatientCode");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(Name="PatientName", EmitDefaultValue=false, Order=26)]
-        public string PatientName1 {
-            get {
-                return this.PatientName1Field;
-            }
-            set {
-                if ((object.ReferenceEquals(this.PatientName1Field, value) != true)) {
-                    this.PatientName1Field = value;
-                    this.RaisePropertyChanged("PatientName1");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=27)]
-        public string VisitType {
-            get {
-                return this.VisitTypeField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.VisitTypeField, value) != true)) {
-                    this.VisitTypeField = value;
-                    this.RaisePropertyChanged("VisitType");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=28)]
-        public string VisitTypeName {
-            get {
-                return this.VisitTypeNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.VisitTypeNameField, value) != true)) {
-                    this.VisitTypeNameField = value;
-                    this.RaisePropertyChanged("VisitTypeName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=29)]
-        public string CosignDcId {
-            get {
-                return this.CosignDcIdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.CosignDcIdField, value) != true)) {
-                    this.CosignDcIdField = value;
-                    this.RaisePropertyChanged("CosignDcId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=30)]
-        public string CosignDcName {
-            get {
-                return this.CosignDcNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.CosignDcNameField, value) != true)) {
-                    this.CosignDcNameField = value;
-                    this.RaisePropertyChanged("CosignDcName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=31)]
-        public string ClnDeptCd {
-            get {
-                return this.ClnDeptCdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ClnDeptCdField, value) != true)) {
-                    this.ClnDeptCdField = value;
-                    this.RaisePropertyChanged("ClnDeptCd");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=32)]
-        public string ClnDeptNm {
-            get {
-                return this.ClnDeptNmField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.ClnDeptNmField, value) != true)) {
-                    this.ClnDeptNmField = value;
-                    this.RaisePropertyChanged("ClnDeptNm");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=33)]
-        public string Doctor {
-            get {
-                return this.DoctorField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.DoctorField, value) != true)) {
-                    this.DoctorField = value;
-                    this.RaisePropertyChanged("Doctor");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=34)]
-        public string Ward {
-            get {
-                return this.WardField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.WardField, value) != true)) {
-                    this.WardField = value;
-                    this.RaisePropertyChanged("Ward");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=35)]
-        public string RoomCd {
-            get {
-                return this.RoomCdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.RoomCdField, value) != true)) {
-                    this.RoomCdField = value;
-                    this.RaisePropertyChanged("RoomCd");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=36)]
-        public string OcrNumber {
-            get {
-                return this.OcrNumberField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OcrNumberField, value) != true)) {
-                    this.OcrNumberField = value;
-                    this.RaisePropertyChanged("OcrNumber");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=37)]
-        public string CreateUserId {
-            get {
-                return this.CreateUserIdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.CreateUserIdField, value) != true)) {
-                    this.CreateUserIdField = value;
-                    this.RaisePropertyChanged("CreateUserId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(Name="CreateDateTime", EmitDefaultValue=false, Order=38)]
-        public string CreateDateTime1 {
-            get {
-                return this.CreateDateTime1Field;
-            }
-            set {
-                if ((object.ReferenceEquals(this.CreateDateTime1Field, value) != true)) {
-                    this.CreateDateTime1Field = value;
-                    this.RaisePropertyChanged("CreateDateTime1");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=39)]
-        public string CreateUserName {
-            get {
-                return this.CreateUserNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.CreateUserNameField, value) != true)) {
-                    this.CreateUserNameField = value;
-                    this.RaisePropertyChanged("CreateUserName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=40)]
-        public string FormGuid {
-            get {
-                return this.FormGuidField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.FormGuidField, value) != true)) {
-                    this.FormGuidField = value;
-                    this.RaisePropertyChanged("FormGuid");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=41)]
-        public string FormCd {
-            get {
-                return this.FormCdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.FormCdField, value) != true)) {
-                    this.FormCdField = value;
-                    this.RaisePropertyChanged("FormCd");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=42)]
-        public int FormRid {
-            get {
-                return this.FormRidField;
-            }
-            set {
-                if ((this.FormRidField.Equals(value) != true)) {
-                    this.FormRidField = value;
-                    this.RaisePropertyChanged("FormRid");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=43)]
-        public int OrderNo {
-            get {
-                return this.OrderNoField;
-            }
-            set {
-                if ((this.OrderNoField.Equals(value) != true)) {
-                    this.OrderNoField = value;
-                    this.RaisePropertyChanged("OrderNo");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=44)]
-        public string OrderCd {
-            get {
-                return this.OrderCdField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OrderCdField, value) != true)) {
-                    this.OrderCdField = value;
-                    this.RaisePropertyChanged("OrderCd");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=45)]
-        public string OrderNm {
-            get {
-                return this.OrderNmField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OrderNmField, value) != true)) {
-                    this.OrderNmField = value;
-                    this.RaisePropertyChanged("OrderNm");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=46)]
-        public string OcrTagYN {
-            get {
-                return this.OcrTagYNField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OcrTagYNField, value) != true)) {
-                    this.OcrTagYNField = value;
-                    this.RaisePropertyChanged("OcrTagYN");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=47)]
-        public string FormPrintName {
-            get {
-                return this.FormPrintNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.FormPrintNameField, value) != true)) {
-                    this.FormPrintNameField = value;
-                    this.RaisePropertyChanged("FormPrintName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=48)]
-        public string UserDrFlag {
-            get {
-                return this.UserDrFlagField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.UserDrFlagField, value) != true)) {
-                    this.UserDrFlagField = value;
-                    this.RaisePropertyChanged("UserDrFlag");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=49)]
-        public string PrntOnly {
-            get {
-                return this.PrntOnlyField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.PrntOnlyField, value) != true)) {
-                    this.PrntOnlyField = value;
-                    this.RaisePropertyChanged("PrntOnly");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=50)]
-        public string OpDiagName {
-            get {
-                return this.OpDiagNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OpDiagNameField, value) != true)) {
-                    this.OpDiagNameField = value;
-                    this.RaisePropertyChanged("OpDiagName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=51)]
-        public string OpName {
-            get {
-                return this.OpNameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OpNameField, value) != true)) {
-                    this.OpNameField = value;
-                    this.RaisePropertyChanged("OpName");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=52)]
-        public string OpRsrvNo {
-            get {
-                return this.OpRsrvNoField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.OpRsrvNoField, value) != true)) {
-                    this.OpRsrvNoField = value;
-                    this.RaisePropertyChanged("OpRsrvNo");
-                }
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="ConsentFormListVO", Namespace="http://tempuri.org/")]
@@ -2028,12 +1158,12 @@ namespace CLIP.eForm.Consent.UI.ConsentSvcRef {
     public partial class GetConsentListByUserNameResponseBody {
         
         [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
-        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentListByUserNameResult;
+        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentListByUserNameResult;
         
         public GetConsentListByUserNameResponseBody() {
         }
         
-        public GetConsentListByUserNameResponseBody(CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentListByUserNameResult) {
+        public GetConsentListByUserNameResponseBody(CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentListByUserNameResult) {
             this.GetConsentListByUserNameResult = GetConsentListByUserNameResult;
         }
     }
@@ -2192,12 +1322,12 @@ namespace CLIP.eForm.Consent.UI.ConsentSvcRef {
     public partial class GetConsentBySearchResponseBody {
         
         [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
-        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentBySearchResult;
+        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentBySearchResult;
         
         public GetConsentBySearchResponseBody() {
         }
         
-        public GetConsentBySearchResponseBody(CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentBySearchResult) {
+        public GetConsentBySearchResponseBody(CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentBySearchResult) {
             this.GetConsentBySearchResult = GetConsentBySearchResult;
         }
     }
@@ -5103,7 +4233,7 @@ namespace CLIP.eForm.Consent.UI.ConsentSvcRef {
             return base.Channel.GetConsentListByUserName(request);
         }
         
-        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentListByUserName(string username, string startDt, string endDt, string consetState, string dutinstcd) {
+        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentListByUserName(string username, string startDt, string endDt, string consetState, string dutinstcd) {
             CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentListByUserNameRequest inValue = new CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentListByUserNameRequest();
             inValue.Body = new CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentListByUserNameRequestBody();
             inValue.Body.username = username;
@@ -5138,7 +4268,7 @@ namespace CLIP.eForm.Consent.UI.ConsentSvcRef {
             return base.Channel.GetConsentBySearch(request);
         }
         
-        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentVO[] GetConsentBySearch(string categoryId, string keyWord, string instCd) {
+        public CLIP.eForm.Consent.UI.ConsentSvcRef.ConsentFormListVO[] GetConsentBySearch(string categoryId, string keyWord, string instCd) {
             CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentBySearchRequest inValue = new CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentBySearchRequest();
             inValue.Body = new CLIP.eForm.Consent.UI.ConsentSvcRef.GetConsentBySearchRequestBody();
             inValue.Body.categoryId = categoryId;

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="UserSignDataVo" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo, Service References.HospitalSvcRef.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/HospitalSvc.wsdl

@@ -807,6 +807,49 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+      <s:element name="setSignImage">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="instCd" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userId" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="signSeq" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="inptId" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="signImage" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="setSignImageResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="setSignImageResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getUserSignDataInfo">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="instCd" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="userId" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getUserSignDataInfoResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getUserSignDataInfoResult" type="tns:UserSignDataVo" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="UserSignDataVo">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="instCd" type="s:string" />
+          <s:element minOccurs="1" maxOccurs="1" name="signImgeSeqNo" type="s:int" />
+          <s:element minOccurs="0" maxOccurs="1" name="userId" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="signData" type="s:base64Binary" />
+          <s:element minOccurs="0" maxOccurs="1" name="signImgeFromDd" type="s:string" />
+          <s:element minOccurs="0" maxOccurs="1" name="userNm" type="s:string" />
+        </s:sequence>
+      </s:complexType>
     </s:schema>
   </wsdl:types>
   <wsdl:message name="CheckWebServiceSoapIn">
@@ -1001,6 +1044,18 @@
   <wsdl:message name="GetBaseDataSoapOut">
     <wsdl:part name="parameters" element="tns:GetBaseDataResponse" />
   </wsdl:message>
+  <wsdl:message name="setSignImageSoapIn">
+    <wsdl:part name="parameters" element="tns:setSignImage" />
+  </wsdl:message>
+  <wsdl:message name="setSignImageSoapOut">
+    <wsdl:part name="parameters" element="tns:setSignImageResponse" />
+  </wsdl:message>
+  <wsdl:message name="getUserSignDataInfoSoapIn">
+    <wsdl:part name="parameters" element="tns:getUserSignDataInfo" />
+  </wsdl:message>
+  <wsdl:message name="getUserSignDataInfoSoapOut">
+    <wsdl:part name="parameters" element="tns:getUserSignDataInfoResponse" />
+  </wsdl:message>
   <wsdl:portType name="HospitalSvcSoap">
     <wsdl:operation name="CheckWebService">
       <wsdl:input message="tns:CheckWebServiceSoapIn" />
@@ -1159,6 +1214,16 @@
       <wsdl:input message="tns:GetBaseDataSoapIn" />
       <wsdl:output message="tns:GetBaseDataSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="setSignImage">
+      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">서명 이미지 저장</wsdl:documentation>
+      <wsdl:input message="tns:setSignImageSoapIn" />
+      <wsdl:output message="tns:setSignImageSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="getUserSignDataInfo">
+      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">서명 이미지 조회</wsdl:documentation>
+      <wsdl:input message="tns:getUserSignDataInfoSoapIn" />
+      <wsdl:output message="tns:getUserSignDataInfoSoapOut" />
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="HospitalSvcSoap" type="tns:HospitalSvcSoap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -1450,6 +1515,24 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="setSignImage">
+      <soap:operation soapAction="http://tempuri.org/setSignImage" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserSignDataInfo">
+      <soap:operation soapAction="http://tempuri.org/getUserSignDataInfo" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:binding name="HospitalSvcSoap12" type="tns:HospitalSvcSoap">
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -1741,6 +1824,24 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="setSignImage">
+      <soap12:operation soapAction="http://tempuri.org/setSignImage" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getUserSignDataInfo">
+      <soap12:operation soapAction="http://tempuri.org/getUserSignDataInfo" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="HospitalSvc">
     <wsdl:port name="HospitalSvcSoap" binding="tns:HospitalSvcSoap">

CLIP.e-Form.Consent.UI/Service References/HospitalSvcRef/Reference.cs

@@ -3377,6 +3377,130 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         }
     }
     
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="UserSignDataVo", Namespace="http://tempuri.org/")]
+    [System.SerializableAttribute()]
+    public partial class UserSignDataVo : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
+        
+        [System.NonSerializedAttribute()]
+        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string instCdField;
+        
+        private int signImgeSeqNoField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string userIdField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private byte[] signDataField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string signImgeFromDdField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string userNmField;
+        
+        [global::System.ComponentModel.BrowsableAttribute(false)]
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
+            get {
+                return this.extensionDataField;
+            }
+            set {
+                this.extensionDataField = value;
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false)]
+        public string instCd {
+            get {
+                return this.instCdField;
+            }
+            set {
+                if ((object.ReferenceEquals(this.instCdField, value) != true)) {
+                    this.instCdField = value;
+                    this.RaisePropertyChanged("instCd");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
+        public int signImgeSeqNo {
+            get {
+                return this.signImgeSeqNoField;
+            }
+            set {
+                if ((this.signImgeSeqNoField.Equals(value) != true)) {
+                    this.signImgeSeqNoField = value;
+                    this.RaisePropertyChanged("signImgeSeqNo");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false)]
+        public string userId {
+            get {
+                return this.userIdField;
+            }
+            set {
+                if ((object.ReferenceEquals(this.userIdField, value) != true)) {
+                    this.userIdField = value;
+                    this.RaisePropertyChanged("userId");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)]
+        public byte[] signData {
+            get {
+                return this.signDataField;
+            }
+            set {
+                if ((object.ReferenceEquals(this.signDataField, value) != true)) {
+                    this.signDataField = value;
+                    this.RaisePropertyChanged("signData");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)]
+        public string signImgeFromDd {
+            get {
+                return this.signImgeFromDdField;
+            }
+            set {
+                if ((object.ReferenceEquals(this.signImgeFromDdField, value) != true)) {
+                    this.signImgeFromDdField = value;
+                    this.RaisePropertyChanged("signImgeFromDd");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=5)]
+        public string userNm {
+            get {
+                return this.userNmField;
+            }
+            set {
+                if ((object.ReferenceEquals(this.userNmField, value) != true)) {
+                    this.userNmField = value;
+                    this.RaisePropertyChanged("userNm");
+                }
+            }
+        }
+        
+        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        
+        protected void RaisePropertyChanged(string propertyName) {
+            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
+            if ((propertyChanged != null)) {
+                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+            }
+        }
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HospitalSvcRef.HospitalSvcSoap")]
     public interface HospitalSvcSoap {
@@ -3506,6 +3630,14 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 instCd이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/GetBaseData", ReplyAction="*")]
         CLIP.eForm.Consent.UI.HospitalSvcRef.GetBaseDataResponse GetBaseData(CLIP.eForm.Consent.UI.HospitalSvcRef.GetBaseDataRequest request);
+        
+        // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 instCd이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/setSignImage", ReplyAction="*")]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageResponse setSignImage(CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequest request);
+        
+        // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 instCd이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getUserSignDataInfo", ReplyAction="*")]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponse getUserSignDataInfo(CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequest request);
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -5870,6 +6002,162 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         }
     }
     
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class setSignImageRequest {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="setSignImage", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequestBody Body;
+        
+        public setSignImageRequest() {
+        }
+        
+        public setSignImageRequest(CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequestBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class setSignImageRequestBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string instCd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)]
+        public string userId;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)]
+        public string signSeq;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)]
+        public string inptId;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)]
+        public string signImage;
+        
+        public setSignImageRequestBody() {
+        }
+        
+        public setSignImageRequestBody(string instCd, string userId, string signSeq, string inptId, string signImage) {
+            this.instCd = instCd;
+            this.userId = userId;
+            this.signSeq = signSeq;
+            this.inptId = inptId;
+            this.signImage = signImage;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class setSignImageResponse {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="setSignImageResponse", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageResponseBody Body;
+        
+        public setSignImageResponse() {
+        }
+        
+        public setSignImageResponse(CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageResponseBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class setSignImageResponseBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string setSignImageResult;
+        
+        public setSignImageResponseBody() {
+        }
+        
+        public setSignImageResponseBody(string setSignImageResult) {
+            this.setSignImageResult = setSignImageResult;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class getUserSignDataInfoRequest {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="getUserSignDataInfo", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequestBody Body;
+        
+        public getUserSignDataInfoRequest() {
+        }
+        
+        public getUserSignDataInfoRequest(CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequestBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class getUserSignDataInfoRequestBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string instCd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)]
+        public string userId;
+        
+        public getUserSignDataInfoRequestBody() {
+        }
+        
+        public getUserSignDataInfoRequestBody(string instCd, string userId) {
+            this.instCd = instCd;
+            this.userId = userId;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.ServiceModel.MessageContractAttribute(IsWrapped=false)]
+    public partial class getUserSignDataInfoResponse {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="getUserSignDataInfoResponse", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponseBody Body;
+        
+        public getUserSignDataInfoResponse() {
+        }
+        
+        public getUserSignDataInfoResponse(CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponseBody Body) {
+            this.Body = Body;
+        }
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+    [System.Runtime.Serialization.DataContractAttribute(Namespace="http://tempuri.org/")]
+    public partial class getUserSignDataInfoResponseBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo getUserSignDataInfoResult;
+        
+        public getUserSignDataInfoResponseBody() {
+        }
+        
+        public getUserSignDataInfoResponseBody(CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo getUserSignDataInfoResult) {
+            this.getUserSignDataInfoResult = getUserSignDataInfoResult;
+        }
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     public interface HospitalSvcSoapChannel : CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap, System.ServiceModel.IClientChannel {
     }
@@ -6376,5 +6664,36 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
             CLIP.eForm.Consent.UI.HospitalSvcRef.GetBaseDataResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).GetBaseData(inValue);
             return retVal.Body.GetBaseDataResult;
         }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageResponse CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap.setSignImage(CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequest request) {
+            return base.Channel.setSignImage(request);
+        }
+        
+        public string setSignImage(string instCd, string userId, string signSeq, string inptId, string signImage) {
+            CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequest inValue = new CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequest();
+            inValue.Body = new CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageRequestBody();
+            inValue.Body.instCd = instCd;
+            inValue.Body.userId = userId;
+            inValue.Body.signSeq = signSeq;
+            inValue.Body.inptId = inptId;
+            inValue.Body.signImage = signImage;
+            CLIP.eForm.Consent.UI.HospitalSvcRef.setSignImageResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).setSignImage(inValue);
+            return retVal.Body.setSignImageResult;
+        }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponse CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap.getUserSignDataInfo(CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequest request) {
+            return base.Channel.getUserSignDataInfo(request);
+        }
+        
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.UserSignDataVo getUserSignDataInfo(string instCd, string userId) {
+            CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequest inValue = new CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequest();
+            inValue.Body = new CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoRequestBody();
+            inValue.Body.instCd = instCd;
+            inValue.Body.userId = userId;
+            CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).getUserSignDataInfo(inValue);
+            return retVal.Body.getUserSignDataInfoResult;
+        }
     }
 }

CLIP.e-Form.Consent.UI/UIParts/ConsentCommandCtrl.cs

@@ -1698,15 +1698,7 @@ namespace CLIP.eForm.Consent.UI {
         }
       }
 
-      //string fos = Common.GetFosStringForEpt(actionParams, consentMain.PluginExecuteInfo["formServiceUrl"], globalParams, consentMain.ConsentExecuteInfo["dutinstcd"]);
-
-      //v2로 수정
-      string fos = Common.getNewEptFosString(consentMain.PluginExecuteInfo["formServiceUrl"],
-        consentMain.PluginExecuteInfo["baseConsentSvcURL"],
-        globalParams,
-        new List<String> { CurrentPreviewConsent.formRid },
-        new List<String> { CurrentPreviewConsent.consentMstRid });
-
+      string fos = Common.GetFosStringForEpt(actionParams, consentMain.PluginExecuteInfo["formServiceUrl"], globalParams, consentMain.ConsentExecuteInfo["dutinstcd"]);
       SingleReturnData returnData = this.consentWebService.CheckConsentState(int.Parse(this.CurrentPreviewConsent.consentMstRid), this.CurrentPreviewConsent.consentState);
       int state = Int32.Parse(returnData.responseData);
       if(state == 1) {
@@ -2169,7 +2161,7 @@ namespace CLIP.eForm.Consent.UI {
         consentMstRidInt = Int32.Parse(returnData.responseData);
 
         // 기왕력 데이터 저장 sPID
-        SetNewMedicalHistory(dataValue);
+        //SetNewMedicalHistory(dataValue);
 
         if (consentMain.multiParams == null)
         {

CLIP.e-Form.Consent.UI/UIParts/ConsentCommandCtrl.resx

@@ -290,36 +290,36 @@
   <data name="toolStripButtonPrevPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="toolStripButtonNextPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALZSURBVFhH7ZbfS1NhGMdXFwXRTRBE10EXQX9BF9JF5dzZ
-        0gupi34hEmRFobntzOmx0Iu8CWFN59nxzMioFKNhihgt0uoi+0Vq2lAqp01tzTkdena2b++Z7y4EkTPd
-        xIt94Huz932e8znbs/ccTZYs25Y8s3OQMfI+xuw8r9FgB/1469CZeHhnwjDybklnFkeYckcOXdoaFIF5
-        KQafFMeXqRAYrk1irGKv1tx0mG7JLIqAPyKDnwd6IsAsEeG4u/Ezt8Wo3iI0MaWO/XRrZlAE/izKuO9H
-        Ig0kb0JAYCkGrn9QPmnlIwwrmHOv1++mJeklIbAg4944VsX+E/gQBGaIHPfMLRkqxBmd0XE27YOqCEwR
-        gbphrBmHF/g+F8ev4BJKbN3L+VbXkJblj9HyzZMQCMuo/Yh10/wdmAjH8XUihIt1YrTA2tyVe6vxEG2z
-        cZIC1W+hKk9GyKBGVgaV4R5IBqto15nt+2i71FEEJudlVLyC6lS9BrrITxMgImLfSLSg1LWoZ4WyQu7p
-        LtpWPUkBUzdSTvVLoJ8M6yyZofoOz7LBInyjbdWTEAjJKHuOlMN2Ar2jwN+FGETxc9RgcYzRtupJCtxo
-        g+rcbAceDygXjqPT44nllNiUu68t5Gx7aVv1KAK+ORnXWqEqdjIDk+Rv+e7HLM7ViNH8SlfrKUvjQdou
-        dZICV1xYNzXkKx/1xzHkC6OE65AKKsU+rbHxKG2zcZICl3msGeMj4L03jt8BCVUtyonoGtMa+RO0fPMk
-        BIIyihuwKledwItPgJ/MB+d2S6etwj+dyVnEcdxOWpoekgJFNiRSbAdaPMB0aOVhVGAVlwxs8x2Gc+yh
-        JeklKXCpnjyE3OS4DSinXB055R5KBovo0rP8Abo1MygCwUgMw744BsaVF5J2SW91eXJZ4QjdklkUAe80
-        mWxbz7K+QhjNK3cep0tbg/JSqmWFSZ1JuJD2AcuSZfug0fwHhTwmO6s53VEAAAAASUVORK5CYII=
+        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
 </value>
   </data>
   <data name="toolStripButtonLastPage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -372,23 +372,23 @@
   <data name="toolStripButtonPenConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="toolStripButtonPen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

CLIP.e-Form.Consent.Web/CLIP.e-Form.Consent.Web.csproj

@@ -112,7 +112,9 @@
     <Content Include="Conf\HospitalSvcOracleMap.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Conf\CenDBOracleMap.config" />
+    <Content Include="Conf\CenDBOracleMap.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apks\consent_knuh.apk" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
@@ -152,7 +154,9 @@
     <Content Include="json2.js" />
     <Content Include="manager.aspx" />
     <Content Include="OperationList.aspx" />
-    <Content Include="OracleQuery\CLIP.e-Form.cendb.consent.xml" />
+    <Content Include="OracleQuery\CLIP.e-Form.cendb.consent.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="OracleQuery\CLIP.e-Form.Consent.FormRepository.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -164,11 +168,16 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="OracleQuery\CLIP.e-Form.Hospital.ResultMap.xml" />
-    <Content Include="OracleQuery\CLIP.e-Form.Hospital.User.xml" />
+    <Content Include="OracleQuery\CLIP.e-Form.Hospital.User.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="OracleQuery\CLIP.e-Form.Server.Code.xml" />
     <Content Include="OracleQuery\CLIP.e-Form.Server.Viewer.Data.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="OracleQuery\CLIP.e-Form.cendb.ResultMap.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Ref Assemblies\CLIP.e-Form.Server.Data.dll" />
     <Content Include="Ref Assemblies\CLIP.e-Form.Server.dll" />
     <Content Include="Ref Assemblies\CLIP.e-Form.Server.VO.dll" />

CLIP.e-Form.Consent.Web/Conf/CenDBOracleMap.config

@@ -13,13 +13,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <provider name="oracleClient2.0" />
     <!--<주의> 배포 시 해당 DB 연결 정보를 수정하여야 합니다.-->
     <!--교육 DB CEN DB 연결정보 설정-->
-    <dataSource name="knuhCenDB_ED" connectionString="Data Source=
-DEMO_SERVER;Persist Security Info=True;User ID=EMA;Password=ema1503##;Unicode=True;"/>
+    <dataSource name="knuhCenDB_ED" connectionString="Data Source=DEMO_SERVER;Persist Security Info=True;User ID=EMA;Password=ema1503##;Unicode=True;"/>
     <!-- 운영 CEN DB 연결 정보-->
     <!--<dataSource name="knuhCenDB_REAL" connectionString="Data Source=CEN030DB;Persist Security Info=True;User ID=EMA;Password=ema1503##;Unicode=True;"/>-->
   </database>
   <sqlMaps>
-    <!--<sqlMap resource="OracleQuery\\CLIP.e-Form.cendb.ResultMap.xml" />-->
+    <sqlMap resource="OracleQuery\\CLIP.e-Form.cendb.ResultMap.xml" />
     <sqlMap resource="OracleQuery\\CLIP.e-Form.cendb.consent.xml" />
   </sqlMaps>
 </sqlMapConfig>

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

@@ -200,8 +200,8 @@ namespace CLIP.eForm.Consent.WebService {
     //}
 
     [WebMethod(Description = "사용자 이름에 따른 환자별 동의서 목록 조회")]
-    public List<ConsentVO> GetConsentListByUserName(string username, string startDt, string endDt, string consetState, string dutinstcd) {
-      List<ConsentVO> result = null;
+    public List<ConsentFormListVO> GetConsentListByUserName(string username, string startDt, string endDt, string consetState, string dutinstcd) {
+      List<ConsentFormListVO> result = null;
       try {
         using (ConsentDac dac = new ConsentDac()) {
           Hashtable param = new Hashtable {
@@ -212,7 +212,7 @@ namespace CLIP.eForm.Consent.WebService {
                         { "status", consetState}
                     };
 
-          return (List<ConsentVO>) dac.GetUnfinishedListPerUserName(this.IbatisMapper, param);
+          return (List<ConsentFormListVO>) dac.GetUnfinishedListPerUserName(this.IbatisMapper, param);
         }
       } catch (Exception ex) {
         CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Error(string.Format("CLIP.eForm GetUnfinishedListPerDoctor error: {0}", ex.Message));
@@ -232,10 +232,10 @@ namespace CLIP.eForm.Consent.WebService {
     /// <param name="userId">The user identifier.</param>
     /// <returns></returns>
     [WebMethod(Description = "환자/상태에 따른 동의서 목록 검색")]
-    public List<ConsentVO> GetConsentList(string patientCode, string startDt, string endDt, string consentState, string instCd
+    public List<ConsentFormListVO> GetConsentList(string patientCode, string startDt, string endDt, string consentState, string instCd
                                         , string userId) {
 
-      List<ConsentVO> result;
+      List<ConsentFormListVO> result;
 
       try {
 
@@ -269,7 +269,7 @@ namespace CLIP.eForm.Consent.WebService {
                     };
 
           //result = (List<ConsentFormListVO>) dac.GetConsentList(this.IbatisMapper, param);
-          result = (List<ConsentVO>) dac.GetConsentList(this.IbatisMapper, param);
+          result = (List<ConsentFormListVO>) dac.GetConsentList(this.IbatisMapper, param);
         }
 
         return result;
@@ -288,8 +288,8 @@ namespace CLIP.eForm.Consent.WebService {
     /// <param name="instCd">근무지기관코드</param>
     /// <returns></returns>
     [WebMethod(Description = "동의서 찾기(조회)")]
-    public List<ConsentVO> GetConsentBySearch(string categoryId, string keyWord, string instCd) {
-      List<ConsentVO> result;
+    public List<ConsentFormListVO> GetConsentBySearch(string categoryId, string keyWord, string instCd) {
+      List<ConsentFormListVO> result;
 
       if (categoryId.Equals("EMA_031") || categoryId.Equals("EMA_032")) {
         categoryId = "";
@@ -302,7 +302,7 @@ namespace CLIP.eForm.Consent.WebService {
           param.Add("instCd", instCd);
           param.Add("keyWord", string.Format("%{0}%", keyWord));
 
-          result = (List<ConsentVO>) dac.GetConsentBySearch(this.IbatisMapper, param);
+          result = (List<ConsentFormListVO>) dac.GetConsentBySearch(this.IbatisMapper, param);
         }
         return result;
       } catch (Exception ex) {
@@ -925,9 +925,9 @@ namespace CLIP.eForm.Consent.WebService {
       return result;
     }
 
-    public List<ConsentVO> GetConsentData(string patientCode, int consentMstRid, string startDt, string endDt, string dutinstcd
+    public List<ConsentFormListVO> GetConsentData(string patientCode, int consentMstRid, string startDt, string endDt, string dutinstcd
                                     , string userId) {
-      List<ConsentVO> result;
+      List<ConsentFormListVO> result;
       try {
 
         using (ConsentDac dac = new ConsentDac()) {
@@ -942,7 +942,7 @@ namespace CLIP.eForm.Consent.WebService {
                         { "userId", userId ?? string.Empty}
                     };
 
-          result = (List<ConsentVO>) dac.GetConsentList(this.IbatisMapper, param);
+          result = (List<ConsentFormListVO>) dac.GetConsentList(this.IbatisMapper, param);
         }
 
         return result;

CLIP.e-Form.Consent.Web/HospitalSvc.asmx.cs

@@ -690,15 +690,15 @@ namespace CLIP.eForm.Consent.WebService {
     /// <param name="userId">사용자 아이디 107810</param>
     /// <param name="instCd">근무지기관코드</param>
     [WebMethod(Description = "동의서 SET 조회")]
-    public List<ConsentVO> GetConsentSetList(string userId, string instCd) {
-      List<ConsentVO> result;
+    public List<ConsentFormListVO> GetConsentSetList(string userId, string instCd) {
+      List<ConsentFormListVO> result;
 
       try {
         using (ConsentDac dac = new ConsentDac()) {
           Hashtable param = new Hashtable();
           param.Add("instCd", instCd);
           param.Add("userId", userId);
-          result = (List<ConsentVO>) dac.GetConsentSetList(this.IbatisMapper, param);
+          result = (List<ConsentFormListVO>) dac.GetConsentSetList(this.IbatisMapper, param);
         }
 
         return result;
@@ -1293,32 +1293,63 @@ namespace CLIP.eForm.Consent.WebService {
     [WebMethod(Description = "서명 이미지 저장")]
     public String setSignImage(string instCd, string userId, string signSeq, string inptId, string signImage)
     {
-      ISqlMapper mapper = IbatisMapper;
+      //ISqlMapper mapper = IbatisMapper;
+      ISqlMapper mapper = this.cendbMapper;
+      ISqlMapper hospitalMapper = this.IbatisMapper;
+      //ISqlMapper cendbMapper = this.cendbMapper;
       UserSignDataVo signData = null;
+
       byte[] decodedImage = Convert.FromBase64String(signImage);
+      //string decodedImage = Encoding.UTF8.GetString(Convert.FromBase64String(signImage));
 
       string result = "0";
       try
       {
         using (UserDac dac = new UserDac())
         {
+          String userName = String.Empty;
+          {
+            Hashtable temp = new Hashtable();
+            temp.Add("userId", userId);
+            userName = dac.getUserName(hospitalMapper, temp);
+
+          }
           Hashtable param = new Hashtable();
 
           //받아온 사용자의 사인데이터를 조회
           param.Add("instCd", instCd);
           param.Add("userId", userId);
+          param.Add("userName", userName);
+          CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Error(String.Format("test"));
           signData = dac.getUserSignDataInfo(mapper, param);
 
+          if (signData == null)
+          {
+            signData = new UserSignDataVo();
+            signData.userId = userId;
+            signData.signImgeSeqNo = 0;
+            signData.instCd = instCd;
+            signData.signImgeFromDd = DateTime.Now.ToString("yyyyMMdd");
+            signData.signData = decodedImage;
+          }
+
+
+          int signSeqInt = Int32.Parse(signSeq);
+
           //사인데이터가 있을 경우
-          if (signData != null)
+          //if (signData != null)
+          if(signSeqInt >= 0)
           {
             string today = DateTime.Now.ToString("yyyyMMdd");
             string yesterday = DateTime.Now.AddDays(-1).ToString("yyyyMMdd");
             //해당 사인데이터가 오늘 저장된 것이 아니라면 오늘날짜로 새로 저장하고 이전 데이터의 유효기간을 마감시킨다.
-            if (!signData.signImgeFromDd.Equals(today))
+            if (signData.signImgeSeqNo == 0 || !signData.signImgeFromDd.Equals(today))
             {
-              insSignImage(instCd, userId, signData.signImgeSeqNo + 1, decodedImage, inptId, dac, mapper);
-              setSignToDd(instCd, userId, signData.signImgeSeqNo, yesterday, "N", inptId, dac, mapper);
+              insSignImage(instCd, userId, signData.signImgeSeqNo + 1, decodedImage, inptId, dac, this.cendbMapper);
+              if (signData.signImgeSeqNo != 0)
+              {
+                setSignToDd(instCd, userId, signData.signImgeSeqNo, yesterday, "N", inptId, dac, this.cendbMapper);
+              }
             }
             else
             {
@@ -1329,7 +1360,7 @@ namespace CLIP.eForm.Consent.WebService {
               param.Add("curSeqNo", signData.signImgeSeqNo);
               param.Add("signData", decodedImage);
               param.Add("inptUser", inptId);
-              dac.setUserSignData(mapper, param);
+              dac.setUserSignData(this.cendbMapper, param);
             }
           }
           else
@@ -1416,6 +1447,21 @@ namespace CLIP.eForm.Consent.WebService {
 
       result = dac.getUserSignDataInfo(IbatisMapper, param);
 
+      if(result == null)
+      {
+        CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Error(string.Format("data: null"));
+        Hashtable param2 = new Hashtable();
+        param2.Add("userId", userId);
+
+        result = new UserSignDataVo();
+        result.userId = userId;
+        result.signImgeSeqNo = 0;
+        result.instCd = instCd;
+        result.signImgeFromDd = DateTime.Now.ToString("yyyyMMdd");
+        result.signData = null;
+        result.userNm = dac.getUserName(this.IbatisMapper, param2);
+      }
+
       return result;
     }
 

CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.Consent.FormRepository.xml

@@ -111,126 +111,99 @@
          ORDER BY form_name]]>
     </statement -->
 
-    <!--<statement id="GET_CONSENT_BY_SEARCH_LIST" parameterClass="System.Collections.Hashtable" resultMap="ConsentMap">
-      <![CDATA[
-        SELECT ''                AS IDX,
-               CF.FORM_ID        AS FORM_ID,
-               CF.FORM_CODE      AS FORM_CODE,
-               CF.FORM_NAME      AS FORM_NAME,
-               MF.FORMPRNTNM     AS FORM_PRNT_NM,
-               ''                AS PRNT_CNT,
-               (SELECT DECODE(COUNT(FORMCD), 0, 'N', 'Y') AS CERT_PASS
-                  FROM EMR.MRFMFORMEMA
-                 WHERE INSTCD = #instCd#
-                   AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN FORMFROMDT AND FORMTODT
-                   AND FORMTODT = '99991231'
-                   AND FORMCD = CF.FORM_CODE)                                             AS CERT_PASS,
-               ''                AS PID,
-               ''                AS DEPT_ENG_ABBR,
-               ''                AS CONSENT_STATE,
-               ''                AS CONSENT_MST_RID,
-               ''                AS OCR_TAG,
-               ''                AS MODIFY_USER_ID,
-               ''                AS MODIFY_USER_NM,
-               ''                AS MODIFY_DATETIME,
-               ''                AS CREATE_DATETIME,
-               ''                AS CLN_DATE,
-               ''                AS CRET_NO,
-               ''                AS ORD_TYPE,
-               ''                AS DEPT_CD,
-               ''                AS MAIN_DR_ID,
-               ''                AS PATIENT_NAME
-          FROM EMA.CLIP_FORM CF
-          LEFT OUTER JOIN EMA.CLIP_FORM_DATA CFD
-            ON CF.FORM_ID = CFD.FORM_ID
-          LEFT OUTER JOIN EMR.MRFMFORM MF
-            ON CF.FORM_CODE = MF.FORMCD
-           AND MF.INSTCD = '101'
+    <statement id="GET_CONSENT_BY_SEARCH_LIST" parameterClass="System.Collections.Hashtable" resultMap="ConsentFormMap">
+      <![CDATA[
+        SELECT ''                                                                         AS CONSENT_MST_RID,
+               ''                                                                         AS CREATE_USER_ID,
+               ''                                                                         AS CREATE_USER_NAME,
+               ''                                                                         AS CREATE_DATETIME,
+               ''                                                                         AS MODIFY_USER_ID,
+               ''                                                                         AS MODIFY_USER_NAME,
+               ''                                                                         AS OCR_TAG,
+               ''                                                                         AS PID,
+               ''                                                                         AS INDD,
+               ''                                                                         AS ORD_TYPE,
+               ''                                                                         AS ORD_DEPT_CD,
+               ''                                                                         AS CRET_NO,
+               ''                                                                         AS OPRSRVNO,
+               ''                                                                         AS PATIENT_NAME,
+               ''                                                                         AS CONSENT_STATE,
+               ''                                                                         AS CONSENT_STATE_ENG,
+               VF.FORM_CD                                                                 AS FORM_CD,
+               VF.FORM_GUID                                                               AS FORM_GUID,
+               VF.FORM_NAME                                                               AS FORM_NAME,
+               VF.FORM_RID                                                                AS FORM_RID,
+               VF.PRINT_ONLY                                                              AS PRNT_ONLY,
+               VF.PRNTCNT                                                                 AS PRINT_CNT,
+               VF.OCRTAGPRNTYN                                                            AS OCR_TAG_PRNT_YN,
+               MRFM.FORMPRNTNM                                                            AS FORM_PRNT_NM,
+               DECODE(MRFM.CERTUSEYN, 'Y', MRFM.CERTUSEYN, 'N')                           AS CERT_USE_YN,
+               OP.OPDIAGNM                                                                AS OP_DIAG_NM,
+               OP.OPNM                                                                    AS OP_NM,
+               CASE WHEN EXISTS (SELECT 1
+                                   FROM EMR.MMBDHRCD C
+                                  WHERE C.INSTCD   = #instCd#
+                                    AND C.HARDCDNO = '6920'
+                                    AND C.TRGTCD   = VF.FORM_CD
+                                ) THEN
+                           'N'
+                      ELSE 'Y'
+                    END                                                                   AS USERDRFLAG,
+               (SELECT C.RMK
+                  FROM EMR.MMBMHRCD C,
+                       EMR.MMBDHRCD D
+                 WHERE C.INSTCD              = #instCd#
+                   AND C.HARDCDNO            = '6011'
+                   AND D.INSTCD              = C.INSTCD
+                   AND D.HARDCDNO            = C.HARDCDNO 
+                   AND D.TRGTCD             != C.RMK
+                   AND D.TRGTCD              = VF.FORM_CD
+                   AND NVL(D.HARDSPEC, 'Y')  = 'Y'
+                   AND TO_CHAR(SYSDATE, 'YYYYMMDD')  BETWEEN D.VALIFROMDD AND D.VALITODD
+                   AND ROWNUM                = 1
+               )                                                                          AS LNKFORMCD,
+               (SELECT DECODE(COUNT(FORM.FORMCD), 0, '-', '1100010977')
+                  FROM EMR.MRFMCALCMECH MECH,
+                       EMR.MRFMFORM FORM
+                 WHERE MECH.INSTCD = #instCd#
+                   AND FORM.FORMCD = VF.FORM_CD
+                   AND MECH.INSTCD = FORM.INSTCD
+                   AND MECH.FORMCD = FORM.FORMCD
+                   AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS') BETWEEN FORM.FORMFROMDT AND FORM.FORMTODT
+                   AND MECH.BIZFLAG='JINJEONG')                                           AS JINJEONGCD,
+               MRFM.DRONLY
+          FROM v_eform_formdoc VF, 
+               EMA.EFORM_CATEGORY EC, 
+               EMR.MRFMFORM MRFM,
+               (SELECT TRGTCD,
+                       TRGTCDNM AS OPDIAGNM,
+                       TRGTCDSNM AS OPNM
+                  FROM EMR.MMBDHRCD
+                 WHERE INSTCD   = #instCd#
+                   AND HARDCDNO = '6011'
+                   AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN VALIFROMDD AND VALITODD
+               ) OP
          WHERE 1 = 1
+           AND MRFM.INSTCD = #instCd#
+           AND MRFM.FORMPROGFLAG LIKE 'OCR%'
+           AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS') BETWEEN MRFM.FORMFROMDT AND MRFM.FORMTODT
+           AND VF.CATEGORY_RID = EC.CATEGORY_RID
+           AND VF.FORM_CD = MRFM.FORMCD
+           AND OP.TRGTCD(+) = VF.FORM_CD
       ]]>
-      <isNotEmpty property="categoryId">
-        <![CDATA[
-          AND CF.FORM_CATEGORY_ID = #categoryId#
-        ]]>
-      </isNotEmpty>
+
       <isNotEmpty property="keyWord">
         <![CDATA[
-          AND UPPER(CF.FORM_NAME) LIKE #keyWord#
+          AND REPLACE(UPPER(VF.FORM_NAME), ' ', '') LIKE REPLACE(UPPER(#keyWord#), ' ', '')
         ]]>
       </isNotEmpty>
-      <![CDATA[
-           AND RPAD(#toDay#, 14, 0) BETWEEN MF.FORMFROMDT AND MF.FORMTODT
-           AND CF.PRODUCT_ID = 1
-           AND CF.FORM_TYPE = 'FORM_TYPE_001'
-           AND CF.USE_YN = 'Y'
-           AND MF.INSTCD = #instCd#
-           AND MF.FORMPROGFLAG LIKE 'OCR%'
-           AND CFD.PUBLICATION_YN = 'Y'
-           AND CFD.FORM_VERSION = ( SELECT MAX(FORM_VERSION) 
-                                      FROM EMA.CLIP_FORM_DATA A 
-                                     WHERE A.FORM_ID = CFD.FORM_ID
-                                       AND A.PUBLICATION_YN = 'Y'
-                                       AND A.product_id = '1' )
-         ORDER BY CF.FORM_NAME
-      ]]>
-    </statement>-->
-
-    <statement id="GET_CONSENT_BY_SEARCH_LIST" parameterClass="System.Collections.Hashtable" resultMap="ConsentMap">
-      <![CDATA[
-        SELECT ''                AS IDX,
-               CF.FORM_ID        AS FORM_ID,
-               CF.FORM_CODE      AS FORM_CODE,
-               CF.FORM_NAME      AS FORM_NAME,
-               MF.FORMPRNTNM     AS FORM_PRNT_NM,
-               0                AS PRNT_CNT,
-               ''                AS CERT_PASS,
-               ''                AS PID,
-               ''                AS DEPT_ENG_ABBR,
-               ''                AS CONSENT_STATE,
-               0                AS CONSENT_MST_RID,
-               ''                AS OCR_TAG,
-               ''                AS MODIFY_USER_ID,
-               ''                AS MODIFY_USER_NM,
-               ''                AS MODIFY_DATETIME,
-               ''                AS CREATE_DATETIME,
-               ''                AS CLN_DATE,
-               0                AS CRET_NO,
-               ''                AS ORD_TYPE,
-               ''                AS DEPT_CD,
-               ''                AS MAIN_DR_ID,
-               ''                AS PATIENT_NAME
-          FROM EMA.CLIP_FORM CF
-          LEFT OUTER JOIN EMA.CLIP_FORM_DATA CFD
-            ON CF.FORM_ID = CFD.FORM_ID
-          LEFT OUTER JOIN EMR.MRFMFORM MF
-            ON CF.FORM_CODE = MF.FORMCD
-           AND MF.INSTCD = '031'
-         WHERE 1 = 1
-      ]]>
       <isNotEmpty property="categoryId">
         <![CDATA[
-          AND CF.FORM_CATEGORY_ID = #categoryId#
-        ]]>
-      </isNotEmpty>
-      <isNotEmpty property="keyWord">
-        <![CDATA[
-          AND UPPER(CF.FORM_NAME) LIKE #keyWord#
+          AND EC.CATEGORY_ID = #categoryId#
         ]]>
       </isNotEmpty>
       <![CDATA[
-           AND to_char(sysdate, 'YYYYMMDDHH24MISS') BETWEEN MF.FORMFROMDT AND MF.FORMTODT
-           AND CF.PRODUCT_ID = 1
-           AND CF.FORM_TYPE = 'FORM_TYPE_001'
-           AND CF.USE_YN = 'Y'
-           AND MF.INSTCD = #instCd#
-           AND MF.FORMPROGFLAG LIKE 'OCR%'
-           AND CFD.PUBLICATION_YN = 'Y'
-           AND CFD.FORM_VERSION = ( SELECT MAX(FORM_VERSION) 
-                                      FROM EMA.CLIP_FORM_DATA A 
-                                     WHERE A.FORM_ID = CFD.FORM_ID
-                                       AND A.PUBLICATION_YN = 'Y'
-                                       AND A.product_id = '1' )
-         ORDER BY CF.FORM_NAME
+        ORDER BY VF.FORM_NAME
       ]]>
     </statement>
 

CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.Consent.ResultMap.xml

@@ -37,28 +37,7 @@
     </resultMap>
     
     <resultMap id="ConsentMap" class="ConsentVO">
-      <result property="idx"            column="IDX" />
-      <result property="formId"         column="FORM_ID" />
-      <result property="formCode"       column="FORM_CODE"       nullValue="" />
-      <result property="formName"       column="FORM_NAME"       nullValue="" />
-      <result property="formPrntNm"     column="FORM_PRNT_NM"    nullValue="" />
-      <result property="printCnt"       column="PRNT_CNT" />
-      <result property="certPass"       column="CERT_PASS"       nullValue="" />
-      <result property="pid"            column="PID"             nullValue="" />
-      <result property="deptEngName"    column="DEPT_ENG_ABBR"   nullValue="" />
-      <result property="consentState"   column="CONSENT_STATE"   nullValue="" />
-      <result property="consentMstRid"  column="CONSENT_MST_RID" />
-      <result property="ocrTag"         column="OCR_TAG"         nullValue="" />
-      <result property="patientName"    column="PATIENT_NAME"    nullValue="" />
-      <result property="modifyUserId"   column="MODIFY_USER_ID"  nullValue="" />
-      <result property="modifyUserNm"   column="MODIFY_USER_NM"  nullValue="" />
-      <result property="modifyDatetime" column="MODIFY_DATETIME" nullValue="" />
-      <result property="createDatetime" column="CREATE_DATETIME" nullValue="" />
-      <result property="clnDate"        column="CLN_DATE"        nullValue="" />
-      <result property="cretNo"         column="CRET_NO" />
-      <result property="ordType"        column="ORD_TYPE"        nullValue="" />
-      <result property="deptCd"        column="DEPT_CD"          nullValue="" />
-      <result property="mainDrId"        column="MAIN_DR_ID"     nullValue="" />
+      <result property="ConsentMstRid" column="CONSENT_MST_RID" />
       <result property="ConsentStateDisp" column="CONSENT_STATE_DISP" />      
       <result property="ConsentName" column="CONSENT_NAME" />
       <result property="HosType" column="HOS_TYPE" />
@@ -76,12 +55,16 @@
       <result property="FormRid" column="FORM_RID" />
       <result property="FormCd" column="FORM_CD" />
       <result property="FormGuid" column="FORM_GUID" />
+      <result property="PrntCnt" column="PRNTCNT" />
       <result property="OcrNumber" column="OCR_NUMBER" />
+      <result property="ConsentState" column="CONSENT_STATE" />
       <result property="CosignDcId" column="COSIGN_DC_ID" />
       <result property="CosignDcName" column="COSIGN_DC_NAME" />
       <result property="CreateUserId" column="CREATE_USER_ID" />
       <result property="CreateUserName" column="CREATE_USER_NAME" />
       <result property="CreateDateTime" column="CREATE_DATETIME" />
+      <result property="ClnDate" column="CLN_DATE" />
+      <result property="Cretno" column="CRETNO" />
       <result property="OcrTagYN" column="OCRTAGPRNTYN"/>
       <result property="FormPrintName" column="formprntnm"/>
       <result property="UserDrFlag" column="userdrflag"/>

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

@@ -2,6 +2,26 @@
 <!--<sqlMap namespace="CLIP.e-Form.Consent.Dfh" xmlns="http://ibatis.apache.org/mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >-->
 <sqlMap namespace="CLIP.e-Form.Consent.Knuh" xmlns="http://ibatis.apache.org/mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
   <statements>
+    <statement id="GET_USER_NAME" parameterClass="System.Collections.Hashtable" >
+      <![CDATA[
+        SELECT
+                USERB.USERNM
+              FROM
+                COM.ZSUMUSRB USERB,
+                (
+                  SELECT
+                    USERID,
+                    MAX(USERFROMDD) AS USERFROMDD
+                  FROM
+                    COM.ZSUMUSRB
+                  WHERE
+                    USERID = #userId#
+                  GROUP BY
+                    USERID) MAX_USERB
+              WHERE userb.userid = max_userb.userid
+              AND userb.userfromdd = max_userb.userfromdd
+      ]]>
+    </statement>
     <statement id="GET_USER_INFO" parameterClass="System.Collections.Hashtable" resultMap="UserMap">
       <![CDATA[
         SELECT USRB.USERID                                                               AS userId,
@@ -693,8 +713,7 @@
     <!--사인데이터를 생성-->
     <statement id="INS_USER_SIGNIMAGE" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
       <![CDATA[
-      insert into EMR.MRFMSIGNIMGE a (a.instcd
-        , a.userid
+      insert into EMR.MRFMSIGNIMGE a ( a.userid
         , a.SIGNIMGESEQNO
         , a.REPRYN
         , a.SIGNDATA
@@ -704,8 +723,7 @@
         , a.LASTUPDTRID
         , a.RGSTINSTCD
         )
-        values( #instCd#
-            , #userId#
+        values(#userId#
             , #nextSeqNo#
             , 'Y'
             , #signData#
@@ -724,9 +742,9 @@
       UPDATE EMR.MRFMSIGNIMGE a
            SET a.SIGNIMGETODD = #yesterDay#
              , a.LASTUPDTRID = #inptUser#
-             , a.REPRYN = #repryn#
+             , a.REPRYN = 'Y'
              , a.LASTUPDTDT = systimestamp
-         WHERE a.instcd = #instCd# AND a.userid = #userId#
+         WHERE a.userid = #userId#
                AND a.SIGNIMGESEQNO = #curSeqNo# AND a.REPRYN = 'Y'
       ]]>
     </statement>
@@ -734,7 +752,7 @@
     <!--사용자에 대한 사인데이터를 조회한다.-->
     <statement id="GET_USER_SIGN_DATA_INFO" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
       <![CDATA[
-      SELECT img.instcd
+      SELECT img.RGSTINSTCD as instCd
         , img.userid
         , img.signimgeseqno
         , IMG.SIGNIMGEFROMDD
@@ -759,7 +777,12 @@
           ) usernm
         FROM EMR.MRFMSIGNIMGE img
         WHERE userid = #userId#
-        AND img.instcd = #instCd#
+        and img.signimgeseqno = (
+          select max(signimgeseqno)
+          from EMR.MRFMSIGNIMGE
+          where REPRYN = 'Y'
+            and userid = #userId#
+        )
         AND REPRYN = 'Y'
         AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN SIGNIMGEFROMDD AND SIGNIMGETODD 
       ]]>
@@ -772,8 +795,9 @@
         SET IMG.SIGNDATA = #signData#
           , IMG.LASTUPDTRID = #inptUser#
           , IMG.LASTUPDTDT = systimestamp
-        WHERE IMG.INSTCD = #instCd#
-        AND IMG.USERID = #userId#
+          , IMG.INPUTFLAG = 'M'
+          , IMG.REPRYN = 'Y'
+        WHERE IMG.USERID = #userId#
         AND IMG.SIGNIMGESEQNO = #curSeqNo#
       ]]>
     </statement>

CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.cendb.ResultMap.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--<sqlMap namespace="CLIP.e-Form.Consent.Dfh" xmlns="http://ibatis.apache.org/mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >-->
+<sqlMap namespace="CLIP.e-Form.Consent.Knuh" xmlns="http://ibatis.apache.org/mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
+  <alias>
+    <typeAlias type="CLIP.eForm.Consent.Entity.UserSignDataVo, CLIP.e-Form.Consent.Entity" alias="UserSignDataVo"/>
+  </alias>
+
+  <resultMaps>
+    <resultMap id="UserSignDataMap" class="UserSignDataVo">
+      <result property="instCd"     column="instcd"     nullValue="" />
+      <result property="signImgeSeqNo"       column="signimgeseqNo"       nullValue="" />
+      <result property="userId"       column="userid"       nullValue="" />
+      <result property="signData"       column="signdata"       nullValue="" />
+      <result property="signImgeFromDd"       column="signimgefromdd"       nullValue="" />
+      <result property="userNm"       column="usernm"       nullValue="" />
+    </resultMap>
+  </resultMaps>
+</sqlMap>

CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.cendb.consent.xml

@@ -57,6 +57,81 @@
         ]]>
     </delete>
 
+
+    <!--사인데이터를 생성-->
+    <statement id="INS_USER_SIGNIMAGE" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
+      <![CDATA[
+      insert into EMR.MRFMSIGNIMGE a ( a.userid
+        , a.SIGNIMGESEQNO
+        , a.REPRYN
+        , a.SIGNDATA
+        , a.SIGNIMGEFROMDD
+        , a.SIGNIMGETODD
+        , a.FSTRGSTRID
+        , a.LASTUPDTRID
+        , a.RGSTINSTCD
+        )
+        values(#userId#
+            , #nextSeqNo#
+            , 'Y'
+            , #signData#
+            , to_char(sysdate, 'YYYYMMDD')
+            , '99991231'
+            , #inputUserId#
+            , #inputUserId#
+            , #instCd#
+        )
+      ]]>
+    </statement>
+
+    <!--이전 사인데이터의 유효기간 마감 처리-->
+    <statement id="SET_USER_SIGNTODD" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
+      <![CDATA[
+      UPDATE EMR.MRFMSIGNIMGE a
+           SET a.SIGNIMGETODD = #yesterDay#
+             , a.LASTUPDTRID = #inptUser#
+             , a.REPRYN = 'Y'
+             , a.LASTUPDTDT = systimestamp
+         WHERE a.userid = #userId#
+               AND a.SIGNIMGESEQNO = #curSeqNo# 
+      ]]>
+    </statement>
+
+    <!--사용자에 대한 사인데이터를 조회한다.-->
+    <statement id="GET_USER_SIGN_DATA_INFO" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
+      <![CDATA[
+      SELECT img.RGSTINSTCD as instcd
+        , img.userid
+        , img.signimgeseqno
+        , IMG.SIGNIMGEFROMDD
+        , img.signdata
+        , #userName# as usernm
+        FROM EMR.MRFMSIGNIMGE img
+        WHERE userid = #userId#
+        and img.signimgeseqno = (
+          select max(signimgeseqno)
+          from EMR.MRFMSIGNIMGE
+          where REPRYN = 'Y'
+            and userid = #userId#
+        )
+        AND TO_CHAR(SYSDATE, 'YYYYMMDD') BETWEEN SIGNIMGEFROMDD AND SIGNIMGETODD 
+      ]]>
+    </statement>
+
+    <!--같은날 사용자 사인데이터를 저장하면 그날 사인데이터에 업데이트한다.-->
+    <statement id="SET_USER_SIGN_DATA" parameterClass="System.Collections.Hashtable" resultMap="UserSignDataMap">
+      <![CDATA[
+      UPDATE EMR.MRFMSIGNIMGE IMG
+        SET IMG.SIGNDATA = #signData#
+          , IMG.LASTUPDTRID = #inptUser#
+          , IMG.LASTUPDTDT = systimestamp
+          , IMG.INPUTFLAG = 'M'
+          , IMG.REPRYN = 'Y'
+        WHERE IMG.USERID = #userId#
+        AND IMG.SIGNIMGESEQNO = #curSeqNo#
+      ]]>
+    </statement>
+
     <!-- statement id="delUserFormSet" parameterClass="System.Collections.Hashtable">
       <![CDATA[ 
             update emr.mrfmsetindx