open API 수정

src/main/java/com/lemon/lifecenter/controller/RestApiController.java

@@ -122,6 +122,10 @@ public class RestApiController {
                                 message = "emptyResourceType";
                                 result = object.toString();
                             } else {
+                                String phone = dto.getPatientPhone();
+                                phone = LifeCenterFunction.setPhoneFormat(phone);
+                                dto.setPatientPhone2(phone);
+                                
                                 if (resourceType.equals("bloodPressure") || resourceType.equals("bloodSugar") || 
                                         resourceType.equals("oxygenSaturation") || resourceType.equals("pulseRate") || resourceType.equals("temperature")) {
                                         result = selectPhrData(dto);

src/main/java/com/lemon/lifecenter/dto/HlRequestDTO.java

@@ -7,6 +7,7 @@ public class HlRequestDTO {
     private String patientName    = "";
     private String birthDate      = "";
     private String patientPhone   = "";
+    private String patientPhone2  = "";
     private String managerId      = "";
     private int centerCode        = 0;
     private String token = "";
@@ -47,6 +48,12 @@ public class HlRequestDTO {
     public void setPatientPhone(String patientPhone) {
         this.patientPhone = patientPhone;
     }
+    public String getPatientPhone2() {
+        return patientPhone2;
+    }
+    public void setPatientPhone2(String patientPhone2) {
+        this.patientPhone2 = patientPhone2;
+    }
     public String getManagerId() {
         return managerId;
     }

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

@@ -32,7 +32,7 @@
         ]]>
         
         <choose>
-            <when test='careAgencyCode != null and careAgencyCode != ""'>
+            <when test='careAgencyCode != null and careAgencyCode == "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND CENTER_CODE    = (SELECT center_code
                                                FROM api_manager
@@ -52,7 +52,7 @@
                             <![CDATA[
                                    AND JUMIN          = #{birthDate}
                                    AND PATIENT_NAME   = #{patientName}
-                                   AND PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>
@@ -89,7 +89,7 @@
          ]]>
 
         <choose>
-            <when test='careAgencyCode != null and careAgencyCode != ""'>
+            <when test='careAgencyCode != null and careAgencyCode != "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND PC.CENTER_CODE    = (SELECT center_code
                                                   FROM api_manager
@@ -109,7 +109,7 @@
                             <![CDATA[
                                    AND PC.JUMIN          = #{birthDate}
                                    AND PC.PATIENT_NAME   = #{patientName}
-                                   AND PC.PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>
@@ -134,7 +134,7 @@
              WHERE 1 = 1
         ]]>
         <choose>
-            <when test='careAgencyCode != null and careAgencyCode != ""'>
+            <when test='careAgencyCode != null and careAgencyCode != "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND PC.CENTER_CODE    = (SELECT center_code
                                                   FROM api_manager
@@ -154,7 +154,7 @@
                             <![CDATA[
                                    AND PC.JUMIN          = #{birthDate}
                                    AND PC.PATIENT_NAME   = #{patientName}
-                                   AND PC.PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>
@@ -198,7 +198,7 @@
              WHERE 1 = 1
         ]]>
         <choose>
-            <when test='careAgencyCode != null and careAgencyCode != ""'>
+            <when test='careAgencyCode != null and careAgencyCode != "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND PC.CENTER_CODE    = (SELECT center_code
                                                   FROM api_manager
@@ -218,7 +218,7 @@
                             <![CDATA[
                                    AND PC.JUMIN          = #{birthDate}
                                    AND PC.PATIENT_NAME   = #{patientName}
-                                   AND PC.PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>
@@ -260,7 +260,7 @@
               WHERE 1 = 1
         ]]>
         <choose>
-            <when test='careAgencyCode != null and careAgencyCode != ""'>
+            <when test='careAgencyCode != null and careAgencyCode != "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND PC.CENTER_CODE    = (SELECT center_code
                                                   FROM api_manager
@@ -280,7 +280,7 @@
                             <![CDATA[
                                    AND PC.JUMIN          = #{birthDate}
                                    AND PC.PATIENT_NAME   = #{patientName}
-                                   AND PC.PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>
@@ -301,7 +301,7 @@
               WHERE 1 = 1
          ]]>
         <choose>
-            <when test='centerCode != null and centerCode != ""'>
+            <when test='centerCode != null and centerCode != "" and birthDate == null and birthDate == "" and patientName == null and patientName == "" and patientPhone == null and patientPhone == ""'>
                 <![CDATA[
                        AND CENTER_CODE    = (SELECT center_code
                                                FROM api_manager
@@ -321,7 +321,7 @@
                             <![CDATA[
                                    AND JUMIN          = #{birthDate}
                                    AND PATIENT_NAME   = #{patientName}
-                                   AND PATIENT_PHONE  = #{patientPhone}
+                                   AND (PATIENT_PHONE  = #{patientPhone} OR PATIENT_PHONE = #{patientPhone2})
                             ]]>
                         </if>
                     </otherwise>