Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

src/main/resources/mybatis/mapper/api/api.xml

@@ -40,13 +40,24 @@
             </when>
             <otherwise>
                 <choose>
-                    <when test='birthDate != null and birthDate != "" and patientName != null and patientName != "" and patientPhone != null and patientPhone != ""'>
+                    <when test='birthDate != null and birthDate != "" and patientPhone != null and patientPhone != ""'>
                         <![CDATA[
                             AND JUMIN           = #{birthDate}
-                            AND PATIENT_NAME    = #{patientName}
                             AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                         ]]>
+                        <if test='patientName != null and patientName != ""'>
+                            <![CDATA[
+                                AND PATIENT_NAME    = #{patientName}
+                            ]]>
+                        </if>
                     </when>
+                    <!-- when test='birthDate != null and birthDate != "" and patientName != null and patientName != "" and patientPhone != null and patientPhone != ""'>
+                        <![CDATA[
+                            AND JUMIN           = #{birthDate}
+                            AND PATIENT_NAME    = #{patientName}
+                            AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
+                        ]]>
+                    </when -->
                     <otherwise>
                         <if test='careAgencyCode != null and careAgencyCode != ""'>
                             <![CDATA[

src/main/webapp/WEB-INF/jsp/api/info.jsp

@@ -327,7 +327,7 @@ $( function(){
                                                                   <li>생활치료센터의 단일 대상일 경우 <br/>
                                                                       <ul>
                                                                         <li>patientNumber가 존재<br/> - patientNumber로 단일대상 선택 가능</li>
-                                                                        <li>patientNumber가 없음<br/> - patientName, birthDate, patientPhone로 단일 대상 선택가능</li>
+                                                                        <li>patientNumber가 없음<br/> - birthDate, patientPhone로 단일 대상 선택가능 <br/> - patientName, birthDate, patientPhone로 단일 대상 선택가능</li>
                                                                       </ul>
                                                                   </li>
                                                                 </ul>
@@ -342,7 +342,7 @@ $( function(){
                                                             </div>
                                                             <div class="m-2">
 <pre class="mb-0"><code class="p-3 h4">{
-  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfoList"</span>,
+  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfo"</span>,
   <span class="hljs-attr">"patientNumber"</span>: <span class="hljs-string">""</span>,
   <span class="hljs-attr">"patientName"</span>: <span class="hljs-string">""</span>,
   <span class="hljs-attr">"birthDate"</span>: <span class="hljs-string">""</span>,
@@ -360,7 +360,7 @@ $( function(){
                                                             </div>
                                                             <div class="m-2">
 <pre class="mb-0"><code class="p-3 h4">{
-  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfoList"</span>,
+  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfo"</span>,
   <span class="hljs-attr">"patientNumber"</span>: <span class="hljs-string">"62817236"</span>,
   <span class="hljs-attr">"patientName"</span>: <span class="hljs-string">""</span>,
   <span class="hljs-attr">"birthDate"</span>: <span class="hljs-string">""</span>,
@@ -378,7 +378,7 @@ $( function(){
                                                             </div>
                                                             <div class="m-2">
 <pre class="mb-0"><code class="p-3 h4">{
-  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfoList"</span>,
+  <span class="hljs-attr">"resourceType"</span>: <span class="hljs-string">"patientInfo"</span>,
   <span class="hljs-attr">"patientNumber"</span>: <span class="hljs-string">""</span>,
   <span class="hljs-attr">"patientName"</span>: <span class="hljs-string">"홍길동"</span>,
   <span class="hljs-attr">"birthDate"</span>: <span class="hljs-string">"19930516"</span>,

src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -14,7 +14,9 @@ $( function(){
     $("#localeSelectBox").change(function(){
         var locale =  $(this).val();
         location.href="?lang=" + locale;
-    })
+    });
+
+    settingAppLocale();
 });
 
 function searchingDevice() {

src/main/webapp/resources/js/mobile/common.js

@@ -33,13 +33,38 @@ function toNative( reqParam ){
                 location.href = data;
             }
         }else{
-            alert("App에서만 사용가능한 기능입니다.");
+            console.log("App에서만 사용가능한 기능입니다.");
         }
     } catch (e) {
 //         self.log(e,"mcare_mobile_toNative");
     }
 };
 
+function settingAppLocale() {
+  var code = typeof setLocale == "undefined" ? "ko" : setLocale;
+
+  /**
+   * code 값
+   *   ko : 한국어
+   *   en : 영어
+   *   ar : 아랍어
+   *   ru : 러시아어
+   *   th : 태국어
+   *   vi : 베트남어
+   *   fr : 프랑스어
+   */
+
+  var jsonMsg = {
+    type: "command",
+    functionType: "locale",
+    value: {
+      code: code,
+    }
+  };
+
+  toNative(jsonMsg);
+};
+
 function systemBrowsing(url) {
     var jsonMsg = {
         "type" : "command",