Forráskód Böngészése

환자관리 나이계산 쿼리 변경, sms 발송 개발중

huiwonseo 3 éve
szülő
commit
943df78c75

+ 32 - 0
src/main/java/com/lemon/lifecenter/dto/SmsDTO.java

@@ -0,0 +1,32 @@
+package com.lemon.lifecenter.dto;
+
+public class SmsDTO {
+  private String callTo;
+  private String callFrom;
+  private String smsTxt;
+
+  public String getCallTo() {
+    return this.callTo;
+  }
+
+  public void setCallTo(String callTo) {
+    this.callTo = callTo;
+  }
+
+  public String getCallFrom() {
+    return this.callFrom;
+  }
+
+  public void setCallFrom(String callFrom) {
+    this.callFrom = callFrom;
+  }
+
+  public String getSmsTxt() {
+    return this.smsTxt;
+  }
+
+  public void setSmsTxt(String smsTxt) {
+    this.smsTxt = smsTxt;
+  }
+
+}

+ 12 - 0
src/main/java/com/lemon/lifecenter/mapper/SmsMapper.java

@@ -0,0 +1,12 @@
+package com.lemon.lifecenter.mapper;
+
+import com.lemon.lifecenter.dto.SmsDTO;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface SmsMapper {
+  public void insertNuriMsgData(SmsDTO dto);
+}

+ 17 - 0
src/main/java/com/lemon/lifecenter/service/SmsService.java

@@ -0,0 +1,17 @@
+package com.lemon.lifecenter.service;
+
+import com.lemon.lifecenter.dto.SmsDTO;
+import com.lemon.lifecenter.mapper.SmsMapper;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SmsService {
+  @Autowired
+  private SmsMapper mapper;
+  
+  public void insertNuriMsgData(SmsDTO dto) {
+    mapper.insertNuriMsgData(dto);
+  }
+}

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

@@ -136,7 +136,8 @@
                         WHEN GENDER = 'F' THEN '여'
                         ELSE ''
                    END                                                                 AS gender,
-                   (SELECT TRUNC((SYSDATE-TO_DATE(JUMIN, 'YYYYMMDD'))/365) + 1)                        AS age,
+                   ( SELECT TO_NUMBER( DATE_FORMAT( NOW(), '%Y' ) ) - TO_NUMBER( DATE_FORMAT( jumin, '%Y' ) ) )                        
+                                                                                       AS age,
                    DATE_FORMAT(JUMIN, '%Y-%m-%d')                                      AS jumin,
                    ward_number                                                         AS wardNumber,
                    room_number                                                         AS roomNumber,
@@ -385,7 +386,8 @@
                         WHEN GENDER = 'F' THEN '여'
                         ELSE ''
                    END                                                                 AS gender,
-                   (SELECT TRUNC((SYSDATE-TO_DATE(JUMIN, 'YYYYMMDD'))/365) + 1)                        AS age,
+                   ( SELECT TO_NUMBER( DATE_FORMAT( NOW(), '%Y' ) ) - TO_NUMBER( DATE_FORMAT( jumin, '%Y' ) ) )
+                                                                                       AS age,
                    DATE_FORMAT(JUMIN, '%Y-%m-%d')                                      AS jumin,
                    ward_number                                                         AS wardNumber,
                    room_number                                                         AS roomNumber,

+ 13 - 0
src/main/resources/mybatis/mapper/sms/sms.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.lemon.lifecenter.mapper.SmsMapper">
+  <insert id="insertNuriMsgData" parameterType="SmsDTO">
+    <![CDATA[
+        INSERT
+          INTO nuri_msg_data
+               ( cur_state, req_date, call_to,   call_from,   sms_txt,   msg_type )
+        VALUES ( 0,         NOW(),    #{callTo}, #{callFrom}, #{smsTxt}, 4 );
+    ]]>
+  </insert>
+</mapper>

+ 23 - 6
src/main/webapp/WEB-INF/jsp/include/sidebar.jsp

@@ -7,7 +7,7 @@
     background: none;
   }
   #dashboards i.fas{
-    transition: 0.2s;
+    transition: 0.1s;
   }
   #dashboards i.fas.fa-chevron-right {
     float: right;
@@ -19,7 +19,7 @@
     -ms-transform: rotate(90deg); /* IE 9 */
     -webkit-transform: rotate(90deg); /* Chrome, Safari, Opera */
     transform: rotate(90deg);
-    transition: 0.5s;
+    transition: 0.1s;
   }
   
   #dashboards > li.sidebar-item > a.sidebar-link{
@@ -27,7 +27,7 @@
     background: #252e3c;
     border-radius: 5px;margin: 8px;
     padding: 8px 14px;
-    transition: 0.2s;
+    transition: 0.1s;
   }
   #dashboards > li.sidebar-item.on > a{
     color:#ffffff;
@@ -43,12 +43,29 @@
     color:#ffffff;
     background: none;
   }
+  #dashboards > li.sidebar-item{
+    height: 45px;
+    overflow: hidden;
+  }
   #dashboards > li.sidebar-item div.sidebar-item{
-    display: none;
+    /* display: none; */
+    height: 0;
+    transition: all 0.3s;
   }
-  #dashboards > li.sidebar-item.open div.sidebar-item {
-    display: block;
+  #dashboards > li.sidebar-item div.sidebar-item {
+    height:0;
+    transition: all 0.2s;
   }
+  #dashboards > li.sidebar-item.open {
+    overflow:visible;
+    height: 100%;
+    transition: all 0.2s;
+  }
+  #dashboards > li.sidebar-item.open div.sidebar-item {
+    /* display: block; */
+    height:40px;
+    transition: all 0.2s;
+}
 </style>
         
 <nav id="sidebar" class="sidebar">

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 74 - 0
src/main/webapp/WEB-INF/jsp/login/staff.jsp