Browse Source

카테고리 오류 수정
fn_emr_data 프로시저 호출 API 추가
파라미터필드 추가

sungwoobaek@idatabank.com 4 years ago
parent
commit
f464cd642f

+ 4 - 0
CLIP.e-Form.Consent.Dac/PatientDac.cs

@@ -76,5 +76,9 @@ namespace CLIP.eForm.Consent.Dac {
       Object res = mapper.QueryForObject("checkHardcd", param);
       return Convert.ToInt32(res);
     }
+
+    public String getEmrDataString(ISqlMapper mapper, Hashtable param) {
+      return mapper.QueryForObject<String>("getErmData", param);
+    }
   }
 }

+ 25 - 28
CLIP.e-Form.Consent.Entity/CategoryForDropdownVO.cs

@@ -10,33 +10,30 @@
 using System;
 using System.ComponentModel;
 
-namespace CLIP.eForm.Consent.Entity
-{
-    /// <summary>
-    /// 서식 종류를 Dropdown에서 선택하기 위한 데이터 엔터티
-    /// </summary>
-    /// <remarks>
-    /// <p>[설계자]</p>
-    /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
-    /// <p>[원본 작성자]</p>
-    /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
-    /// <p>[수정 작성자]</p>
-    /// <p></p>
-    /// <p>----------------------------------------------------------------------------------------</p>
-    /// <p>[HISTORY]</p>
-    /// <p> 2016-05-20 : 최초작성</p>
-    /// <p>----------------------------------------------------------------------------------------</p>
-    /// </remarks>  
-    [Serializable]
-    public class CategoryForDropdownVO
-    {
-        public CategoryForDropdownVO()
-        {
-            foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(this))
-                property.SetValue(this, "");
-        }
-        public string CategoryType { get; set; }
-        public string CategoryId { get; set; }
-        public string CategoryName { get; set; }
+namespace CLIP.eForm.Consent.Entity {
+  /// <summary>
+  /// 서식 종류를 Dropdown에서 선택하기 위한 데이터 엔터티
+  /// </summary>
+  /// <remarks>
+  /// <p>[설계자]</p>
+  /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
+  /// <p>[원본 작성자]</p>
+  /// <p>  클립소프트 기술부 4팀 이창훈 (chlee@clipsoft.co.kr)</p>
+  /// <p>[수정 작성자]</p>
+  /// <p></p>
+  /// <p>----------------------------------------------------------------------------------------</p>
+  /// <p>[HISTORY]</p>
+  /// <p> 2016-05-20 : 최초작성</p>
+  /// <p>----------------------------------------------------------------------------------------</p>
+  /// </remarks>  
+  [Serializable]
+  public class CategoryForDropdownVO {
+    public CategoryForDropdownVO() {
+      foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(this))
+        property.SetValue(this, "");
     }
+    public string CategoryType { get; set; }
+    public string CategoryId { get; set; }
+    public string CategoryName { get; set; }
+  }
 }

+ 6 - 12
CLIP.e-Form.Consent.Entity/ConsentVO.cs

@@ -10,8 +10,7 @@
 using System;
 using System.ComponentModel;
 
