.

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/build.gradle

@@ -60,10 +60,10 @@ android {
         dev {
             applicationIdSuffix ".dev"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.fatima\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.192/\""
-//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8070/\""
-            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://172.16.10.192:8070/eformservice.aspx/\""
-//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
+//            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://172.16.10.192/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"http://192.168.100.124:8070/\""
+//            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://172.16.10.192:8070/eformservice.aspx/\""
+            buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"http://192.168.100.124:8090/eformservice.aspx/\""
             buildConfigField "String", "INST_CD", "\"111\""
             manifestPlaceholders = [appLabel: "파티마병원 교육"]
         }

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

@@ -135,6 +135,7 @@ public class ConsentActivity extends AppCompatActivity {
   public LinearLayout llPatientNmSort;
   public LinearLayout llRoomSort;
   public TextView column1;
+  public TextView column3;
   public TextView column4;
   public TextView column5;
   public TextView column6;
@@ -277,6 +278,7 @@ public class ConsentActivity extends AppCompatActivity {
     llRoomSort = (LinearLayout) findViewById(R.id.llRoomSort);
 
     column1 = (TextView) findViewById(R.id.column1);
+    column3 = (TextView) findViewById(R.id.column3);
     column4 = (TextView) findViewById(R.id.column4);
     column5 = (TextView) findViewById(R.id.column5);
     column6 = (TextView) findViewById(R.id.column6);
@@ -294,6 +296,7 @@ public class ConsentActivity extends AppCompatActivity {
     } else if (mobile.equals("E")) {
       column6.setText(getString(R.string.patientLocation));
     } else if (mobile.equals("P")) {
+      column3.setText(getString(R.string.opDept));
       column5.setText(getString(R.string.opDate));
       column6.setText(getString(R.string.opRoom));
     } else if (mobile.equals("SR")) {

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

@@ -67,8 +67,8 @@ public class LoginActivity extends AppCompatActivity {
     btnLogin = (Button) findViewById(R.id.btnLogin);
 
     //의사
-    etId.setText("105435");
-    etPasswd.setText("1812312");
+//    etId.setText("105435");
+//    etPasswd.setText("1812312");
 
     // 산부인과 의사
 //    etId.setText("104012");

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

@@ -124,10 +124,12 @@ public class CenterMenu {
     HttpCallBack callBack = new HttpCallBack() {
       @Override
       public void result(String result) {
+        Log.e(TAG, "result -- > " + result);
         if (!result.equals("")) {
           ArrayList<ConsentListVO> arrayList = DataParser.getConsentList(mContext, result);
+          setConsentAdapter(arrayList);
           if (arrayList.size() > 0) {
-            setConsentAdapter(arrayList);
+
           }
         }
       }
@@ -150,6 +152,7 @@ public class CenterMenu {
     mData.put("endDt", Util.removeSlashStr(Util.nowDate()));
     mData.put("consetState", consentState);
     mData.put("jobkindcd", instance.mobile.equals("O") && (instance.jobKindCd.equals("1140") || instance.jobKindCd.equals("1113")) ? "ALL" : instance.jobKindCd);
+    Log.e(TAG, "mData -- > " + mData);
     if (Util.checkNetwork(mContext) == true) {
       Util.callHttp(mContext, ConsentConfig.HOST_CONSENT, ConsentConfig.GET_CONSENT_LIST, mData, callBack);
     } else {

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

@@ -247,9 +247,8 @@ public class ConsentTempAdapter extends RecyclerView.Adapter<ConsentTempAdapter.
         checkMap.clear();
 
       } else if (holder.tvSubText == view) {
-        String message = String.format(mContext.getString(R.string.deleteConsent), formName);
         instance.csAlert.show();
-        instance.csAlert.setContent(message, "");
+        instance.csAlert.setContent(mContext.getString(R.string.deleteConsent), "");
         instance.csAlert.btnConfirm.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {

app/src/main/java/com/dbs/mplus/fatima/consent/ConsentFacade.java

@@ -123,7 +123,7 @@ public class ConsentFacade {
 
     eFormToolkit.setResultEventHandler(new EFormSaveHandler(mContext, eFormToolkit, consentData, apiType));
     eFormToolkit.setRunOption(createRunOption());
-    if (SignWrapper.getInstance().isCertificate(userId) == false) {
+    if (SignWrapper.getInstance().isCertificate(userId) == true) {
       String result = eFormToolkit.startEFormViewer(fos.trim());
 
       if (result.equals("ERROR_004")) {

app/src/main/java/com/dbs/mplus/fatima/consent/ConsentParameter.java

@@ -99,11 +99,12 @@ public class ConsentParameter {
       consentItem.put("IO_JuminNo", patientInfoVO.getJuminNo());
       consentItem.put("IO_PT_birthday", patientInfoVO.getJuminNo().split("-")[0]);
       consentItem.put("IO_roomNo", patientInfoVO.getRoomNo());
-      consentItem.put("IO_ADdate", patientInfoVO.getAdDate());
+      consentItem.put("IO_ADdate", Util.addSlashDate(patientInfoVO.getAdDate()));
       consentItem.put("IO_Dept", patientInfoVO.getDeptHngNm());
       consentItem.put("IO_Dept2", patientInfoVO.getDeptEngNm());
       consentItem.put("IO_DeptCd", patientInfoVO.getDeptCd());
 //      consentItem.put("IO_OPdept", patientInfoVO.getDeptHngNm());
+      consentItem.put("IO_OPdept", "");
       consentItem.put("IO_OPdr", patientInfoVO.getOpDrNm());
       consentItem.put("IO_Dx", patientInfoVO.getDxNm());
       consentItem.put("IO_bp", patientInfoVO.getBp());

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

@@ -189,7 +189,7 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs> {
     resultMap.put("deviceIdentNo", deviceIdentNo);
     resultMap.put("vistType", vistType);
     resultMap.put("hosType", hosType);
-    resultMap.put("clnDate", clnDate);
+    resultMap.put("clnDate", Util.removeSlashStr(clnDate));
     resultMap.put("ward", ward);
     resultMap.put("roomcd", roomcd);
     resultMap.put("orderNo", orderNo);
@@ -273,7 +273,7 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs> {
     public void result(String result) {
       Log.e(TAG, "save result -- > " + result);
       if (buttonType.equals("TEMP_SAVE")) {
-        if (result == null) {
+        if (result == null || result.equals("")) {
           stop();
         } else {
           JSONObject object = Util.xmltoJsonObject(result);
@@ -305,7 +305,7 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs> {
           String res = Util.xmlToJsonString(object);
           ArrayList<HashMap<String, String>> mapArrayList = Util.parseJSON(mContext, res);
 
-          String rts = mapArrayList.get(0).get("SaveCompleteAll");
+          String rts = mapArrayList.get(0).get("SaveCompleteAllResult");
 
           Log.e(TAG, "mapArrayList -- > " + mapArrayList);
 
@@ -321,7 +321,7 @@ public class EFormSaveHandler implements IEventHandler<ResultEventArgs> {
 
             }
 
-            if (apiType.equals("paitient") || apiType.equals("write")) {
+            if (apiType.equals("patient") || apiType.equals("write")) {
               instance.history.getHistoryConsentList(apiType);
             }
 

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

@@ -330,6 +330,7 @@ public class DataParser {
 
         try {
           pid = mm.get("IO_Pt_ID").trim();
+          pid = Util.plusZero2("7", Integer.parseInt(pid));
         } catch (Exception e) {
         }
         try {

app/src/main/res/layout/activity_center.xml

@@ -254,7 +254,7 @@
                     android:id="@+id/tvTempCenterTxt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/noWriteTempList"
+                    android:text="@string/centerTempList"
                     android:textSize="18sp"
                     android:textColor="@color/black"
                     android:textStyle="bold" />

app/src/main/res/values/strings.xml

@@ -48,6 +48,7 @@
     <string name="patientId">등록번호</string>
     <string name="sexNage">성별/나이</string>
     <string name="dept">진료과</string>
+    <string name="opDept">수술과</string>
     <string name="patientName">환자명</string>
     <string name="professor">담당의</string>
     <string name="wardRoom">병실</string>
@@ -71,6 +72,7 @@
     <string name="inquiry">조회</string>
     <string name="all">전체</string>
     <string name="noWrite">미작성</string>
+    <string name="centerTempList">미작성&amp;임시저장</string>
     <string name="tempSave">임시저장</string>
     <string name="checkGudu">구두</string>
     <string name="temp">임시</string>
@@ -129,7 +131,7 @@
     <string name="emptyCertPw">인증서 입력 - %1$s</string>
     <string name="inputCertPw">인증서 암호를 입력하세요</string>
     <string name="certAuthFail">인증서 암호가 올바르지 않습니다.</string>
-    <string name="deleteConsent">%1$s를 삭제하시겠습니까?</string>
+    <string name="deleteConsent">삭제하시겠습니까?</string>
     <string name="deleteConsentFailed">%1$s 삭제에 실패하였습니다.</string>
     <string name="deleteReason">삭제사유</string>
     <string name="tempRadio1">처방 변경으로 인한 삭제</string>