기왕력 맵핑 파라메터 수정

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

@@ -155,7 +155,7 @@ public class ConsentEvent {
                   final ArrayList<DataPiexVO> dataPiexVOArrayList = getDataPiex(patientInfoVO.getPid(), patientInfoVO.getInDd());
                   final int dataPiexSize = dataPiexVOArrayList.size();
                   if (dataPiexSize > 0) {
-                    String message = String.format(instance.getString(R.string.piexMessage), dataPiexVOArrayList.get(0).getCreateDateTime());
+                    String message = String.format(instance.getString(R.string.piexMessage), dataPiexVOArrayList.get(0).getUpdateDateTime());
                     instance.csAlert.show();
                     instance.csAlert.setContent(message, "");
                     instance.csAlert.btnConfirm.setText(instance.getString(R.string.yes));
@@ -169,8 +169,11 @@ public class ConsentEvent {
                           String itemVal  = dataPiexVOArrayList.get(i).getItemVal();
 
                           globalParam.put(connParm, itemVal);
-                          consentFacade.startConsent(map, certPass, apiType);
+
                         }
+
+                        map.put("globalParam", globalParam);
+                        consentFacade.startConsent(map, certPass, apiType);
                       }
                     });
                     instance.csAlert.btnCancel.setOnClickListener(new View.OnClickListener() {
@@ -230,13 +233,11 @@ public class ConsentEvent {
     HashMap<String, String> mData = new HashMap<String, String>();
     mData.put("instCd", BuildConfig.INST_CD);
     mData.put("pid", pid);
-    mData.put("clnDate", clnDate);
     Log.e(TAG, "getDataPiex mData -- > " + mData);
 
     HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_DATA_PIEX, mData);
     try {
       SoapObject object = connection.execute().get();
-      Log.e(TAG, "getDataPiex object -- > " + object);
 
       result = SoapParser.getDataPiex(object);
       Log.e(TAG, "getDataPiex result -- > " + result.size());

app/src/main/java/com/dbs/mplus/knuh/httpTask/SoapParser.java

@@ -664,7 +664,6 @@ public class SoapParser {
         SoapObject so = (SoapObject) object.getProperty(i);
 
         String pid            = so.getProperty("pid").toString().trim();
-        String clnDate        = so.getProperty("clnDate").toString().trim();
         String itemCd         = so.getProperty("itemCd").toString().trim();
         String itemVal        = so.getProperty("itemVal").toString().trim();
         String degnCd         = so.getProperty("degnCd").toString().trim();
@@ -672,9 +671,9 @@ public class SoapParser {
         String saveParm       = so.getProperty("saveParm").toString().trim();
         String connParm       = so.getProperty("connParm").toString().trim();
         String createDateTime = so.getProperty("createDateTime").toString().trim();
+        String updateDateTime = so.getProperty("updateDateTime").toString().trim();
 
         pid = pid.equals(ConsentConfig.RETURN_NULL) ? "" : pid;
-        clnDate = clnDate.equals(ConsentConfig.RETURN_NULL) ? "" : clnDate;
         itemCd = itemCd.equals(ConsentConfig.RETURN_NULL) ? "" : itemCd;
         itemVal = itemVal.equals(ConsentConfig.RETURN_NULL) ? "" : itemVal;
         degnCd = degnCd.equals(ConsentConfig.RETURN_NULL) ? "" : degnCd;
@@ -682,8 +681,9 @@ public class SoapParser {
         saveParm = saveParm.equals(ConsentConfig.RETURN_NULL) ? "" : saveParm;
         connParm = connParm.equals(ConsentConfig.RETURN_NULL) ? "" : connParm;
         createDateTime = createDateTime.equals(ConsentConfig.RETURN_NULL) ? "" : createDateTime;
+        updateDateTime = updateDateTime.equals(ConsentConfig.RETURN_NULL) ? "" : updateDateTime;
 
-        result.add(new DataPiexVO(pid, clnDate, itemCd, itemVal, degnCd, itemNm, saveParm, connParm, createDateTime));
+        result.add(new DataPiexVO(pid, itemCd, itemVal, degnCd, itemNm, saveParm, connParm, createDateTime, updateDateTime));
       }
     }
 

app/src/main/java/com/dbs/mplus/knuh/model/DataPiexVO.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 
 public class DataPiexVO implements Serializable {
   private String pid            = "";
-  private String clnDate        = "";
   private String itemCd         = "";
   private String itemVal        = "";
   private String degnCd         = "";
@@ -12,10 +11,10 @@ public class DataPiexVO implements Serializable {
   private String saveParm       = "";
   private String connParm       = "";
   private String createDateTime = "";
+  private String updateDateTime = "";
 
-  public DataPiexVO(String pid, String clnDate, String itemCd, String itemVal, String degnCd, String itemNm, String saveParm, String connParm, String createDateTime) {
+  public DataPiexVO(String pid, String itemCd, String itemVal, String degnCd, String itemNm, String saveParm, String connParm, String createDateTime, String updateDateTime) {
     this.pid = pid;
-    this.clnDate = clnDate;
     this.itemCd = itemCd;
     this.itemVal = itemVal;
     this.degnCd = degnCd;
@@ -23,6 +22,7 @@ public class DataPiexVO implements Serializable {
     this.saveParm = saveParm;
     this.connParm = connParm;
     this.createDateTime = createDateTime;
+    this.updateDateTime = updateDateTime;
   }
 
   public String getPid() {
@@ -33,14 +33,6 @@ public class DataPiexVO implements Serializable {
     this.pid = pid;
   }
 
-  public String getClnDate() {
-    return clnDate;
-  }
-
-  public void setClnDate(String clnDate) {
-    this.clnDate = clnDate;
-  }
-
   public String getItemCd() {
     return itemCd;
   }
@@ -96,4 +88,12 @@ public class DataPiexVO implements Serializable {
   public void setCreateDateTime(String createDateTime) {
     this.createDateTime = createDateTime;
   }
+
+  public String getUpdateDateTime() {
+    return updateDateTime;
+  }
+
+  public void setUpdateDateTime(String updateDateTime) {
+    this.updateDateTime = updateDateTime;
+  }
 }