Просмотр исходного кода

모바일 응급전화 수정7

huiwon.seo 4 лет назад
Родитель
Сommit
5367234d53

+ 21 - 2
src/main/java/com/lemon/lifecenter/controller/MobileMenuController.java

@@ -25,6 +25,8 @@ public class MobileMenuController extends LifeCenterController {
     
     @Autowired
     private PatientService patientService;
+    @Autowired
+    private MobilePatientService mpatientService;
     
     @RequestMapping("/menu")
     public ModelAndView menu(@RequestParam(value="redirectUrl", required=false, defaultValue="") String redirectUrl,
@@ -34,7 +36,11 @@ public class MobileMenuController extends LifeCenterController {
         String patientName = LifeCenterSessionController.getSession(request, "sesMName");
         String sesMpIdx  = LifeCenterSessionController.getSession( request, "sesMpIdx" );
         String sesMCenterName  = LifeCenterSessionController.getSession( request, "sesMCenterName" );
-        String sesMAdminPhone  = LifeCenterSessionController.getSession( request, "sesMAdminPhone" );
+        String sesMCenterCode  = LifeCenterSessionController.getSession( request, "sesMCenterCode" );
+        
+        PatientDTO pdto = new PatientDTO();
+        pdto.setCenterCode( Integer.valueOf( sesMCenterCode ) );
+        String adminPhone = mpatientService.selectMPatientAdminPhone(pdto).getAdminPhone();
         
         PatientDTO dto = new PatientDTO();
         dto.setPatientIdx(Integer.parseInt(sesMpIdx));
@@ -48,7 +54,7 @@ public class MobileMenuController extends LifeCenterController {
         mv.addObject("munjinCnt", cnt);
         mv.addObject("centerName", sesMCenterName);
         mv.addObject("redirectUrl", redirectUrl);
-        mv.addObject("adminPhone", sesMAdminPhone);
+        mv.addObject("adminPhone", adminPhone);
         return mv;
     }
     
@@ -64,6 +70,19 @@ public class MobileMenuController extends LifeCenterController {
     public ModelAndView call(
             @RequestParam(value="tel", required=false, defaultValue="") String tel,
             HttpServletRequest request, HttpServletResponse response) {
+        
+        if (!tel.equals( "" )) {
+            tel = tel.replace("-", "");
+            
+            if (tel.length() == 8) {
+                tel = tel.replaceFirst("^([0-9]{4})([0-9]{4})$", "$1-$2");
+            } else if (tel.length() == 12) {
+                tel = tel.replaceFirst("(^[0-9]{4})([0-9]{4})([0-9]{4})$", "$1-$2-$3");
+            } else {
+                tel = tel.replaceFirst("(^02|[0-9]{3})([0-9]{3,4})([0-9]{4})$", "$1-$2-$3");
+            }
+        }
+        
         ModelAndView mv = setMobileMV("menu/call");
         mv.addObject( "tel", tel );
         return mv;

+ 1 - 0
src/main/java/com/lemon/lifecenter/mapper/MobilePatientMapper.java

@@ -9,6 +9,7 @@ import com.lemon.lifecenter.dto.PatientDTO;
 @Mapper
 public interface MobilePatientMapper {
     public int selectMPatientCount(PatientDTO dto);
+    public PatientDTO selectMPatientAdminPhone(PatientDTO dto);
     public PatientDTO selectMPatientInfo(PatientDTO dto);
     public void mobileInsertPatientMunjin(PatientDTO dto);
     public int selectMunJinCount(PatientDTO dto);

+ 3 - 1
src/main/java/com/lemon/lifecenter/service/MobilePatientService.java

@@ -15,7 +15,9 @@ public class MobilePatientService {
     public int selectMPatientCount(PatientDTO dto) {
         return mapper.selectMPatientCount(dto);
     }
-    
+    public PatientDTO selectMPatientAdminPhone(PatientDTO dto) {
+        return mapper.selectMPatientAdminPhone(dto);
+    }
     public PatientDTO selectMPatientInfo(PatientDTO dto) {
         return mapper.selectMPatientInfo(dto);
     }

+ 11 - 0
src/main/resources/mybatis/mapper/mobile/login.xml

@@ -17,6 +17,17 @@
         ]]>
     </select>
     
+    <select id="selectMPatientAdminPhone" parameterType="PatientDTO" resultType="PatientDTO">
+        <![CDATA[
+            SELECT PHONE_NUMBER AS adminPhone
+              FROM MEMBER M
+              LEFT JOIN GROUP_LIST G
+                ON G.IDX = M.GROUP_IDX
+             WHERE M.CENTER_CODE = #{centerCode} 
+               AND G.PERMISSIONS = 'ADMIN'
+         ]]>
+    </select>
+    
     <select id="selectMPatientInfo" parameterType="PatientDTO" resultType="PatientDTO">
         <![CDATA[
             SELECT PC.PATIENT_IDX  AS patientIdx,

+ 2 - 2
src/main/webapp/WEB-INF/jsp/mobile/menu/call.jsp

@@ -26,7 +26,7 @@ function loadApp(){
     <div class="container">
         <div class="header">
             <div class="previous">
-                <a href="javascript:;" onclick="loadApp();">이전</a>
+<!--                 <a href="javascript:;" onclick="loadApp();">이전</a> -->
             </div>
             <div class="title">생활치료센터 응급전화</div>
         </div>
@@ -40,7 +40,7 @@ function loadApp(){
 <div class="btn_group">
     <ul>
         <li style="font-size:0;height:50px;">
-            <button type="button" onclick="loadApp();" class="confirm" style="height:52px;width:100%;display:inline-block;background:#DC5353;"><span class="check">종료하기</span></button>
+            <button type="button" onclick="window.close();" class="confirm" style="height:52px;width:100%;display:inline-block;background:#DC5353;"><span class="check">종료하기</span></button>
         </li>
     </ul>
 </div>