3cooking 5 éve
szülő
commit
c2464827d2

+ 2 - 1
app/build.gradle

@@ -17,7 +17,8 @@ android {
 
         buildConfigField "String", "originalPackageName", "\"com.dbs.dbsec\"";
 //        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://wcollector.idatabank.com:8091/\""
-        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:8080/\""
+//        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:8080/\""
+        buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.0.30:8080/\""
         buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://wcollector.idatabank.com:5228/\""
 //        buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://211.118.215.111:8090/\""
         buildConfigField "String", "INST_CD", "\"031\""

+ 1 - 1
app/src/main/java/com/dbs/dbsec/MainActivity.java

@@ -65,7 +65,7 @@ public class MainActivity extends AppCompatActivity {
     CallBack callBack = new CallBack() {
       @Override
       public void result(String result) {
-        Log.e(TAG, "result -- > " + result);
+        Log.e(TAG, "getBaseData -- > " + result);
         ArrayList<HashMap<String, String>> arrayList = Common.parseJSON(mContext, result);
 
         for (int i = 0; i < arrayList.size(); i++) {

+ 1 - 1
app/src/main/java/com/dbs/dbsec/activity/LoginActivity.java

@@ -208,7 +208,7 @@ public class LoginActivity extends AppCompatActivity {
     CallBack callBack = new CallBack() {
       @Override
       public void result(final String result) {
-        Log.e(TAG, "result -- > " + result);
+        Log.e(TAG, "doLogin -- > " + result);
         runOnUiThread(new Runnable() {
           @Override
           public void run() {

+ 8 - 8
app/src/main/java/com/dbs/dbsec/activity/adapter/ConsentListAdapter.java

@@ -131,14 +131,14 @@ public class ConsentListAdapter extends RecyclerView.Adapter<ConsentListAdapter.
       String formPrntNm    = consentFormListVO.getFormPrntNm();
       String printCnt      = consentFormListVO.getPrintCnt();
       String consentMstRid = consentFormListVO.getConsentMstRid();
-      String pid = consentFormListVO.getPid();
-      String ocrTag = consentFormListVO.getOcrTag();
-      String clnDate = consentFormListVO.getClnDate();
-      String cretNo = consentFormListVO.getCretNo();
-      String ordType = consentFormListVO.getOrdType();
-      String deptCd = consentFormListVO.getDeptCd();
-      String mainDrId = consentFormListVO.getMainDrId();
-      String certPass = consentFormListVO.getCertPass();
+      String pid           = consentFormListVO.getPid();
+      String ocrTag        = consentFormListVO.getOcrTag();
+      String clnDate       = consentFormListVO.getClnDate();
+      String cretNo        = consentFormListVO.getCretNo();
+      String ordType       = consentFormListVO.getOrdType();
+      String deptCd        = consentFormListVO.getDeptCd();
+      String mainDrId      = consentFormListVO.getMainDrId();
+      String certPass      = consentFormListVO.getCertPass();
 
       if (v == holder.listLayer) {
 

+ 75 - 101
app/src/main/java/com/dbs/dbsec/consent/ConsentFacade.java

@@ -61,6 +61,7 @@ public class ConsentFacade {
     runOption.setEnableRequiredErrorPopupContentsLineFeed(false); // 필수 입력 오류 팝업 리스트의 개행 여부를 설정함 true : 개행, false : ", " 구분
     runOption.setRunAsRepositoryV2(true);
     runOption.setSameCheckAsSaveWhenTempSave2(TempSaveCheck.Always);
+    runOption.setExternalControlDefinedPath(ConsentConfig.CONSENT_EXTERNAL_SERVER); // 외부 사용자 정의 컨트롤의 정보를 갖는 서버 URL을 설정함
 
     runOption.setUiStyle(getUiStyle());
 
@@ -73,6 +74,7 @@ public class ConsentFacade {
     String fos = createFOS(consentData);
     String consentMstRid = formList.get(0).get("consentMstRid");
 
+    eFormToolkit.setResultEventHandler(new EformSaveEventHandler(mContext, eFormToolkit, consentData, certify));
     eFormToolkit.setRunOption(getRunOption(consentMstRid));
 
     eFormToolkit.startEFormViewer(fos);
@@ -144,107 +146,79 @@ public class ConsentFacade {
 
   private String getUiStyle() {
 
-    String str = "{                                                                                                                                         " +
-                 "  'toolbar': {                                                                                                                            " +
-                 "    'buttons': {                                                                                                                          " +
-                 "      'drawingtoggle': {                                                                                                                  " +
-                 "        'icon': {                                                                                                                         " +
-                 "          'enable-resource-name': drawing_toggle_enable,                                                                                  " +
-                 "          'disable-resource-name': drawing_toggle_disable                                                                                 " +
-                 "        },                                                                                                                                " +
-                 "        'visible': true                                                                                                                   " +
-                 "      },                                                                                                                                  " +
-                 "      'record': {                                                                                                                         " +
-                 "        'visible': true,                                                                                                                  " +
-                 "        'enable': true                                                                                                                    " +
-                 "      },                                                                                                                                  " +
-                 "      'pageattach': {                                                                                                                     " +
-                 "        'text': '" + mContext.getString(R.string.addPage) + "',     " +
-                 "        'visible': true,                                                                                                                  " +
-                 "        'use-attach-page': true,                                                                                                          " +
-                 "        'use-camera-attach-page': true                                                                                                    " +
-                 "      },                                                                                                                                  " +
-                 "      'save': {                                                                                                                           " +
-                 "        'text': '" + mContext.getString(R.string.certifySave) + "', " +
-                 "        'visible': true,                                                                                                                  " +
-                 "        'enabled': true                                                                                                                   " +
-                 "      },                                                                                                                                  " +
-                 "      'tempsave:' {                                                                                                                       " +
-                 "        'text': '" + mContext.getString(R.string.tempList) + "',    " +
-                 "        'visible': true,                                                                                                                  " +
-                 "        'enable': true                                                                                                                    " +
-                 "      },                                                                                                                                  " +
-                 "      'tempsave2:' {                                                                                                                      " +
-                 "        'text': '" + mContext.getString(R.string.confirmSave) + "', " +
-                 "        'visible': true,                                                                                                                  " +
-                 "        'enable': true                                                                                                                    " +
-                 "      },                                                                                                                                  " +
-                 "      'exit': {                                                                                                                           " +
-                 "        'text': '" + mContext.getString(R.string.exit) + "',                                                                              " +
-                 "        'visible': true                                                                                                                   " +
-                 "      }                                                                                                                                   " +
-                 "    }                                                                                                                                     " +
-                 "  },                                                                                                                                      " +
-                 "  'required-input': {                                                                                                                     " +
-                 "    'border': {                                                                                                                           " +
-                 "      'visible': true,                                                                                                                    " +
-                 "      'width': 2,                                                                                                                         " +
-                 "      'color': {                                                                                                                          " +
-                 "        'a': 255,                                                                                                                         " +
-                 "        'r': 255,                                                                                                                         " +
-                 "        'g': 0,                                                                                                                           " +
-                 "        'b': 0                                                                                                                            " +
-                 "      }                                                                                                                                   " +
-                 "    },                                                                                                                                    " +
-                 "    'background': {                                                                                                                       " +
-                 "      'visible': true,                                                                                                                    " +
-                 "      'color': {                                                                                                                          " +
-                 "        'a': 255,                                                                                                                         " +
-                 "        'r': 255,                                                                                                                         " +
-                 "        'g': 0,                                                                                                                           " +
-                 "        'b': 0                                                                                                                            " +
-                 "      }                                                                                                                                   " +
-                 "    }                                                                                                                                     " +
-                 "  },                                                                                                                                      " +
-                 "  'toast-message': {                                                                                                                      " +
-                 "    'signature-missing-data:' {                                                                                                           " +
-                 "      'text': '" + mContext.getString(R.string.emptySign) + "'      " +
-                 "    }                                                                                                                                     " +
-                 "  },                                                                                                                                      " +
-                 "  'dialog:' {                                                                                                                             " +
-                 "    'save': {                                                                                                                             " +
-                 "      'title': '" + mContext.getString(R.string.certifySave) + "',                                                                        " +
-                 "      'contents': '" + mContext.getString(R.string.certifySave) + "'                                                                      " +
-                 "    },                                                                                                                                    " +
-                 "    'temp-save': {                                                                                                                        " +
-                 "      'title:': '" + mContext.getString(R.string.tempList) + "',                                                                          " +
-                 "      'contents': " + mContext.getString(R.string.saveTempMsg) + "'                                                                       " +
-                 "    },                                                                                                                                    " +
-                 "    'temp-save2:' {                                                                                                                       " +
-                 "      'title': '" + mContext.getString(R.string.confirmSave) + "',                                                                        " +
-                 "      'contents': '" + mContext.getString(R.string.saveConfirmMsg) + "'                                                                   " +
-                 "    },                                                                                                                                    " +
-                 "    'exit': {                                                                                                                             " +
-                 "      'title': '" + mContext.getString(R.string.exit) + "',                                                                               " +
-                 "      'contents': '" + mContext.getString(R.string.saveAction) + "',                                                                      " +
-                 "    }                                                                                                                                     " +
-                 "  },                                                                                                                                      " +
-                 "  'progress': {                                                                                                                           " +
-                 "    'save': {                                                                                                                             " +
-                 "      'title': '" + String.format(mContext.getString(R.string.eformSaveProgressTitle), mContext.getString(R.string.certifySave)) + "',    " +
-                 "      'contents': '" + String.format(mContext.getString(R.string.eformSaveProgressMsg), mContext.getString(R.string.certifySave)) + "'    " +
-                 "    },                                                                                                                                    " +
-                 "    'tempsave': {                                                                                                                         " +
-                 "      'title': '" + String.format(mContext.getString(R.string.eformSaveProgressTitle), mContext.getString(R.string.tempList)) + "',       " +
-                 "      'contents': '" + String.format(mContext.getString(R.string.eformSaveProgressMsg), mContext.getString(R.string.tempList)) + "'       " +
-                 "    },                                                                                                                                    " +
-                 "    'tempsave2': {                                                                                                                        " +
-                 "      'title': '" + String.format(mContext.getString(R.string.eformSaveProgressTitle), mContext.getString(R.string.confirmSave)) + "',    " +
-                 "      'contents': '" + String.format(mContext.getString(R.string.eformSaveProgressTitle), mContext.getString(R.string.confirmSave)) + "', " +
-                 "    }                                                                                                                                     " +
-                 "  }                                                                                                                                       " +
-                 "}                                                                                                                                         ";
-
+    String str = "{" +
+                 "  'toolbar': {                                                          " +
+                 "    'top-toolbar': {                                                    " +
+                 "      'visible': true                                                   " +
+                 "    },                                                                  " +
+                 "    'buttons': {                                                        " +
+                 "      'record': {                                                       " +
+                 "        'visible': true,                                                " +
+                 "        'enabled': false                                                " +
+                 "      },                                                                " +
+                 "      'pageattach': {                                                   " +
+                 "        'text': '" + mContext.getString(R.string.addPage) + "',         " +
+                 "        'visible': true,                                                " +
+                 "        'use-attach-page': true,                                        " +
+                 "        'use-camera-attach-page': true                                  " +
+                 "      },                                                                " +
+                 "      'save': {                                                         " +
+                 "        'text': '" + mContext.getString(R.string.certifySave) + "',     " +
+                 "        'visible': true,                                                " +
+                 "        'enabled': true                                                 " +
+                 "      },                                                                " +
+                 "      'tempsave': {                                                     " +
+                 "        'text': '" + mContext.getString(R.string.tempList) + "',        " +
+                 "        'visible': true,                                                " +
+                 "        'enabled': true                                                 " +
+                 "      },                                                                " +
+                 "      'tempsave2': {                                                    " +
+                 "        'text': '" + mContext.getString(R.string.confirmSave) + "',     " +
+                 "        'visible': true,                                                " +
+                 "        'enabled': true                                                 " +
+                 "      },                                                                " +
+                 "      'exit': {                                                         " +
+                 "        'text': '" + mContext.getString(R.string.exit) + "',            " +
+                 "        'visible': true                                                 " +
+                 "      }                                                                 " +
+                 "    }                                                                   " +
+                 "  },                                                                    " +
+                 "  'dialog': {                                                           " +
+                 "    'save': {                                                           " +
+                 "      'title': '" + mContext.getString(R.string.certifySave) + "',      " +
+                 "      'contents': '" + mContext.getString(R.string.certifiedMsg) + "'   " +
+                 "    },                                                                  " +
+                 "    'tempsave': {                                                       " +
+                 "      'title': '" + mContext.getString(R.string.tempList) + "',         " +
+                 "      'contents': '" + mContext.getString(R.string.saveTempMsg) + "'    " +
+                 "    },                                                                  " +
+                 "    'tempsave2': {                                                      " +
+                 "      'title': '" + mContext.getString(R.string.confirmSave) + "',      " +
+                 "      'contents': '" + mContext.getString(R.string.saveConfirmMsg) + "' " +
+                 "    }                                                                   " +
+                 "  },                                                                    " +
+                 "  'required-input': {                                                   " +
+                 "    'border': {                                                         " +
+                 "      'visible': true,                                                  " +
+                 "      'width': 2,                                                       " +
+                 "      'color': {                                                        " +
+                 "        'a': 255,                                                       " +
+                 "        'r': 255,                                                       " +
+                 "        'g': 0,                                                         " +
+                 "        'b': 0                                                          " +
+                 "      }                                                                 " +
+                 "    },                                                                  " +
+                 "    'background': {                                                     " +
+                 "      'visible': true,                                                  " +
+                 "      'color': {                                                        " +
+                 "        'a': 120,                                                       " +
+                 "        'r': 255,                                                       " +
+                 "        'g': 0,                                                         " +
+                 "        'b': 0                                                          " +
+                 "      }                                                                 " +
+                 "    }                                                                   " +
+                 "  }                                                                     " +
+                 "}                                                                       ";
 
     return str;
   }

+ 179 - 0
app/src/main/java/com/dbs/dbsec/consent/EformSaveEventHandler.java

@@ -0,0 +1,179 @@
+package com.dbs.dbsec.consent;
+
+import android.content.Context;
+import android.util.Base64;
+import android.util.Log;
+import android.util.TypedValue;
+
+import com.dbs.dbsec.BuildConfig;
+import com.dbs.dbsec.activity.ConsentActivity;
+import com.dbs.dbsec.httpTask.CallBack;
+import com.dbs.dbsec.util.Common;
+import com.dbs.dbsec.util.ConsentConfig;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import kr.co.clipsoft.eform.EFormToolkit;
+import kr.co.clipsoft.eform.event.IEventHandler;
+import kr.co.clipsoft.eform.event.ResultEventArgs;
+
+import static kr.co.clipsoft.eform.type.enumtype.ResultCode.TEMP_SAVE;
+
+public class EformSaveEventHandler implements IEventHandler<ResultEventArgs> {
+
+  private static final String TAG = EformSaveEventHandler.class.getSimpleName();
+  private Context mContext;
+  private EFormToolkit eFormToolkit;
+  private HashMap consentData;
+  private ConsentActivity instance;
+
+  private HashMap saveData;
+
+  private String btnType = "";
+  private String certify = "";
+
+  public EformSaveEventHandler(Context mContext, EFormToolkit eFormToolkit, HashMap consentData, String certify) {
+    this.mContext = mContext;
+    this.eFormToolkit = eFormToolkit;
+    this.instance = (ConsentActivity) mContext;
+    this.consentData = consentData;
+    this.saveData = new HashMap();
+    this.certify = certify;
+  }
+
+  @Override
+  public void eventReceived(Object o, ResultEventArgs resultEventArgs) {
+    saveData = createSaveData(resultEventArgs, consentData);
+
+    switch (resultEventArgs.getResultCode()) {
+      case TEMP_SAVE:
+        Common.callHttp(mContext, ConsentConfig.SAVE_TEMP_DATA, saveData, callBack);
+
+        break;
+    }
+  }
+
+  private HashMap createSaveData(ResultEventArgs resultEventArgs, HashMap consentData) {
+    HashMap<String, String> globalParam = (HashMap<String, String>) consentData.get("globalParam");
+    ArrayList<HashMap<String, String>> formList = (ArrayList<HashMap<String, String>>) consentData.get("consentArray");
+
+    String consentMstRidStr = formList.get(0).get("consentMstRid");
+    String cretNoStr        = globalParam.get("par_patientCretno") == null ? formList.get(0).get("par_patientCretno") : globalParam.get("par_patientCretno");
+
+    consentMstRidStr = consentMstRidStr.equals("") ? "0" : consentMstRidStr;
+    cretNoStr = cretNoStr.equals("") ? "0" : cretNoStr;
+
+    String userId = Common.getStringPreference(mContext, "userInfo", "userId");
+    String userDeptCd = Common.getStringPreference(mContext, "userInfo", "deptCd");
+    String pid = globalParam.get("par_patientId") == null ? formList.get(0).get("par_patientId") : globalParam.get("par_patientId");
+    String formId               = formList.get(0).get("formId");
+    String formCode             = formList.get(0).get("formCode");
+    String patientDeptCd        = globalParam.get("patientDeptCd") == null ? formList.get(0).get("patientDeptCd") : globalParam.get("patientDeptCd");
+    String dataXml              = resultEventArgs.getDataXml();
+    int consentMstRid           = Integer.parseInt(consentMstRidStr);
+    Log.e(TAG, "consentMstRid -- > " + consentMstRid);
+    int reWriteConsentMstRid    = certify.equals("CERTIFY_CMP") ? consentMstRid : 0;
+    String deviceType           = "AND";
+    String deviceMacAddr        = Common.getMACAddress();
+    String ordType              = globalParam.get("ordType") == null ? formList.get(0).get("ordType") : globalParam.get("ordType");
+    String instCd               = BuildConfig.INST_CD;
+    String inDd                 = globalParam.get("par_patientClnDt") == null ? formList.get(0).get("par_patientClnDt") : globalParam.get("par_patientClnDt");
+    String dSchDd               = globalParam.get("dSchDd");
+    String ward                 = globalParam.get("par_patientWardNo");
+    String roomCd               = globalParam.get("par_patientRoomNo");
+    String ocrTag               = formList.get(0).get("par_ocrCd");
+    int cretNo                  = globalParam.get("par_patientCretno") == null ? Integer.parseInt(formList.get(0).get("par_patientCretno")) : Integer.parseInt(globalParam.get("par_patientCretno"));
+    String mainDrId             = globalParam.get("mainDrId") == null ? formList.get(0).get("mainDrId") : globalParam.get("mainDrId");
+    String formPageCnt          = String.valueOf(resultEventArgs.getTotalPagesCount());
+    String actionKind           = "P"; // 임시저장 : P, 인증저장 : C
+    String opRrsvNo             = globalParam.get("par_opRsrvNo");
+    String consentState         = "TEMP"; // 임시저장 : TEMP, 인증저장 : CERTIFY_CMP, 확인저장 : ELECTR_CMP
+    int orderNo                 = 0;
+    String orderName            = "";
+    String orderCd              = "";
+
+    String eptFilePath = resultEventArgs.getTempFilePath();
+    StringBuffer formXml = new StringBuffer();
+    if (eptFilePath != null && "".equals(eptFilePath) == false) {
+      try {
+        BufferedReader br = new BufferedReader(new FileReader(eptFilePath));
+        while (br.ready()) {
+          formXml.append(br.readLine());
+        }
+      } catch(Exception e) {
+        e.printStackTrace();
+        this.eFormToolkit.sendEFormViewerCancelEvent("EPT 파일을 읽을 수 없습니다.");
+      }
+    }
+
+    HashMap mData = new HashMap();
+
+    try {
+      String compress = Common.base64Encode(Common.zipStringToBytes(formXml.toString()));
+      mData.put("formXml", compress);
+      compress = Common.base64Encode(Common.zipStringToBytes(dataXml));
+      mData.put("dataXml", compress);
+    } catch(Exception e) {
+      e.printStackTrace();
+    }
+    mData.put("userId", userId);
+    mData.put("userDeptCd", userDeptCd);
+    mData.put("pid", pid);
+    mData.put("formId", formId);
+    mData.put("formCd", formCode);
+    mData.put("patientDeptCd", patientDeptCd);
+
+    mData.put("consentMstRid", consentMstRid);
+    mData.put("reWriteConsentMstRid", reWriteConsentMstRid);
+    mData.put("deviceType", deviceType);
+    mData.put("deviceMacAddr", deviceMacAddr);
+    mData.put("ordType", ordType);
+    mData.put("instCd", instCd);
+    mData.put("inDd", inDd);
+    mData.put("ward", ward);
+    mData.put("roomCd", roomCd);
+    mData.put("ocrTag", ocrTag);
+    if (cretNo != 0) {
+      mData.put("cretNo", cretNo);
+    }
+    mData.put("mainDrId", mainDrId);
+    mData.put("formPageCnt", formPageCnt);
+    mData.put("opRrsvNo", opRrsvNo);
+    mData.put("orderNo", orderNo);
+    mData.put("orderName", orderName);
+    mData.put("orderCd", orderCd);
+    mData.put("dSchDd", dSchDd);
+    mData.put("deviceMacAddr", Common.getMACAddress());
+    mData.put("actionKind", "P");
+    mData.put("consentState", "TEMP");
+    Log.e(TAG, "mData -- > " + mData);
+
+    return mData;
+  }
+
+  private CallBack callBack = new CallBack() {
+    @Override
+    public void result(String result) {
+      Log.e(TAG, "saveEvent -- > " + result);
+      ((ConsentActivity) mContext).runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          eFormToolkit.sendEFormViewerOkEvent();
+        }
+      });
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public void error() {
+
+    }
+  };
+}

+ 2 - 1
app/src/main/java/com/dbs/dbsec/httpTask/ParseJsonData.java

@@ -300,6 +300,7 @@ public class ParseJsonData {
       String pid = mm.get("pid");
       String deptEngAggr = mm.get("deptEngAggr");
       String consentState = mm.get("consentState");
+      String consentStateEng = mm.get("consentStateEng");
       String consentMstRid = mm.get("consentMstRid");
       String ocrTag = mm.get("ocrTag");
       String modifyUserId = mm.get("modifyUserId");
@@ -313,7 +314,7 @@ public class ParseJsonData {
       String mainDrId = mm.get("mainDrId");
       String patientName = mm.get("patientName");
 
-      arrayList.add(new ConsentFormListVO(idx, formId, formCode, formName, formPrntNm, printCnt, certPass, pid, deptEngAggr, consentState, consentMstRid, ocrTag, modifyUserId, modifyUserNm, modifyDateTime, create_dateTime, clnDate, cretNo, ordType, deptCd, mainDrId, patientName));
+      arrayList.add(new ConsentFormListVO(idx, formId, formCode, formName, formPrntNm, printCnt, certPass, pid, deptEngAggr, consentState, consentStateEng, consentMstRid, ocrTag, modifyUserId, modifyUserNm, modifyDateTime, create_dateTime, clnDate, cretNo, ordType, deptCd, mainDrId, patientName));
     }
     return arrayList;
   }

+ 11 - 1
app/src/main/java/com/dbs/dbsec/model/ConsentFormListVO.java

@@ -11,6 +11,7 @@ public class ConsentFormListVO {
   private String pid = "";
   private String deptEngAggr = "";
   private String consentState = "";
+  private String consentStateEng = "";
   private String consentMstRid = "";
   private String ocrTag = "";
   private String modifyUserId = "";
@@ -24,7 +25,7 @@ public class ConsentFormListVO {
   private String mainDrId = "";
   private String patientName = "";
 
-  public ConsentFormListVO(String idx, String formId, String formCode, String formName, String formPrntNm, String printCnt, String certPass, String pid, String deptEngAggr, String consentState, String consentMstRid, String ocrTag, String modifyUserId, String modifyUserNm, String modifyDateTime, String create_dateTime, String clnDate, String cretNo, String ordType, String deptCd, String mainDrId, String patientName) {
+  public ConsentFormListVO(String idx, String formId, String formCode, String formName, String formPrntNm, String printCnt, String certPass, String pid, String deptEngAggr, String consentState, String consentStateEng, String consentMstRid, String ocrTag, String modifyUserId, String modifyUserNm, String modifyDateTime, String create_dateTime, String clnDate, String cretNo, String ordType, String deptCd, String mainDrId, String patientName) {
     this.idx = idx;
     this.formId = formId;
     this.formCode = formCode;
@@ -35,6 +36,7 @@ public class ConsentFormListVO {
     this.pid = pid;
     this.deptEngAggr = deptEngAggr;
     this.consentState = consentState;
+    this.consentStateEng = consentStateEng;
     this.consentMstRid = consentMstRid;
     this.ocrTag = ocrTag;
     this.modifyUserId = modifyUserId;
@@ -129,6 +131,14 @@ public class ConsentFormListVO {
     this.consentState = consentState;
   }
 
+  public String getConsentStateEng() {
+    return consentStateEng;
+  }
+
+  public void setConsentStateEng(String consentStateEng) {
+    this.consentStateEng = consentStateEng;
+  }
+
   public String getConsentMstRid() {
     return consentMstRid;
   }

+ 26 - 0
app/src/main/java/com/dbs/dbsec/util/Common.java

@@ -9,6 +9,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.util.Base64;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.WindowManager;
@@ -28,9 +29,13 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.NetworkInterface;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -45,6 +50,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.zip.GZIPOutputStream;
 
 public class Common {
 
@@ -536,4 +542,24 @@ public class Common {
 
     return resDate;
   }
+
+  public static String base64Encode(byte[] digest) throws UnsupportedEncodingException {
+    return Base64.encodeToString(digest, Base64.NO_WRAP);
+  }
+
+  /**
+   * GZip를 이용한 스트링 압축
+   * @author jksong
+   * @Param
+   * @since 2019-09-09 오전 8:30
+   **/
+  public static byte[] zipStringToBytes(String input) throws IOException {
+    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
+    BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(gzipOutputStream);
+    bufferedOutputStream.write(input.getBytes());
+    bufferedOutputStream.close();
+    byteArrayOutputStream.close();
+    return byteArrayOutputStream.toByteArray();
+  }
 }

+ 3 - 0
app/src/main/java/com/dbs/dbsec/util/ConsentConfig.java

@@ -27,6 +27,7 @@ public class ConsentConfig {
   public static final String GET_CONSENT_BY_SEARCH = CONSENT_SVC + "getConsentBySearch";
   public static final String GET_USER_FORM_SET     = CONSENT_SVC + "getUserFormSetList";
   public static final String GET_CONSENT_LIST      = CONSENT_SVC + "getConsentList";
+  public static final String SAVE_TEMP_DATA        = CONSENT_SVC + "saveTempData";
 
 
   public final static int CONNECT_TIMEOUT   = 10000;
@@ -40,5 +41,7 @@ public class ConsentConfig {
   public final static String CERTIFY_CMP = "CERTIFY_CMP"; // 인증저장
   public final static String PAPER_OUT   = "PAPER_OUT";   // 출력
 
+  public final static String CONSENT_EXTERNAL_SERVER = "http://211.118.215.111:5228/";
+
   public static HashMap<String, String> SETTING_DATA = new HashMap<String, String>();
 }