Переглянути джерело

개인정보처리약관 수정 , 생치현황 통계수정, 로그인팝업 추가

huiwonseo 4 роки тому
батько
коміт
a0b01cbfd9

+ 0 - 1
src/main/resources/logback-spring.xml

@@ -127,5 +127,4 @@
    <logger name="jdbc.resultsettable" level="OFF" additivity="false" />
    <logger name="com.zaxxer.hikari.HikariConfig" level="OFF" additivity="false" />
    <logger name="com.zaxxer.hikari" level="OFF" />
-   
 </configuration>

+ 2 - 0
src/main/resources/mybatis/mapper/patient/patientStatistics.xml

@@ -151,6 +151,7 @@
               FROM CENTER_INFO CI
              WHERE 1 = DECODE( NVL( CI.expiration_date, '' ), '', 1,  IF( DATE_FORMAT( CI.expiration_date , '%Y-%m-%d %H:%i' ) > #{registDayTime}, 1, 0 ) )
                AND CI.CENTER_CODE != 1
+               AND CI.CENTER_CODE != 0
         ]]>
         <if test='q != null and q != ""'>
             <![CDATA[
@@ -196,6 +197,7 @@
                 ON B.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = DECODE( NVL( CI.expiration_date, '' ), '', 1,  IF( DATE_FORMAT( CI.expiration_date , '%Y-%m-%d %H:%i' ) > #{registDayTime}, 1, 0 ) )
                AND CI.CENTER_CODE != 1
+               AND CI.CENTER_CODE != 0
         ]]>
         <if test='q != null and q != ""'>
             <![CDATA[

+ 4 - 0
src/main/resources/mybatis/mapper/staffTotal/staffManager.xml

@@ -14,6 +14,7 @@
         <if test='etcType != null and etcType == "manager"'>
             <![CDATA[
                 AND CI.CENTER_CODE != 1
+                AND CI.CENTER_CODE != 0
             ]]>
         </if>
         <if test='centerCode != null and centerCode != ""'>
@@ -242,6 +243,7 @@
         <if test='etcType != null and etcType == "manager"'>
             <![CDATA[
             AND CI.CENTER_CODE != 1
+            AND CI.CENTER_CODE != 0
             ]]>
         </if>
         
@@ -418,6 +420,7 @@
                AND SM.GUBUN = #{gubun}
             WHERE 1 = DECODE( NVL( CI.expiration_date, '' ), '', 1,  IF( DATE_FORMAT( CI.expiration_date , '%Y-%m-%d %H:%i' ) > #{registDayTime}, 1, 0 ) )
               AND CI.CENTER_CODE != 1
+              AND CI.CENTER_CODE != 0
         ]]>
         <if test='centerName != null and centerName != ""'>
             <![CDATA[
@@ -482,6 +485,7 @@
                 AND SM.GUBUN = 'm'
               WHERE 1 = DECODE( NVL( CI.expiration_date, '' ), '', 1,  IF( DATE_FORMAT( CI.expiration_date , '%Y-%m-%d %H:%i' ) > #{registDayTime}, 1, 0 ) )
                 AND CI.CENTER_CODE != 1
+                AND CI.CENTER_CODE != 0
                 AND NVL(SM.GUBUN, 'm') = 'm'
                 AND NVL(SM.REGIST_DAY, TO_CHAR(NOW(),'YYYY-MM-DD')) = ( SELECT NVL(MAX(TSM.REGIST_DAY), TO_CHAR(NOW(),'YYYY-MM-DD')) REGIST_DAY
                                                                           FROM STAFF_MANAGER TSM

Різницю між файлами не показано, бо вона завелика
+ 1891 - 0
src/main/webapp/WEB-INF/jsp/accept/info.jsp


+ 0 - 7
src/main/webapp/WEB-INF/jsp/accept/list.jsp

@@ -38,13 +38,6 @@ function confirmCheck(){
 }
 </script>
 <style>
-<!--
- /* Font Definitions */
- /* Style Definitions */
-p.a, li.a, div.a{margin:0in;text-align:justify;text-justify:inter-ideograph;line-height:30px;text-autospace:none;word-break:break-all;font-size:10.0pt;serif;color:black;}
- /* Page Definitions */
-div.WordSection1    {page:WordSection1;font-family: Noto Sans KR, Nunito Sans,-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica Neue,Arial,sans-serif !important;}
--->
 
 tbody tr td p{background:none !important;}
 </style>

Різницю між файлами не показано, бо вона завелика
+ 26 - 23
src/main/webapp/WEB-INF/jsp/login/admin.jsp


Різницю між файлами не показано, бо вона завелика
+ 26 - 23
src/main/webapp/WEB-INF/jsp/login/staff.jsp


Різницю між файлами не показано, бо вона завелика
+ 1974 - 0
src/main/webapp/WEB-INF/jsp/mobile/accept/info.jsp


+ 1 - 1
src/main/webapp/WEB-INF/jsp/notice/edit.jsp

@@ -131,7 +131,7 @@ function removeFile() {
                                             <tr>
                                                 <th><span class="fix">*</span>내용</th>
                                                 <td>
-                                                    <textarea  class="form-control" rows="10" name="content" placeholder="내용을 입력하세요" maxlength="1000" required><c:out value="${item.content}" /></textarea>
+                                                    <textarea  class="form-control" rows="10" name="content" placeholder="내용을 입력하세요" required><c:out value="${item.content}" /></textarea>
                                                 </td>
                                             </tr>
                                             

+ 0 - 1
src/main/webapp/WEB-INF/jsp/staffTotal/list.jsp

@@ -139,7 +139,6 @@ function getExcel(){
                                                 <col style="width:20%">
                                                 <col style="width:10%">
                                                 <col style="width:50%">
-                                                <col style="width:10%">
                                             </colgroup>
                                             <tr>
                                                 <th>지역</th>

+ 0 - 1
src/main/webapp/WEB-INF/jsp/staffTotal/report/list.jsp

@@ -138,7 +138,6 @@ function getExcel(){
                                                 <col style="width:20%">
                                                 <col style="width:10%">
                                                 <col style="width:50%">
-                                                <col style="width:10%">
                                             </colgroup>
                                             <tr>
                                                 <th>소관</th>