-namespace CLIP.eForm.Consent.Entity
-{
+namespace CLIP.eForm.Consent.Entity {
   /// <summary>
   /// 동의서 전체목록 엔터티 클래스
   /// </summary>
@@ -28,18 +27,13 @@ namespace CLIP.eForm.Consent.Entity
   /// <p>----------------------------------------------------------------------------------------</p>
   /// </remarks>
   [Serializable]
-  public class 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")
-        {
+  public class 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") {
           property.SetValue(this, 0);
         }
-        else
-        {
+        else {
           property.SetValue(this, "");
         }
       }

BIN
CLIP.e-Form.Consent.UI/Agent App/CLIP.e-Form.Consent.UI.dll


BIN
CLIP.e-Form.Consent.UI/Agent App/Plugin/CLIP.e-Form.Consent.UI.dll


+ 13 - 9
CLIP.e-Form.Consent.UI/Common.cs

@@ -429,7 +429,8 @@ namespace CLIP.eForm.Consent.UI {
                                                     , "parCMSGBD_ExplDrNm_P"
                                                     , "parCMSGBD_ExplDrTelNo_P"
                                                     , "parCMSGBD_ExplDrSignature_P"
-                                                    , "parCMDCHD_1SocialSecuNo_org" };
+                                                    , "parCMDCHD_1SocialSecuNo_org"
+                                                    , "parEMRINFO_A01" };
 
     private static string[] m_FOSParamArr_032 = { "parCMDCFT_device"
                                                     , "parCMDCFT_1PrintIP"
@@ -518,9 +519,10 @@ namespace CLIP.eForm.Consent.UI {
                                                     , "parCMSGBD_ExplDrNm_P"
                                                     , "parCMSGBD_ExplDrTelNo_P"
                                                     , "parCMSGBD_ExplDrSignature_P"
-                                                    , "parCMDCHD_1SocialSecuNo_org" };
+                                                    , "parCMDCHD_1SocialSecuNo_org"
+                                                    , "parEMRINFO_A01" };
 
-        private static string[] m_FOSParamArr_org = { "IO_device"   //동작코드(T: 임시 저장, C: 인증 저장, P: 출력, CP: 삭제)
+    private static string[] m_FOSParamArr_org = { "IO_device"   //동작코드(T: 임시 저장, C: 인증 저장, P: 출력, CP: 삭제)
                                                     , "PrintIp"
                                                     , "IO_Pt_ID"
                                                     , "IO_sex_age_y_m"
@@ -607,7 +609,8 @@ namespace CLIP.eForm.Consent.UI {
                                                     , "parCMSGBD_ExplDrNm_P"
                                                     , "parCMSGBD_ExplDrTelNo_P"
                                                     , "parCMSGBD_ExplDrSignature_P"
-                                                    , "parCMDCHD_1SocialSecuNo_org" };
+                                                    , "parCMDCHD_1SocialSecuNo_org"
+                                                    , "parEMRINFO_A01" };
     }
 
     public enum FOSParameter {
@@ -694,11 +697,12 @@ namespace CLIP.eForm.Consent.UI {
         tag8,
         tag9,
         tag10,
-    CardNo,
-    ExplDrName_P,
-    ExplDrTelNo_p,
-    ExplDrSign_p,
-    PatientRRNOrg
+        CardNo,
+        ExplDrName_P,
+        ExplDrTelNo_p,
+        ExplDrSign_p,
+        PatientRRNOrg,
+        emrinfo
   }
 
 }

+ 14 - 0
CLIP.e-Form.Consent.UI/ConsentMainControl.cs

@@ -2046,6 +2046,13 @@ namespace CLIP.eForm.Consent.UI
             globalParams[FOSParameter.SignTime] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             globalParams[FOSParameter.PrintIp] = ConsentExecuteInfo["printIP"];
 
+            String emrInfoStr = hospitalWebService.getEmrDataString("A01"
+                , ConsentExecuteInfo["dutinstcd"]
+                , ConsentExecuteInfo["PTNT_NO"]
+                , ConsentExecuteInfo["CLN_DATE"]
+                , ConsentExecuteInfo["CRETNO"]);
+            globalParams[FOSParameter.emrinfo] = emrInfoStr;
+
             string fos = Common.GetFosString(formGuids
                                            , PluginExecuteInfo["formServiceUrl"]
                                            , globalParams
@@ -2167,6 +2174,13 @@ namespace CLIP.eForm.Consent.UI
               if (j == 1) formParams[FOSParameter.PrintComment] = Properties.Resources.msg_print_comment_2;
               else if (j == 2) formParams[FOSParameter.PrintComment] = Properties.Resources.msg_print_comment_3;
 
+              String emrInfoStr = hospitalWebService.getEmrDataString("A01"
+                , ConsentExecuteInfo["dutinstcd"]
+                , ConsentExecuteInfo["PTNT_NO"]
+                , ConsentExecuteInfo["CLN_DATE"]
+                , ConsentExecuteInfo["CRETNO"]);
+              formParams[FOSParameter.emrinfo] = emrInfoStr;
+
               formGuidList[j] = consentCommandCtrl.CurrentPreviewConsent.formGuid;
 
               formParamsList.Add((j + 1).ToString(), formParams);

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

@@ -850,6 +850,24 @@
           <s:element minOccurs="0" maxOccurs="1" name="userNm" type="s:string" />
         </s:sequence>
       </s:complexType>
+      <s:element name="getEmrDataString">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="flag" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="instcd" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="pid" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="indd" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="cretno" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="getEmrDataStringResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="getEmrDataStringResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
     </s:schema>
   </wsdl:types>
   <wsdl:message name="CheckWebServiceSoapIn">
@@ -1056,6 +1074,12 @@
   <wsdl:message name="getUserSignDataInfoSoapOut">
     <wsdl:part name="parameters" element="tns:getUserSignDataInfoResponse" />
   </wsdl:message>
+  <wsdl:message name="getEmrDataStringSoapIn">
+    <wsdl:part name="parameters" element="tns:getEmrDataString" />
+  </wsdl:message>
+  <wsdl:message name="getEmrDataStringSoapOut">
+    <wsdl:part name="parameters" element="tns:getEmrDataStringResponse" />
+  </wsdl:message>
   <wsdl:portType name="HospitalSvcSoap">
     <wsdl:operation name="CheckWebService">
       <wsdl:input message="tns:CheckWebServiceSoapIn" />
@@ -1224,6 +1248,11 @@
       <wsdl:input message="tns:getUserSignDataInfoSoapIn" />
       <wsdl:output message="tns:getUserSignDataInfoSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="getEmrDataString">
+      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">파라미터 필드 메시지 조회</wsdl:documentation>
+      <wsdl:input message="tns:getEmrDataStringSoapIn" />
+      <wsdl:output message="tns:getEmrDataStringSoapOut" />
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="HospitalSvcSoap" type="tns:HospitalSvcSoap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
@@ -1533,6 +1562,15 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="getEmrDataString">
+      <soap:operation soapAction="http://tempuri.org/getEmrDataString" 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" />
@@ -1842,6 +1880,15 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="getEmrDataString">
+      <soap12:operation soapAction="http://tempuri.org/getEmrDataString" 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">

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

@@ -3638,6 +3638,10 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         // 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);
+        
+        // CODEGEN: http://tempuri.org/ 네임스페이스의 요소 이름 flag이(가) "nillable"로 표시되지 않았으므로 메시지 계약을 생성합니다.
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/getEmrDataString", ReplyAction="*")]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponse getEmrDataString(CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequest request);
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -6158,6 +6162,90 @@ 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 getEmrDataStringRequest {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="getEmrDataString", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequestBody Body;
+        
+        public getEmrDataStringRequest() {
+        }
+        
+        public getEmrDataStringRequest(CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequestBody 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 getEmrDataStringRequestBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string flag;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)]
+        public string instcd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)]
+        public string pid;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)]
+        public string indd;
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)]
+        public string cretno;
+        
+        public getEmrDataStringRequestBody() {
+        }
+        
+        public getEmrDataStringRequestBody(string flag, string instcd, string pid, string indd, string cretno) {
+            this.flag = flag;
+            this.instcd = instcd;
+            this.pid = pid;
+            this.indd = indd;
+            this.cretno = cretno;
+        }
+    }
+    
+    [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 getEmrDataStringResponse {
+        
+        [System.ServiceModel.MessageBodyMemberAttribute(Name="getEmrDataStringResponse", Namespace="http://tempuri.org/", Order=0)]
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponseBody Body;
+        
+        public getEmrDataStringResponse() {
+        }
+        
+        public getEmrDataStringResponse(CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponseBody 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 getEmrDataStringResponseBody {
+        
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
+        public string getEmrDataStringResult;
+        
+        public getEmrDataStringResponseBody() {
+        }
+        
+        public getEmrDataStringResponseBody(string getEmrDataStringResult) {
+            this.getEmrDataStringResult = getEmrDataStringResult;
+        }
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     public interface HospitalSvcSoapChannel : CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap, System.ServiceModel.IClientChannel {
     }
@@ -6695,5 +6783,22 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
             CLIP.eForm.Consent.UI.HospitalSvcRef.getUserSignDataInfoResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).getUserSignDataInfo(inValue);
             return retVal.Body.getUserSignDataInfoResult;
         }
+        
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponse CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap.getEmrDataString(CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequest request) {
+            return base.Channel.getEmrDataString(request);
+        }
+        
+        public string getEmrDataString(string flag, string instcd, string pid, string indd, string cretno) {
+            CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequest inValue = new CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequest();
+            inValue.Body = new CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringRequestBody();
+            inValue.Body.flag = flag;
+            inValue.Body.instcd = instcd;
+            inValue.Body.pid = pid;
+            inValue.Body.indd = indd;
+            inValue.Body.cretno = cretno;
+            CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).getEmrDataString(inValue);
+            return retVal.Body.getEmrDataStringResult;
+        }
     }
 }

