2021.02.08 배포 내역

  - 파라미터 필드 추가
  - 파라미터 필드 연동 API 추가

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

@@ -2046,12 +2046,14 @@ 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"
+            CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString("A01"
                 , ConsentExecuteInfo["dutinstcd"]
                 , ConsentExecuteInfo["PTNT_NO"]
                 , ConsentExecuteInfo["CLN_DATE"]
-                , ConsentExecuteInfo["CRETNO"]);
-            globalParams[FOSParameter.emrinfo] = emrInfoStr;
+                , ConsentExecuteInfo["CRETNO"]
+                , consentCommandCtrl.CurrentPreviewConsent.formCd);
+            
+            globalParams[FOSParameter.emrinfo] = retVal.responseData;
 
             string fos = Common.GetFosString(formGuids
                                            , PluginExecuteInfo["formServiceUrl"]
@@ -2174,12 +2176,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"
+              CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString("A01"
                 , ConsentExecuteInfo["dutinstcd"]
                 , ConsentExecuteInfo["PTNT_NO"]
                 , ConsentExecuteInfo["CLN_DATE"]
-                , ConsentExecuteInfo["CRETNO"]);
-              formParams[FOSParameter.emrinfo] = emrInfoStr;
+                , ConsentExecuteInfo["CRETNO"]
+                , consentCommandCtrl.CurrentPreviewConsent.formCd);
+              formParams[FOSParameter.emrinfo] = retVal.responseData;
 
               formGuidList[j] = consentCommandCtrl.CurrentPreviewConsent.formGuid;
 

CLIP.e-Form.Consent.UI/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.19")]
-[assembly: AssemblyFileVersion("1.1.0.19")]
+[assembly: AssemblyVersion("1.1.0.20")]
+[assembly: AssemblyFileVersion("1.1.0.20")]

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

@@ -858,13 +858,14 @@
             <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:element minOccurs="0" maxOccurs="1" name="formCd" 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:element minOccurs="0" maxOccurs="1" name="getEmrDataStringResult" type="tns:SingleReturnData" />
           </s:sequence>
         </s:complexType>
       </s:element>

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

@@ -6200,15 +6200,19 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
         [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)]
         public string cretno;
         
+        [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=5)]
+        public string formCd;
+        
         public getEmrDataStringRequestBody() {
         }
         
-        public getEmrDataStringRequestBody(string flag, string instcd, string pid, string indd, string cretno) {
+        public getEmrDataStringRequestBody(string flag, string instcd, string pid, string indd, string cretno, string formCd) {
             this.flag = flag;
             this.instcd = instcd;
             this.pid = pid;
             this.indd = indd;
             this.cretno = cretno;
+            this.formCd = formCd;
         }
     }
     
@@ -6236,12 +6240,12 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
     public partial class getEmrDataStringResponseBody {
         
         [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)]
-        public string getEmrDataStringResult;
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData getEmrDataStringResult;
         
         public getEmrDataStringResponseBody() {
         }
         
-        public getEmrDataStringResponseBody(string getEmrDataStringResult) {
+        public getEmrDataStringResponseBody(CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData getEmrDataStringResult) {
             this.getEmrDataStringResult = getEmrDataStringResult;
         }
     }
@@ -6789,7 +6793,7 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
             return base.Channel.getEmrDataString(request);
         }
         
