songjunekeun před 5 roky
rodič
revize
098b3ce6b0

+ 5 - 3
app/build.gradle

@@ -77,7 +77,8 @@ android {
         bonwon_dev {
             applicationIdSuffix ".dev1"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:8096\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:8096\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.101.93:8096/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://emadev.knuh.kr:8095/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"031\""
             manifestPlaceholders = [appLabel: "본원교육"]
@@ -85,7 +86,7 @@ android {
         chilgok {
             applicationIdSuffix ".chilgok"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8091\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8091/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://ema032.knuh.kr:8090/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"032\""
             manifestPlaceholders = [appLabel: "칠곡운영"]
@@ -93,7 +94,8 @@ android {
         chilgok_dev {
             applicationIdSuffix ".chilgok.dev1"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:9096\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://emadev.knuh.kr:9096/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.101.93:9096/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://emadev.knuh.kr:9095/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"032\""
             manifestPlaceholders = [appLabel: "칠곡교육"]

+ 6 - 1
app/src/main/java/com/dbs/mplus/knuh/MainActivity.java

@@ -69,10 +69,12 @@ public class MainActivity extends AppCompatActivity {
     CallBack callBack = new CallBack() {
       @Override
       public void result(final SoapObject result) {
+        Log.e(TAG, "result --- > " + result);
+        Log.e(TAG, "result --- > " + result.getPropertyCount());
         runOnUiThread(new Runnable() {
           @Override
           public void run() {
-            if (result == null) {
+            if (result == null || result.getPropertyCount() == 0) {
               ConsentConfig.SETTING_DATA.put("SESSION_TIME", "0");
             } else {
               String sessionTime = result.getProperty("responseData").toString().trim();
@@ -96,6 +98,9 @@ public class MainActivity extends AppCompatActivity {
     };
 
     HashMap<String, String> mData = new HashMap<String, String>();
+    mData.put("instCd", BuildConfig.INST_CD);
+
+    Log.e(TAG, "mData -- > " + mData);
 
     if (Util.checkNetwork(mContext) == true) {
       HttpRunnable runnable = new HttpRunnable(ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_SESSION_TIME, mData, callBack);

+ 3 - 12
app/src/main/java/com/dbs/mplus/knuh/consent/ConsentCreateParam.java

@@ -222,16 +222,7 @@ public class ConsentCreateParam {
       map.put("parCMDCBD_DiseaseBox_5Blood", hemorrhage);
       map.put("parCMDCBD_status_etc", statusEtc);
 
-      String opcnfmddStr = "";
-
-      try {
-        opcnfmddStr = String.valueOf(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(opCnfmDd));
-      } catch (ParseException e) {
-        e.printStackTrace();
-        Log.e(TAG, "date error");
-      }
-
-      map.put("parCMDCBD_signdate", opcnfmddStr);
+      map.put("parCMDCBD_signdate", opCnfmDd);
 
       map.put("parCMDCBD_signtime", "");
       map.put("parCMDCFT_1PrintDt", "");
@@ -253,8 +244,8 @@ public class ConsentCreateParam {
       map.put("parCMDCBD_PopupV1_SPNm", opNm.equals("") ? consentFormListVO.getOpNm() : opNm);
       map.put("parCMSGBD_INPUTTelNo", userVO.getUserTelNo());
       map.put("parDEFAULT_DUTINSTCD", instCd);
-      map.put("parDEFAULT_POPUP_PATH", "https://ema031.knuh.kr:9091");
-//    map.put("parDEFAULT_POPUP_PATH", BuildConfig.CONSENT_SERVER_URL);
+//      map.put("parDEFAULT_POPUP_PATH", "https://ema031.knuh.kr:9091");
+    map.put("parDEFAULT_POPUP_PATH", BuildConfig.CONSENT_SERVER_URL);
       map.put("parCMDCBD_PopupV1_SurgeryCommonDepartment", perfDrFlag.equals("전공의") ? "" : perfDrDept);
       map.put("parCMDCBD_Anst1DrNm", anstDrNm1);
       map.put("parCMDCBD_Anst1DeptNm", anstDrFlag1.equals("전문의") ? anstDeptNm1 : "");

+ 2 - 2
app/src/main/java/com/dbs/mplus/knuh/consent/ConsentFacade.java

@@ -205,8 +205,8 @@ public class ConsentFacade {
     fos += "  <global>";
     fos += this.createFosPageTemplate();
     fos += "    <parameters>"; // form-list의 모든 서식에 적용될 파라미터
-//    fos += "            <param key='UrlParam'>" + BuildConfig.CONSENT_SERVER_URL + "</param>";
-    fos += "            <param key='UrlParam'>" + "https://ema031.knuh.kr:9091" + "</param>";
+    fos += "            <param key='UrlParam'>" + BuildConfig.CONSENT_SERVER_URL + "</param>";
+//    fos += "            <param key='UrlParam'>" + "https://ema031.knuh.kr:9091" + "</param>";
     fos += this.createParamString((HashMap<String, String>) consentData.get("globalParam"));
     fos += "    </parameters>";
     fos += "   </global>";