1
0

2 Incheckningar d2d52e0afa ... 134cc7b1b0

Upphovsman SHA1 Meddelande Datum
  jksong 134cc7b1b0 Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter.git into databank 4 år sedan
  jksong 4329b22da6 1. api 단일 환자 호출시 환자 생년월일 + 전화번호로도 단일 대상 선택 가능하게 수정 4 år sedan

+ 13 - 2
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[

+ 4 - 4
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>,