-        public string getEmrDataString(string flag, string instcd, string pid, string indd, string cretno) {
+        public CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData getEmrDataString(string flag, string instcd, string pid, string indd, string cretno, string formCd) {
             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;
@@ -6797,6 +6801,7 @@ namespace CLIP.eForm.Consent.UI.HospitalSvcRef {
             inValue.Body.pid = pid;
             inValue.Body.indd = indd;
             inValue.Body.cretno = cretno;
+            inValue.Body.formCd = formCd;
             CLIP.eForm.Consent.UI.HospitalSvcRef.getEmrDataStringResponse retVal = ((CLIP.eForm.Consent.UI.HospitalSvcRef.HospitalSvcSoap)(this)).getEmrDataString(inValue);
             return retVal.Body.getEmrDataStringResult;
         }

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

@@ -383,13 +383,15 @@ namespace CLIP.eForm.Consent.UI {
         return;
       }
 
-      String emrInfoStr = hospitalWebService.getEmrDataString(
+      CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString(
               "A01"
               , this.CurrentTargetPatient.HosType
               , this.CurrentTargetPatient.PatientCode
               , this.CurrentTargetPatient.clnDate
-              , this.CurrentTargetPatient.cretno);
-      globalParams[FOSParameter.emrinfo] = emrInfoStr;
+              , this.CurrentTargetPatient.cretno
+              , this.CurrentPreviewConsent.formCd);
+
+      globalParams[FOSParameter.emrinfo] = retVal.responseData;
 
       string fos = Common.GetFosString(formGuids
                                      , consentMain.PluginExecuteInfo["formServiceUrl"]
@@ -1392,13 +1394,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(
+      CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString(
               "A01"
               , this.CurrentTargetPatient.HosType
               , this.CurrentTargetPatient.PatientCode
               , this.CurrentTargetPatient.clnDate
-              , this.CurrentTargetPatient.cretno);
-      globalParams[FOSParameter.emrinfo] = emrInfoStr;
+              , this.CurrentTargetPatient.cretno
+              , this.CurrentPreviewConsent.formCd);
+      globalParams[FOSParameter.emrinfo] = retVal.responseData;
 
       List<string> formGuids = new List<string> {
                 CurrentPreviewConsent.formGuid
@@ -1659,14 +1662,15 @@ namespace CLIP.eForm.Consent.UI {
       changingGlobalParams[FOSParameter.tag9] = consentMain.ConsentExecuteInfo["tag9"];
       changingGlobalParams[FOSParameter.tag10] = consentMain.ConsentExecuteInfo["tag10"];
 
-      String emrInfoStr = hospitalWebService.getEmrDataString(
+      CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString(
               "A01"
               , this.CurrentTargetPatient.HosType
               , this.CurrentTargetPatient.PatientCode
               , this.CurrentTargetPatient.clnDate
-              , this.CurrentTargetPatient.cretno);
+              , this.CurrentTargetPatient.cretno
+              , this.CurrentPreviewConsent.formCd);
 
-      changingGlobalParams[FOSParameter.emrinfo] = emrInfoStr;
+      changingGlobalParams[FOSParameter.emrinfo] = retVal.responseData;
 
       // 한번 사용한 후 해당 설정은 초기화
       consentMain.ConsentExecuteInfo["tag1"] = string.Empty;
@@ -1722,6 +1726,15 @@ namespace CLIP.eForm.Consent.UI {
         }
       }
 
+      CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString(
+        "A01"
+        , this.CurrentTargetPatient.HosType
+        , this.CurrentTargetPatient.PatientCode
+        , this.CurrentTargetPatient.clnDate
+        , this.CurrentTargetPatient.cretno
+        , this.CurrentPreviewConsent.formCd);
+      globalParams[FOSParameter.emrinfo] = retVal.responseData;
+
       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);
@@ -3154,13 +3167,14 @@ namespace CLIP.eForm.Consent.UI {
         return;
       }
 
-      String emrInfoStr = hospitalWebService.getEmrDataString(
+      CLIP.eForm.Consent.UI.HospitalSvcRef.SingleReturnData retVal = hospitalWebService.getEmrDataString(
         "A01"
         , this.CurrentTargetPatient.HosType
         , this.CurrentTargetPatient.PatientCode
         , this.CurrentTargetPatient.clnDate
-        , this.CurrentTargetPatient.cretno);
-      globalParams[FOSParameter.emrinfo] = emrInfoStr;
+        , this.CurrentTargetPatient.cretno
+        , this.CurrentPreviewConsent.formCd);
+      globalParams[FOSParameter.emrinfo] = retVal.responseData;
 
       string fos = Common.GetFosString(formGuids
                                      , consentMain.PluginExecuteInfo["formServiceUrl"]

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

@@ -1466,21 +1466,29 @@ namespace CLIP.eForm.Consent.WebService {
     }
 
     [WebMethod(Description = "파라미터 필드 메시지 조회")]
-    public String getEmrDataString(string flag, string instcd, string pid, string indd, string cretno) {
-      String retValue = String.Empty;
+    public SingleReturnData getEmrDataString(string flag, string instcd, string pid, string indd, string cretno, string formCd) {
+      SingleReturnData result = new SingleReturnData();
 
-      using(PatientDac dac = new PatientDac()) {
+      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);
+        param.Add("formCd", formCd);
+
+        var retValue = dac.getEmrDataString(this.IbatisMapper, param);
 
-        retValue = dac.getEmrDataString(this.IbatisMapper, param);
+        if(retValue == null || retValue.Equals(String.Empty)) {
+          result.responseData = String.Empty;
+        }
+        else {
+          result.responseData = retValue;
+        }
       }
 
-      return retValue;
+      return result;
     }
 
     #endregion

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

@@ -915,7 +915,7 @@
     <statement id="getErmData" parameterClass="System.Collections.Hashtable" resultClass="System.String">
       <![CDATA[
         SELECT
-            EMA.FN_EMR_DATA(#flag#, #instcd#, #pid#, #indd#, #cretno#)
+            EMA.FN_EMR_DATA(#flag#, #instcd#, #pid#, #indd#, #cretno#, #formCd#)
           FROM
             DUAL
       ]]>