서식 오픈시 getEmrDataString 호출 후 내려오는 데이터를 parEMRINFO_A01 파라메터 필드에 추가 오류 수정

app/src/main/java/com/dbs/mplus/knuh/activity/LoginActivity.java

@@ -105,7 +105,7 @@ public class LoginActivity extends AppCompatActivity {
 //    etId.setText("98130");
 //    etPasswd.setText("a56515651!");
 
-//    etId.setText("ENR");
+//    etId.setText("EMR");
 //    etPasswd.setText("wjstkstlf1!");
   }
 

app/src/main/java/com/dbs/mplus/knuh/adapter/ConsentTempAdapter.java

@@ -195,7 +195,7 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
                   HashMap<String, Object> consentMap = new HashMap<String, Object>();
 
                   ConsentCreateParam consentCreateParam = new ConsentCreateParam(mContext);
-                  multiGlobalMap = consentCreateParam.setMultiGlobalParam(instance.centerMenu.patientInfoVO);
+                  multiGlobalMap = consentCreateParam.setMultiGlobalParam(instance.centerMenu.patientInfoVO, formCd);
                   for (int key : checkMap.keySet()) {
                     Log.e(TAG, "key -- > " + key);
                     ConsentFormListVO consentFormVO = arrayList.get(key);

app/src/main/java/com/dbs/mplus/knuh/consent/ConsentCreateParam.java

@@ -274,7 +274,7 @@ public class ConsentCreateParam {
 
     }
 
-    String dataString = getEmrDataString(pid,inDd, cretNo);
+    String dataString = getEmrDataString(pid,inDd, cretNo, consentFormListVO.getFormCd());
     map.put("parEMRINFO_A01", dataString);
 
     return map;
@@ -360,7 +360,7 @@ public class ConsentCreateParam {
   * @author jksong
   * @since 2020-05-06 오전 10:08
   **/
-  public HashMap<String, String> setMultiGlobalParam(PatientInfoVO patientInfoVO){
+  public HashMap<String, String> setMultiGlobalParam(PatientInfoVO patientInfoVO, String formCd) {
     HashMap<String, String> map = new HashMap<String, String>();
     String loginUserId          = Util.getStringPreference(mContext, "userInfo", "userId");
     String loginUserDeptCd      = Util.getStringPreference(mContext, "userInfo", "deptCd");
@@ -452,7 +452,7 @@ public class ConsentCreateParam {
       map.put("parNUR_Fast_HospitalroomNo", ward + '/' + roomCd);
     }
 
-    String dataString = getEmrDataString(pid,inDd, cretNo);
+    String dataString = getEmrDataString(pid,inDd, cretNo, formCd);
     map.put("parEMRINFO_A01", dataString);
 
     return map;
@@ -731,7 +731,7 @@ public class ConsentCreateParam {
     return userVO;
   }
 
-  private String getEmrDataString(String pid, String inDd, String cretNo) {
+  private String getEmrDataString(String pid, String inDd, String cretNo, String formCd) {
     String result = "";
     HashMap<String, String> mData = new HashMap<String, String>();
     mData.put("flag", "A01");
@@ -739,10 +739,15 @@ public class ConsentCreateParam {
     mData.put("pid", pid);
     mData.put("indd", inDd);
     mData.put("cretno", cretNo);
-    HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_USER_INFO, mData);
+    mData.put("formCd", formCd);
+    Log.e(TAG, "mData -- > " + mData);
+    HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_EMR_DATA_STRING, mData);
     try {
       SoapObject object = connection.execute().get();
+      Log.e(TAG, "getEmrDataString object -- > " + object);
       result = object.getProperty("responseData").toString().trim();
+
+      result = result.equals(ConsentConfig.RETURN_NULL) ? "" : result;
     } catch (ExecutionException e) {
       e.printStackTrace();
     } catch (InterruptedException e) {

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

@@ -26,6 +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_STRING     = "getEmrDataString";
 
   public static final String HOST_CONSENT = BuildConfig.CONSENT_SERVER_URL + "ConsentSvc.asmx";
   public static final String GET_CONSENT_CATEGORYY   = "GetCategoryForDropdown";  // 동의서 찾기시 카테고리 리스트