+ 31 - 0
CLIP.e-Form.Consent.UI/UIParts/ConsentCommandCtrl.cs

@@ -383,6 +383,13 @@ namespace CLIP.eForm.Consent.UI {
         return;
       }
 
+      String emrInfoStr = hospitalWebService.getEmrDataString(
+              "A01"
+              , this.CurrentTargetPatient.HosType
+              , this.CurrentTargetPatient.PatientCode
+              , this.CurrentTargetPatient.clnDate
+              , this.CurrentTargetPatient.cretno);
+      globalParams[FOSParameter.emrinfo] = emrInfoStr;
 
       string fos = Common.GetFosString(formGuids
                                      , consentMain.PluginExecuteInfo["formServiceUrl"]
@@ -1385,6 +1392,14 @@ namespace CLIP.eForm.Consent.UI {
       globalParams[FOSParameter.SignTime] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
       globalParams[FOSParameter.PrintIp] = consentMain.ConsentExecuteInfo["printIP"];
 
+      String emrInfoStr = hospitalWebService.getEmrDataString(
+              "A01"
+              , this.CurrentTargetPatient.HosType
+              , this.CurrentTargetPatient.PatientCode
+              , this.CurrentTargetPatient.clnDate
+              , this.CurrentTargetPatient.cretno);
+      globalParams[FOSParameter.emrinfo] = emrInfoStr;
+
       List<string> formGuids = new List<string> {
                 CurrentPreviewConsent.formGuid
             };
@@ -1644,6 +1659,15 @@ namespace CLIP.eForm.Consent.UI {
       changingGlobalParams[FOSParameter.tag9] = consentMain.ConsentExecuteInfo["tag9"];
       changingGlobalParams[FOSParameter.tag10] = consentMain.ConsentExecuteInfo["tag10"];
 
+      String emrInfoStr = hospitalWebService.getEmrDataString(
+              "A01"
+              , this.CurrentTargetPatient.HosType
+              , this.CurrentTargetPatient.PatientCode
+              , this.CurrentTargetPatient.clnDate
+              , this.CurrentTargetPatient.cretno);
+
+      changingGlobalParams[FOSParameter.emrinfo] = emrInfoStr;
+
       // 한번 사용한 후 해당 설정은 초기화
       consentMain.ConsentExecuteInfo["tag1"] = string.Empty;
       consentMain.ConsentExecuteInfo["tag2"] = string.Empty;
@@ -3130,6 +3154,13 @@ namespace CLIP.eForm.Consent.UI {
         return;
       }
 
+      String emrInfoStr = hospitalWebService.getEmrDataString(
+        "A01"
+        , this.CurrentTargetPatient.HosType
+        , this.CurrentTargetPatient.PatientCode
+        , this.CurrentTargetPatient.clnDate
+        , this.CurrentTargetPatient.cretno);
+      globalParams[FOSParameter.emrinfo] = emrInfoStr;
 
       string fos = Common.GetFosString(formGuids
                                      , consentMain.PluginExecuteInfo["formServiceUrl"]

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

@@ -291,24 +291,24 @@
     <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>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALYSURBVFhH7ZbdS1NhHMdXFwXRTRBE10EXQX9BF9JF5dzZ
-        chdSF70hEmRFobk3p8dCobwJYU3n2fHMyKgUo2GKGC3S6iJ7I18bSuW0qa05p0PPzs6358xnF4LIppt4
+        chdSF70hEmRFobk3p8dCKbwJYU3n2fHMyKgUo2GKGC3S6iJ7I18bSuW0qa05p0PPzs6358xnF4LIppt4
         sQ98b/Y8v9/5nO235xxVlizbljyTc4AxcD7G5DyvUmEH/Xjr0Bg5eGfCMHBuUWMSRpgyRw5d2hoUgXkx
         Bp8o4+tUCAzbKjJWoUdtajxMt2QWRcAfkcDNA90RYJaIsOxd+cxtIaq18I1MiWM/3ZoZFIE/ixIe+BFP
         PcnbEBBYioHtG5BOWrkIY+ZNudfrdtOS9BIXWJBwfxyrYv8JfAwCM0SOfe4WdeXCjMbgOJv2QVUEpohA
@@ -319,7 +319,7 @@
         kxC44sK6qSZf+ahfxqAvjGK2XdRXCL1qQ8NR2mbjJAQuc1gzhsfAB6+M3wERlc3KiegaUxu4E7R888QF
         ghKK6rEqV53Ay8+An8wH63aLp638P43RWciy7E5amh4SAoU2xFNkB5o9wHRo5WGktwpLOnPTHYZ17KEl
         6SUhcKmOPITc5LgNKKfcPXLKPRJ1FsGlNXMH6NbMoAgEIzEM+WT0jysvJG2i1ury5Jr5I3RLZlEEvNNk
-        sm3dy9pyfjSvzHmcLm0Nykup2sxPaoz8hbQPWJYs2weV6j9ruSY4mMImGAAAAABJRU5ErkJggg==
+        sm3dy9pyfjSvzHmcLm0Nykup2sxPaoz8hbQPWJYs2weV6j9SNiY19ppG2wAAAABJRU5ErkJggg==
 </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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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAO5SURBVFhHpZdNTxNRFIbnD7jyZ7hgxQIwuVGgzG1K6ZSg
-        LfQDdAClilgriTFmIqAJH1FM1I1bJSZqkCgGbUxVjIqgBK0rd8ZqdTe0XbSmPc4pHZgOx3bAkzyrTu/z
-        zr0zZ+4VrFZtbe3ehoaGfs55lHNbItjjUAeHJPVCqGld7maqi7ME/obX4LWlv/1/1dTU7ONcjIYG7anH
-        UZZ/Hx+GpXh/kZV4L8DHlk2yq10QW2D5yEl7ShTFKP63NMzOq76+fo/NZpsJh72Zd2vnNqVGzAGMpFeC
-        MB6WMjgGjlUa1lphcqfTllSU8wVKrFMpgM6Y0ltwOxuTlmdDS1vnDzrU5XiElBqxEgDJrXpA9jMVxy5p
-        6MKUksTUx6unSaEZqwGQP2+6QdbG/udM4DqJYlPy6utuuPTKBQ8+BEipEcsBXtgB5pyQmw+AW3OQzwQ+
-        LIoSKqBcp1oISwFKcp1RZaCArpJ2o3BavOH2jFGuM782QMqRqgHeesrkOhOaq2wp8J29tti3Ta5zf8W/
-        8wCmOzeSnpeBa86iHLtWZ9CeosRG5laPWg+w6CLFRiKas9gx6+rq+qbmWJ6SmjGHIANYkCOxGZZHt4D9
-        e/r1EVJIsfD51L8DLAVIGUX2SQ+gWxB5c4ISVWLh00aIsgBLflJUCa65BSnAVEpSjWj8zFaA5SOkoBrY
-        mARPSFqnBFZ483USCl8UcnArDMsOVWiVh1XpWRp2gxJLAozfAjjr2xWKp21dYD5ZdT4F2Cndj35Dw+QL
-        gAMXAU5cJgXVkNvsqtDMeYISVKLr4a+ifDMAckyDkFTC1WJLFF/DnudZUkTRNbclLwuAHB8hRRTZkZMb
-        ryE2A3YvlqdkZhx3v5fJtwVAAmdJoZnYKMvj/rHYiu3BSIoSGqHkZACLISKHSq0YSxR5VI6mSTHSfPsb
-        KUfIAIh3iBQj6bEhwA9gUY6Fn8b28ESGknc8+EmKdUi5jnyBDDDuPVz+OcbCTcKAMlowym136Gk3QoqN
-        mGZiTDmzfUOChdukJtGdDDzPbchnEqTQDCk1UwqRuzgA7pZmekuGhdPCJFn1zf4gZRSkkODPiZFi49k2
-        9ebCrTOTJLX1+iIpNEPJzOTaJ0FmUvVtuV6Ycr8oJn2KUqCkRiihkdEepeBuFK0fTPTCdcKHpdUbznTc
-        fEnKEUqKpDuvwESbd3dHM2NhcnxnRV8wxaZn864b5UtjlGY7piDGJvIR7k3hpnPHd12psGvpx/OD3PGD
-        SX61yRNaH9bWFteXs5ZdHM8F4S+zGdi+g3qtDQAAAABJRU5ErkJggg==
+        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
 </value>
   </data>
   <data name="toolStripButtonPen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+ 6 - 3
CLIP.e-Form.Consent.Web/ConsentSvc.asmx.cs

@@ -133,14 +133,15 @@ namespace CLIP.eForm.Consent.WebService {
           string categoryId = "";
           if (instCd.Equals("031")) {
             categoryId = "EMA_031";
-          } else {
+          }
+          else {
             categoryId = "EMA_032";
           }
 
           Hashtable param = new Hashtable();
           param.Add("category_id", categoryId);
 
-          result = (List<CategoryForDropdownVO>) dac.GetCategoryForDropdown(this.IbatisMapper, param);
+          result = (List<CategoryForDropdownVO>)dac.GetCategoryForDropdown(this.IbatisMapper, param);
 
           CategoryForDropdownVO allSubCategory = new CategoryForDropdownVO();
           allSubCategory.CategoryId = categoryId;
@@ -151,7 +152,8 @@ namespace CLIP.eForm.Consent.WebService {
         }
 
         return result;
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         CLIP.eForm.Server.Diagnostics.LogHelper.LoggingHandler.Error(string.Format("CLIP.eForm GetCategoryForDropdown error: {0}", ex.Message));
         throw ex;
       }
@@ -291,6 +293,7 @@ namespace CLIP.eForm.Consent.WebService {
     public List<ConsentFormListVO> GetConsentBySearch(string categoryId, string keyWord, string instCd) {
       List<ConsentFormListVO> result;
 
+      // TODO.V2 전환 필요
       if (categoryId.Equals("EMA_031") || categoryId.Equals("EMA_032")) {
         categoryId = "";
       }

+ 18 - 0
CLIP.e-Form.Consent.Web/HospitalSvc.asmx.cs

@@ -1465,6 +1465,24 @@ namespace CLIP.eForm.Consent.WebService {
       return result;
     }
 
+    [WebMethod(Description = "파라미터 필드 메시지 조회")]
+    public String getEmrDataString(string flag, string instcd, string pid, string indd, string cretno) {
+      String retValue = String.Empty;
+
+      using(PatientDac dac = new PatientDac()) {
+        Hashtable param = new Hashtable();
+        param.Add("flag", flag);
+        param.Add("instcd", instcd);
+        param.Add("pid", pid);
+        param.Add("indd", indd);
+        param.Add("cretno", cretno);
+
+        retValue = dac.getEmrDataString(this.IbatisMapper, param);
+      }
+
+      return retValue;
+    }
+
     #endregion
   }
 }

+ 8 - 0
CLIP.e-Form.Consent.Web/OracleQuery/CLIP.e-Form.Hospital.Patient.xml

@@ -912,5 +912,13 @@
           AND TO_CHAR (SYSDATE, 'YYYYMMDD') BETWEEN VALIFROMDD AND VALITODD
       ]]>
     </statement>
+    <statement id="getErmData" parameterClass="System.Collections.Hashtable" resultClass="System.String">
+      <![CDATA[
+        SELECT
+            EMA.FN_EMR_DATA(#flag#, #instcd#, #pid#, #indd#, #cretno#)
+          FROM
+            DUAL
+      ]]>
+    </statement>
   </statements>
 </sqlMap>