미작성 동의서 리스트 삭제조건 변경

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.dbs.mplus.knuh"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 7
-        versionName "1.1.0.7"
+        versionCode 10
+        versionName "1.1.0.10"
         multiDexEnabled true
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/dbs/mplus/knuh/activity/activityEvent/CenterMenu.java

@@ -185,6 +185,7 @@ public class CenterMenu {
         } else {
           instance.consentCenterAdaper.arrayList.clear();
           instance.consentCenterAdaper.arrayList = arrayList;
+          instance.consentCenterAdaper.checkMap.clear();
           instance.consentCenterAdaper.notifyDataSetChanged();
 //          instance.tempRecyclerView.scrollToPosition(0);
         }

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

@@ -44,7 +44,7 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
   private ConsentEvent consentEvent;
   private String userId = "";
 
-  private HashMap<Integer, Object> checkMap;
+  public HashMap<Integer, Object> checkMap;
 
   private CustomDeleteAlert customDeleteAlert = null;
 
@@ -103,6 +103,7 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
     String consentState    = consentFormListVO.getConsentState();
     String consentStateEng = consentFormListVO.getConsentStateEng();
     String createUserId    = consentFormListVO.getCreateUserId();
+    String modifyUserId    = consentFormListVO.getModifyUserId();
 
     holder.chkConsent.setVisibility(View.VISIBLE);
 
@@ -123,7 +124,7 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
     holder.tvPatientName.setVisibility(View.GONE);
     holder.tvTemp.setText(consentState);
 
