센터별 인력현황 쿼리 수정

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

@@ -408,6 +408,9 @@ public class StaffTotalManagerController extends LifeCenterController {
           dto.setLocationCode(inputlocationCode);
           dto.setCenterName(inputcenterlName);
           
+          // 톻계 레몬생치는 제외
+          dto.setEtcType( "manager" );
+          
           int total = service.selectStaffManagerCount(dto);
           List<StaffManagerDTO> result = new ArrayList<StaffManagerDTO>();
           if (total > 0) {

src/main/resources/mybatis/mapper/staffTotal/staffManager.xml

@@ -5,10 +5,11 @@
     <select id="selectStaffManagerCount" parameterType="StaffManagerDTO" resultType="int">
         <![CDATA[
             SELECT COUNT(*) AS TOTAL
-              FROM CENTER_INFO CI, STAFF_MANAGER SM
+              FROM CENTER_INFO CI
+              LEFT JOIN STAFF_MANAGER SM
+                ON CI.CENTER_CODE = SM.CENTER_CODE
+               AND SM.GUBUN = #{gubun}
             WHERE 1 = 1
-                AND CI.CENTER_CODE = SM.CENTER_CODE(+)
-                AND NVL(SM.GUBUN, #{gubun}) = #{gubun}
         ]]>
         <if test='etcType != null and etcType == "manager"'>
             <![CDATA[
@@ -214,10 +215,11 @@
                 SUM(STAFF1 + STAFF2 + STAFF3 + STAFF4 + STAFF5 +
                  STAFF6 + STAFF7 + STAFF8 + STAFF9 + STAFF10 +
                  STAFF11 + STAFF12 + STAFF13 + STAFF14 + STAFF15)       AS staffTotal
-            FROM
-                CENTER_INFO CI, STAFF_MANAGER SM
-            WHERE 1 = 1
-            AND CI.CENTER_CODE = SM.CENTER_CODE(+)
+            FROM CENTER_INFO CI
+            LEFT JOIN STAFF_MANAGER SM
+              ON CI.CENTER_CODE = SM.CENTER_CODE
+             AND SM.GUBUN = #{gubun}
+           WHERE 1=1
         ]]>
        
         <if test='etcType != null and etcType == "manager"'>

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

@@ -5,56 +5,56 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
 
-// $( function(){
-//     token( "getToken" );
-//     var redirectUrl = "<c:out value='${redirectUrl}' />" ;
-//     if (redirectUrl != "") {
-//         location.href = "./" + redirectUrl;
-//     }
-// });
+$( function(){
+    token( "getToken" );
+    var redirectUrl = "<c:out value='${redirectUrl}' />" ;
+    if (redirectUrl != "") {
+        location.href = "./" + redirectUrl;
+    }
+});
 
-// function getToken(token, deviceType, macAddress) {
-//     var jsonMsg = {
-//         patientIdx : "<c:out value='${patientIdx}' />",
-//         deviceType : deviceType,
-//         deviceToken : token,
-//         macAddress : macAddress
-//     };
+function getToken(token, deviceType, macAddress) {
+    var jsonMsg = {
+        patientIdx : "<c:out value='${patientIdx}' />",
+        deviceType : deviceType,
+        deviceToken : token,
+        macAddress : macAddress
+    };
     
-//     $.ajax({
-//         url      : "/mobile/insertDeviceInfo",
-//         data     : JSON.stringify(jsonMsg),
-//         method   : "POST",
-//         contentType: 'application/json',
-//         success  : function( data ){
-//             console.log(JSON.stringify(data));
-//           if( typeof success == "function" ){
-//             //success( data );
-//           };
-//         },
-//         error : function(jqXHR, exception){
-//           if( typeof error == "function" ) {
-//             //error(jqXHR, exception);
-//           };
-//         }
-//     }).done( function(){
-//         if( typeof done == "function" ){
-//           //done();
-//         };
-//     });
-// }
+    $.ajax({
+        url      : "/mobile/insertDeviceInfo",
+        data     : JSON.stringify(jsonMsg),
+        method   : "POST",
+        contentType: 'application/json',
+        success  : function( data ){
+            console.log(JSON.stringify(data));
+          if( typeof success == "function" ){
+            //success( data );
+          };
+        },
+        error : function(jqXHR, exception){
+          if( typeof error == "function" ) {
+            //error(jqXHR, exception);
+          };
+        }
+    }).done( function(){
+        if( typeof done == "function" ){
+          //done();
+        };
+    });
+}
 
-// function token(callback) {
-//     console.log(callback);
-//     var jsonMsg = {
-//         "type":"command",
-//         "functionType":"token",
-//         "value" : {
-//             "callbackFn" : callback
-//         }
-//     }
-//     toNative(jsonMsg);
-// }
+function token(callback) {
+    console.log(callback);
+    var jsonMsg = {
+        "type":"command",
+        "functionType":"token",
+        "value" : {
+            "callbackFn" : callback
+        }
+    }
+    toNative(jsonMsg);
+}
 </script>
 </head>
 <body>
@@ -99,9 +99,9 @@
                             <li>
                                 <a href="./nonface">비대면 진료(Untact Treatment)</a>
                             </li>
-<!--                             <li> -->
-<!--                                 <a href="./push/list">메시지 수신함(Message received)</a> -->
-<!--                             </li> -->
+                            <li>
+                                <a href="./push/list">메시지 수신함(Message received)</a>
+                            </li>
                             <!-- li>
                                 <a href="javascript:;">생활치료센터 이용 안내</a>
                             </li -->