./

.idea/gradle.xml

@@ -14,6 +14,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

app/build.gradle

@@ -50,7 +50,8 @@ android {
     productFlavors {
         product {
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://consent.fatima.or.kr/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://consent2.fatima.or.kr:8888/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://consent.fatima.or.kr:8888/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://eform.fatima.or.kr/eformservice.aspx/\""
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원"]
@@ -59,14 +60,11 @@ android {
         dev {
             applicationIdSuffix ".dev"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.43.170/\""  // Local
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8070/\""
-
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.193:80/\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.0.3:80/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.194/\""  // Local
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8888/\""
 
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
-//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.43.170:8070/eformservice.aspx/\""
+//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://172.16.10.194:8070/eformservice.aspx/\"" // Local
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원 교육"]
         }

app/src/main/java/com/dbs/mplus/fatima/MainActivity.java

@@ -95,8 +95,8 @@ public class MainActivity extends AppCompatActivity {
       });
       return;
     } else {
-//      versionCheck();
-      permissionCheck();
+      versionCheck();
+//      permissionCheck();
     }
   }
 
@@ -104,7 +104,6 @@ public class MainActivity extends AppCompatActivity {
     HttpCallBack callBack = new HttpCallBack() {
       @Override
       public void result(final String result) {
-        Log.e(TAG, "result -- > " + result);
         runOnUiThread(new Runnable() {
           @Override
           public void run() {

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

@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -75,8 +76,9 @@ public class LoginActivity extends AppCompatActivity {
 //    etId.setText("105435");
 //    etPasswd.setText("sysedps!@#");
 
-    etId.setText("107810");
-    etPasswd.setText("3740asdf-");
+//    etId.setText("107810");
+//    etPasswd.setText("sysedps!@#");
+//    etPasswd.setText("3740asdf-");
 
 
 
@@ -167,12 +169,20 @@ public class LoginActivity extends AppCompatActivity {
   private HttpCallBack callBack = new HttpCallBack() {
     @Override
     public void result(final String result) {
-      JSONObject object = Util.xmltoJsonObject(result);
-      final String res = Util.xmlToJsonString(object);
+      Log.e(TAG, "result -- > " + result);
 
       runOnUiThread(new Runnable() {
         @Override
         public void run() {
+
+          if (result.equals("")) {
+            alertView(getString(R.string.loginFailed));
+            return;
+          }
+
+          JSONObject object = Util.xmltoJsonObject(result);
+          final String res = Util.xmlToJsonString(object);
+
           if (res.equals("")) {
             alertView(getString(R.string.loginFailed));
           } else {

app/src/main/java/com/dbs/mplus/fatima/adapter/PatientListAdapter.java

@@ -104,7 +104,10 @@ public class PatientListAdapter extends RecyclerView.Adapter<PatientListAdapter.
       holder.tvPract.setText(erMedispclNm);
       holder.tvWard.setText(badCd);
     } else if (instance.mobile.equals("P")) {
-      holder.tvPract.setText(Util.addSlashDate(opCnfmDd));
+      if (!opCnfmDd.equals("")) {
+        opCnfmDd = Util.addSlashDate(opCnfmDd);
+      }
+      holder.tvPract.setText(opCnfmDd);
       holder.tvWard.setText(opRoom);
     } else if (instance.mobile.equals("SR")) {
       holder.tvWard.setText(inDd);

app/src/main/java/com/dbs/mplus/fatima/fragment/HistoryFragment.java

@@ -489,7 +489,8 @@ public class HistoryFragment extends Fragment {
         String state = consentStateData.get(key);
 
         if (state.equals("ALL")) {
-          consentState = "'" + ConsentConfig.UNFINISHED + "', " + "'" + ConsentConfig.TEMP + "'," + "'" + ConsentConfig.VERBAL + "', " + "'" + ConsentConfig.ELECTR_CMP + "', " + "'" + ConsentConfig.CERTIFY_CMP + "', " + "'" + ConsentConfig.PAPER_OUT + "'";
+//          consentState = "'" + ConsentConfig.UNFINISHED + "', " + "'" + ConsentConfig.TEMP + "'," + "'" + ConsentConfig.VERBAL + "', " + "'" + ConsentConfig.ELECTR_CMP + "', " + "'" + ConsentConfig.CERTIFY_CMP + "', " + "'" + ConsentConfig.PAPER_OUT + "'";
+          consentState = "ALL";
         } else {
           consentState += state;
           if (consentStateData.size() - 1 > count) {
@@ -516,7 +517,7 @@ public class HistoryFragment extends Fragment {
         mData.put("patientCode", centerMenu.patientInfoVO.getPid());
         mData.put("startDt", getLeftDate());
         mData.put("endDt", getRightDate());
-        mData.put("consetState", consentState);
+        mData.put("consentState", consentState);
         mData.put("jobkindcd", instance.mobile.equals("O") && (instance.jobKindCd.equals("1140") || instance.jobKindCd.equals("1113")) ? "ALL" : instance.jobKindCd);
       }
 

app/src/main/java/com/dbs/mplus/fatima/httpTask/HttpCon.java

@@ -4,7 +4,7 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.util.Xml;
 
-import com.dbs.mplus.fatima.BuildConfig;
+
 import com.dbs.mplus.fatima.util.ConsentConfig;
 import com.dbs.mplus.fatima.util.Util;