-    if (createUserId.equals(userId)) {
+    if (modifyUserId.equals(userId)) {
       holder.tvTemp.setVisibility(View.VISIBLE);
       holder.tvSubText.setText(mContext.getString(R.string.delete));
       tvSubBg.setColor(ContextCompat.getColor(mContext, R.color.alertColor));
@@ -251,6 +252,7 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
 
           ConsentFacade consentFacade = new ConsentFacade(mContext, consentStateEng);
           consentFacade.startConsent(consentMap, certPass, "centerTemp");
+
         }
       } else if (holder.tvSubText == v) {
         String message = String.format(mContext.getString(R.string.deleteConsent), formName);

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

@@ -618,7 +618,7 @@ public class ConsentCreateParam {
     String formCd     = consentFormListVO.getFormCd();
     String formRid    = consentFormListVO.getFormRid();
 
-    map.put("consentStateEng", consentStateEng);
+    map.put("consentStateEng", consentFormListVO.getConsentStateEng());
     map.put("parCMSGBD_ocr_cd", ocrTag.equals("") ? getOcrTag() : ocrTag);
     map.put("parCMDCFT_1PrintNm", formPrntNm);
     map.put("rid", consentMstRid);

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

@@ -190,22 +190,26 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs>, CallBac
       if (Util.checkNetwork(mContext) == true) {
         switch (eventArgs.getResultCode()) {
           case SAVE:       // 인증저장
-            HashMap<String, String> mData = new HashMap<String, String>();
-            mData.put("consentmstrid", saveData.get("consentMstRid").toString());
-            mData.put("consent_state", saveData.get("consentStateEng").toString());
-//            Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.CHECK_CONSENT_STATE, mData, callBack);
-
-            Log.e(TAG, "mData -- > " + mData);
 
             int state = 0;
-            HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_CONSENT, ConsentConfig.CHECK_CONSENT_STATE, mData);
             try {
-              SoapObject object = connection.execute().get();
-              state = Integer.parseInt(object.getProperty("responseData").toString().trim());
+              HashMap<String, String> mData = new HashMap<String, String>();
+              mData.put("consentmstrid", saveData.get("consentMstRid").toString());
+              if (saveData.get("consentStateEng") != null) {
+                mData.put("consent_state", saveData.get("consentStateEng").toString());
+                HttpSoapConnection connection = new HttpSoapConnection(ConsentConfig.HOST_CONSENT, ConsentConfig.CHECK_CONSENT_STATE, mData);
+                SoapObject object = connection.execute().get();
+                state = Integer.parseInt(object.getProperty("responseData").toString().trim());
+                Log.e(TAG, "mData -- > " + mData);
+                Log.e(TAG, "state -- > " + state);
+              }
+
             } catch (ExecutionException e) {
               e.printStackTrace();
             } catch (InterruptedException e) {
               e.printStackTrace();
+            } catch (NullPointerException e) {
+              e.printStackTrace();
             }
 
             if (state == 1) {

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

@@ -45,10 +45,10 @@ public class HttpSoapConnection extends AsyncTask<Void, Void, SoapObject> {
     try {
 
       SoapSerializationEnvelope soapEnvelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
-      soapEnvelope.bodyOut = soapObject;
+//      soapEnvelope.bodyOut = soapObject;
       soapEnvelope.setOutputSoapObject(soapObject);
       soapEnvelope.dotNet = true;
-      soapEnvelope.implicitTypes = false;
+      soapEnvelope.implicitTypes = true;
 
       List<HeaderProperty> headers=new ArrayList<HeaderProperty>();
       HeaderProperty headerProperty=new HeaderProperty("Accept-Encoding", "none");

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

@@ -244,6 +244,7 @@ public class SoapParser {
 
         String consentMstRid   = so.getProperty("consentMstRid").toString().trim();
         String createUserId    = so.getProperty("createUserId").toString().trim();
+        String modifyUserId    = so.getProperty("modifyUserId").toString().trim();
         String ocrTag          = so.getProperty("ocrTag").toString().trim();
         String pid             = so.getProperty("pid").toString().trim();
 
@@ -273,6 +274,8 @@ public class SoapParser {
 
         consentMstRid   = consentMstRid.equals(ConsentConfig.RETURN_NULL) ? "" : consentMstRid;
         createUserId    = createUserId.equals(ConsentConfig.RETURN_NULL) ? "" : createUserId;
+        modifyUserId    = modifyUserId.equals(ConsentConfig.RETURN_NULL) ? "" : modifyUserId;
+
         ocrTag          = ocrTag.equals(ConsentConfig.RETURN_NULL) ? "" : ocrTag;
         pid             = pid.equals(ConsentConfig.RETURN_NULL) ? "" : pid;
         inDd            = inDd.equals(ConsentConfig.RETURN_NULL) ? "" : inDd;
@@ -298,7 +301,7 @@ public class SoapParser {
         linkFormCd      = linkFormCd.equals(ConsentConfig.RETURN_NULL) ? "" : linkFormCd;
         jinjeongCd      = jinjeongCd.equals(ConsentConfig.RETURN_NULL) ? "" : jinjeongCd;
 
-        arrayList.add(new ConsentFormListVO(consentMstRid, createUserId, ocrTag, pid, inDd, ordType, ordDeptCd, cretNo, opRsrvNo, patientName, consentState, consentStateEng, formCd, formGuid, formName, formRid, printOnly, pageCnt, ocrTagPrntYn, formPrntNm, certUseYn, opDiagNm, opNm, userDrFlag, linkFormCd, jinjeongCd));
+        arrayList.add(new ConsentFormListVO(consentMstRid, createUserId, modifyUserId, ocrTag, pid, inDd, ordType, ordDeptCd, cretNo, opRsrvNo, patientName, consentState, consentStateEng, formCd, formGuid, formName, formRid, printOnly, pageCnt, ocrTagPrntYn, formPrntNm, certUseYn, opDiagNm, opNm, userDrFlag, linkFormCd, jinjeongCd));
       }
     }
 

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

@@ -82,7 +82,7 @@ public class Util {
   public static void networkErrorAlert(final AppCompatActivity mActivity) {
     final CustomAlertDialog csAlert = new CustomAlertDialog(mActivity);
     csAlert.show();
-    csAlert.setContent(mActivity.getString(R.string.networkError), ConsentConfig.RETURN_NULL);
+    csAlert.setContent(mActivity.getString(R.string.networkError), ConsentConfig.ALERT_BTN_TYPE);
 
     csAlert.btnConfirm2.setOnClickListener(new View.OnClickListener() {
       @Override