Parcourir la source

동적파라미터 필드 기능 수정

songjunegeun il y a 4 ans
Parent
commit
1c6f52c342

+ 0 - 2
app/src/main/java/com/dbs/mplus/knuh/MainActivity.java

@@ -11,7 +11,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.telecom.Call;
 import android.util.Log;
 import android.view.View;
 
@@ -21,7 +20,6 @@ import com.dbs.mplus.knuh.httpTask.CallBack;
 import com.dbs.mplus.knuh.httpTask.HttpRunnable;
 import com.dbs.mplus.knuh.httpTask.HttpSoapConnection;
 import com.dbs.mplus.knuh.httpTask.SoapParser;
-import com.dbs.mplus.knuh.model.EmrDataListVO;
 import com.dbs.mplus.knuh.util.ConsentConfig;
 import com.dbs.mplus.knuh.util.Util;
 import com.gun0912.tedpermission.PermissionListener;

+ 8 - 6
app/src/main/java/com/dbs/mplus/knuh/consent/ConsentCreateParam.java

@@ -1,16 +1,13 @@
 package com.dbs.mplus.knuh.consent;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.Log;
 
 import com.dbs.mplus.knuh.BuildConfig;
-import com.dbs.mplus.knuh.R;
 import com.dbs.mplus.knuh.activity.ConsentActivity;
 import com.dbs.mplus.knuh.httpTask.HttpSoapConnection;
 import com.dbs.mplus.knuh.httpTask.SoapParser;
 import com.dbs.mplus.knuh.model.ConsentFormListVO;
-import com.dbs.mplus.knuh.model.EmrDataListVO;
 import com.dbs.mplus.knuh.model.PatientInfoVO;
 import com.dbs.mplus.knuh.model.UserVO;
 import com.dbs.mplus.knuh.util.ConsentConfig;
@@ -18,10 +15,7 @@ import com.dbs.mplus.knuh.util.Util;
 
 import org.ksoap2.serialization.SoapObject;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.concurrent.ExecutionException;
 
@@ -731,6 +725,14 @@ public class ConsentCreateParam {
     return userVO;
   }
 
+  /**
+   * 동적 파라메터 필드, 값 받아와서 맵핑 시켜준다
+   * @param pid
+   * @param inDd
+   * @param cretNo
+   * @param formCd
+   * @return
+   */
   private HashMap<String, String> getEmrDataList(String pid, String inDd, String cretNo, String formCd) {
     HashMap<String, String> resultMap = new HashMap<>();
     HashMap<String, String> mData = new HashMap<String, String>();

+ 0 - 3
app/src/main/java/com/dbs/mplus/knuh/httpTask/SoapParser.java

@@ -1,13 +1,10 @@
 package com.dbs.mplus.knuh.httpTask;
 
-import android.util.Log;
-
 import com.dbs.mplus.knuh.model.CategoryVO;
 import com.dbs.mplus.knuh.model.ConsentFormListVO;
 import com.dbs.mplus.knuh.model.ConsentImageVO;
 import com.dbs.mplus.knuh.model.DeptListVO;
 import com.dbs.mplus.knuh.model.DoctorListVO;
-import com.dbs.mplus.knuh.model.EmrDataListVO;
 import com.dbs.mplus.knuh.model.PatientInfoVO;
 import com.dbs.mplus.knuh.model.PatientListVO;
 import com.dbs.mplus.knuh.model.UserLoginDeptList;

+ 0 - 37
app/src/main/java/com/dbs/mplus/knuh/model/EmrDataListVO.java

@@ -1,37 +0,0 @@
-package com.dbs.mplus.knuh.model;
-
-public class EmrDataListVO {
-  private String parNm   = "";
-  private String flag    = "";
-  private String emrData = "";
-
-  public EmrDataListVO(String parNm, String flag, String emrData) {
-    this.parNm = parNm;
-    this.flag = flag;
-    this.emrData = emrData;
-  }
-
-  public String getParNm() {
-    return parNm;
-  }
-
-  public void setParNm(String parNm) {
-    this.parNm = parNm;
-  }
-
-  public String getFlag() {
-    return flag;
-  }
-
-  public void setFlag(String flag) {
-    this.flag = flag;
-  }
-
-  public String getEmrData() {
-    return emrData;
-  }
-
-  public void setEmrData(String emrData) {
-    this.emrData = emrData;
-  }
-}

+ 1 - 1
app/src/main/java/com/dbs/mplus/knuh/util/ConsentConfig.java

@@ -26,7 +26,7 @@ public class ConsentConfig {
   public static final String GET_BASE_DATA           = "GetBaseData";
   public static final String GET_USER_SIGN_DATA_INFO = "getUserSignDataInfo"; // 서명이미지 설정을 위한 기초정보 호출
   public static final String SET_SIGN_IMAGE          = "setSignImage";        // 사용자 서명이미지 설정
-  public static final String GET_EMR_DATA_LIST     = "getEmrDataList";
+  public static final String GET_EMR_DATA_LIST       = "getEmrDataList";
   public static final String GET_PATIENT_SAFETY_MSG  = "checkPatientSafetyMessage"; // 동명이인 주의 메시지
 
   public static final String HOST_CONSENT = BuildConfig.CONSENT_SERVER_URL + "ConsentSvc.asmx";