From 518154e940d9125899aa3de44dda328498b14c07 Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Wed, 4 Sep 2019 10:07:51 +0800
Subject: [PATCH] add new column

---
 server/OldPeopleHome/.idea/workspace.xml      | 537 +++++++++---------
 .../com/oldpeoplehome/entity/HeartRate.java   |  54 +-
 .../web/HeartRateController.java              |   6 +-
 .../src/main/resources/jdbc.properties        |   4 +-
 .../main/resources/mapper/HeartRateDao.xml    |   8 +-
 .../OldPeopleHome/src/main/sql/add_table.sql  |   8 +-
 server/OldPeopleHome/target/OldPeopleHome.war | Bin 13721193 -> 13721425 bytes
 .../com/oldpeoplehome/entity/HeartRate.class  | Bin 2020 -> 2519 bytes
 .../web/HeartRateController.class             | Bin 3441 -> 3534 bytes
 .../WEB-INF/classes/mapper/HeartRateDao.xml   |   8 +-
 .../com/oldpeoplehome/entity/HeartRate.class  | Bin 2020 -> 2519 bytes
 .../web/HeartRateController.class             | Bin 3441 -> 3534 bytes
 .../target/classes/mapper/HeartRateDao.xml    |   8 +-
 server/README.md                              |   2 +-
 14 files changed, 341 insertions(+), 294 deletions(-)

diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index f3192ba..77e0da2 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -7,16 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/HeartRate.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/HeartRate.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,19 +28,70 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
+            <state relative-caret-position="1155">
+              <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="121">
-              <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
+            <state relative-caret-position="1155">
+              <caret line="55" column="21" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="99">
+              <caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="487">
+              <caret line="65" column="43" lean-forward="true" selection-start-line="65" selection-start-column="43" selection-end-line="65" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="326">
+              <caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1252#1253#0" expanded="true" />
+                <element signature="e#1280#1281#0" expanded="true" />
+                <element signature="e#1322#1323#0" expanded="true" />
+                <element signature="e#1356#1357#0" expanded="true" />
+                <element signature="e#1388#1389#0" expanded="true" />
+                <element signature="e#1416#1417#0" expanded="true" />
+                <element signature="e#1458#1459#0" expanded="true" />
+                <element signature="e#1492#1493#0" expanded="true" />
+                <element signature="e#1522#1523#0" expanded="true" />
+                <element signature="e#1548#1549#0" expanded="true" />
+                <element signature="e#1586#1587#0" expanded="true" />
+                <element signature="e#1616#1617#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -49,80 +100,48 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="118">
-              <caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="165">
-              <caret line="15" column="11" lean-forward="true" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="33">
-              <caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
+              <caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
               <folding>
-                <element signature="e#1451#1452#0" expanded="true" />
-                <element signature="e#1478#1479#0" expanded="true" />
+                <element signature="n#mapper#0;n#!!top" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
+            <state relative-caret-position="378">
+              <caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-465">
-              <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
+            <state relative-caret-position="121">
+              <caret line="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+            <state relative-caret-position="1215">
+              <caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
               <folding>
-                <element signature="e#1248#1249#0" expanded="true" />
-                <element signature="e#1303#1304#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -183,18 +202,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/HeartRateService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/HeartRateFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
-        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java" />
@@ -214,6 +228,11 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" />
+        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
       </list>
     </option>
   </component>
@@ -234,8 +253,8 @@
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1910" />
     <option name="y" value="-10" />
-    <option name="width" value="1939" />
-    <option name="height" value="1049" />
+    <option name="width" value="1940" />
+    <option name="height" value="1050" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -243,6 +262,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -276,34 +297,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
-              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
-              <item name="dao" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
-              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
-              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -324,35 +317,47 @@
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
-              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="sql" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="target" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567145246914" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567562722071" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -539,14 +544,14 @@
       <item itemvalue="JUnit.MotionDaoTest.testInsert" />
       <item itemvalue="JUnit.RoomDaoTest.testA" />
       <item itemvalue="JUnit.HeartRateServiceTest.test" />
-      <item itemvalue="Tomcat Server.chuizichui" />
       <item itemvalue="JUnit.AdminServiceTest.testLogin" />
+      <item itemvalue="Tomcat Server.chuizichui" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.HeartRateServiceTest.test" />
         <item itemvalue="JUnit.AdminServiceTest.testLogin" />
         <item itemvalue="JUnit.MotionDaoTest.testInsert" />
-        <item itemvalue="JUnit.HeartRateServiceTest.test" />
         <item itemvalue="JUnit.RoomDaoTest.testA" />
         <item itemvalue="JUnit.MotionDaoTest.test" />
       </list>
@@ -582,16 +587,13 @@
       <workItem from="1566876393093" duration="5679000" />
       <workItem from="1567043814685" duration="630000" />
       <workItem from="1567134555969" duration="5745000" />
+      <workItem from="1567150643505" duration="555000" />
+      <workItem from="1567213610755" duration="47000" />
+      <workItem from="1567561928915" duration="615000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 40m 15s.xml">
-      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 41m 50s.xml">
-      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 15m 06s.xml">
       <configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
     </history-entry>
@@ -616,9 +618,15 @@
     <history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 56m 27s.xml">
       <configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="HeartRateServiceTest_test - 2019.09.04 at 10h 00m 00s.xml">
+      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="HeartRateServiceTest_test - 2019.09.04 at 10h 01m 03s.xml">
+      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="130820000" />
+    <option name="totallyTimeSpent" value="132037000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -631,8 +639,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21045576" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2191689" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -775,16 +784,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomStateDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -795,16 +794,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="778">
-          <caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/HeartRateService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -825,13 +814,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="16" column="26" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="151">
@@ -839,26 +821,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1485">
-          <caret line="57" column="8" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="66" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="627">
-          <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="99">
@@ -953,20 +915,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="421">
-          <caret line="93" column="13" selection-start-line="93" selection-start-column="13" selection-end-line="93" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3351">
@@ -974,14 +922,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-      <provider editor-type-id="JavaFX-Scene-Builder" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1066,16 +1007,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
-          <caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1100,69 +1031,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="15" column="11" lean-forward="true" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-465">
-          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
-          <folding>
-            <element signature="e#1451#1452#0" expanded="true" />
-            <element signature="e#1478#1479#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+        <state relative-caret-position="2013">
+          <caret line="80" column="4" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
+        <state relative-caret-position="429">
           <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1170,13 +1048,144 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1980">
+          <caret line="77" column="35" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1221">
+          <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="858">
+          <caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1155">
+          <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+        <state relative-caret-position="1155">
+          <caret line="55" column="21" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="487">
+          <caret line="65" column="43" lean-forward="true" selection-start-line="65" selection-start-column="43" selection-end-line="65" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
           <folding>
-            <element signature="e#1248#1249#0" expanded="true" />
-            <element signature="e#1303#1304#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1252#1253#0" expanded="true" />
+            <element signature="e#1280#1281#0" expanded="true" />
+            <element signature="e#1322#1323#0" expanded="true" />
+            <element signature="e#1356#1357#0" expanded="true" />
+            <element signature="e#1388#1389#0" expanded="true" />
+            <element signature="e#1416#1417#0" expanded="true" />
+            <element signature="e#1458#1459#0" expanded="true" />
+            <element signature="e#1492#1493#0" expanded="true" />
+            <element signature="e#1522#1523#0" expanded="true" />
+            <element signature="e#1548#1549#0" expanded="true" />
+            <element signature="e#1586#1587#0" expanded="true" />
+            <element signature="e#1616#1617#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
+          <folding>
+            <element signature="n#mapper#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="121">
+          <caret line="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="99">
+          <caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1215">
+          <caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/HeartRate.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/HeartRate.java
index 6ff7341..a677c63 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/HeartRate.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/HeartRate.java
@@ -12,22 +12,28 @@ public class HeartRate {
 
     private long parentId;
     private Timestamp time;
-    private double rate;
+    private double rate1;
+    private double rate2;
+    private double oxy;
 
     public HeartRate() {
     }
 
-    public HeartRate(long parentId, String time, double rate) {
-        this.parentId = parentId;
-        this.time = Timestamp.valueOf(time);
-        this.rate = rate;
-    }
-
-    public HeartRate(long parentId, Timestamp time, double rate) {
+    public HeartRate(long parentId, Timestamp time, double rate1, double rate2, double oxy) {
         this.parentId = parentId;
         this.time = time;
-        this.rate = rate;
+        this.rate1 = rate1;
+        this.rate2 = rate2;
+        this.oxy = oxy;
     }
+    public HeartRate(long parentId, String time, double rate1, double rate2, double oxy) {
+        this.parentId = parentId;
+        this.time = Timestamp.valueOf(time);
+        this.rate1 = rate1;
+        this.rate2 = rate2;
+        this.oxy = oxy;
+    }
+
 
     public long getParentId() {
         return parentId;
@@ -45,20 +51,38 @@ public class HeartRate {
         this.time = time;
     }
 
-    public double getRate() {
-        return rate;
+    public double getRate1() {
+        return rate1;
     }
 
-    public void setRate(double rate) {
-        this.rate = rate;
+    public void setRate1(double rate1) {
+        this.rate1 = rate1;
+    }
+
+    public double getRate2() {
+        return rate2;
+    }
+
+    public void setRate2(double rate2) {
+        this.rate2 = rate2;
+    }
+
+    public double getOxy() {
+        return oxy;
+    }
+
+    public void setOxy(double oxy) {
+        this.oxy = oxy;
     }
 
     @Override
     public String toString() {
-        return "HeartRateDao{" +
+        return "HeartRate{" +
                 "parentId=" + parentId +
                 ", time=" + time +
-                ", rate=" + rate +
+                ", rate1=" + rate1 +
+                ", rate2=" + rate2 +
+                ", oxy=" + oxy +
                 '}';
     }
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/HeartRateController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/HeartRateController.java
index 165ac71..c714ed9 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/HeartRateController.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/HeartRateController.java
@@ -54,8 +54,10 @@ public class HeartRateController {
     public void add(@RequestParam Map<String, Object> params){
         long parentId = Long.valueOf(String.valueOf(params.get("parentId")));
         String time = String.valueOf(params.get("time"));
-        double rate = Double.valueOf(String.valueOf(params.get("rate")));
-        HeartRate heartRate = new HeartRate(parentId, time, rate);
+        double rate1 = Double.valueOf(String.valueOf(params.get("rate1")));
+        double rate2 = Double.valueOf(String.valueOf(params.get("rate2")));
+        double oxy = Double.valueOf(String.valueOf(params.get("oxy")));
+        HeartRate heartRate = new HeartRate(parentId, time, rate1, rate2, oxy);
         heartRateService.insert(heartRate);
     }
 
diff --git a/server/OldPeopleHome/src/main/resources/jdbc.properties b/server/OldPeopleHome/src/main/resources/jdbc.properties
index e9eb37f..f66b9aa 100644
--- a/server/OldPeopleHome/src/main/resources/jdbc.properties
+++ b/server/OldPeopleHome/src/main/resources/jdbc.properties
@@ -1,4 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+jdbc.url=jdbc:mysql://ssmtest:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 jdbc.username=root
-jdbc.password=root
+jdbc.password=
diff --git a/server/OldPeopleHome/src/main/resources/mapper/HeartRateDao.xml b/server/OldPeopleHome/src/main/resources/mapper/HeartRateDao.xml
index 7ea5d26..d667f5c 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/HeartRateDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/HeartRateDao.xml
@@ -7,7 +7,9 @@
     <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
         <id column="pid" property="parentId" jdbcType="BIGINT"/>
         <result column="time" property="time" jdbcType="TIMESTAMP"/>
-        <result column="rate" property="rate" jdbcType="DOUBLE"/>
+        <result column="rate1" property="rate1" jdbcType="DOUBLE"/>
+        <result column="rate2" property="rate2" jdbcType="DOUBLE"/>
+        <result column="oxy" property="oxy" jdbcType="DOUBLE"/>
     </resultMap>
 
     <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
         select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
     </select>
     <insert id="insert" parameterType="HeartRate">
-        insert into heartrate(pid, time, rate)
-        values (#{parentId}, #{time}, #{rate})
+        insert into heartrate(pid, time, rate1,rate2,oxy)
+        values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
     </insert>
 </mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/src/main/sql/add_table.sql b/server/OldPeopleHome/src/main/sql/add_table.sql
index 6331b37..e7daf30 100644
--- a/server/OldPeopleHome/src/main/sql/add_table.sql
+++ b/server/OldPeopleHome/src/main/sql/add_table.sql
@@ -59,6 +59,12 @@ CREATE TABLE `heartrate` (
   KEY `time` (`time`) USING BTREE,
   CONSTRAINT `fk_pid2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
+
+ALTER TABLE `heartrate`
+CHANGE COLUMN `rate` `rate1` double NULL DEFAULT NULL COMMENT '收缩压' AFTER `time`,
+ADD COLUMN `rate2` double NULL COMMENT '舒张压' AFTER `rate1`,
+ADD COLUMN `oxy` double NULL AFTER `rate2`;
+
 CREATE TABLE `motion` (
   `pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
   `date` date DEFAULT NULL COMMENT '当日日期',
@@ -91,7 +97,7 @@ CREATE TABLE `sleep` (
   KEY `index_pid_date` (`pid`,`date`) USING BTREE,
   CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
-CREATE TABLE `Untitled`  (
+CREATE TABLE `admin`  (
   `account` varchar(255) NOT NULL COMMENT '管理员账号',
   `password` varchar(255) NULL COMMENT '管理员密码',
   PRIMARY KEY (`account`),
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
index 315e4c2fb477ee490c1eaf45ae739c4cec16c2fd..54a1a6846ac9820bd06b938846de0eca8fbe224c 100644
GIT binary patch
delta 8740
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

delta 8656
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
Wv%((=nO&ic5JORU&d0haSouHT{Rw&i

diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class
index b0520ea78d6992690b86f00c46199cd03b5ae22b..2fab708b1fbb78298cdb8cb4d95690bc7e269c2a 100644
GIT binary patch
literal 2519
zcma)+4O1Ic6o%g=$z}<W(tto)C;_8{09^~!R=#RW1WH3eK(u}@u%(O1ZcG-Y==d|7
z@lQDFjHHgv_yhb=j_<kIgfvZ5m^t^{uXCSs&b#^R@8ACfFpK>d`mx-JSCJL-o|qLe
zt76t-c!2dN9>!o`*+5Rl4Ka@lY|6N0;C&gl4eS`$754)%dr^EC#YY;9qE)h8|G}XK
zZCyjycM7(KzTB~OYMJG)^X4uW%Dz=7&TEL2EZ@G#li9$Z(Gc>UooUb)9M|!eI89IN
zG0d`e$S{|3j%z<UDeT*&U28wjl|;@vu=0CW$&q=m81|n!Weus^fmblS{9)1dih28~
zSFlZ@IsTcsW?LnHn~xLXT6(<|T{fGQm#@@z^Ok#L?)W9gJ(>^p64iT+I~ux<Y=5g>
z1LCs^UFF8LaC%)LM|n_+p`kxL(TaeNZ=aC2VDC9)hw0sOUC+0C$8(w8w94*@Rrc-D
zvqIiHwhq23d#-8K51H$nuXv?`<ulD_(eioJ)zEv!zv+#Q>BGb1+S**9Fjr<gLmv9Z
zbIB7~-PoPH!z;wD5)PzW0ZJAIvyeivi_DdMG<Ydk2&YvEYe(4J+9q9{7dKU_c|kdb
z?^Wwdz0@l5Vr^qP-bv}eUU8)L-SsBk5OKvZf@B;67>wfzuEuc<Lvaj?xsIVI9>?)9
zKG86sl-LmW{)v-6v`ef@J>a)B5iiE^DLxbPIm<DXlp3kEFPO_zQps1%zpT$^7Ma^r
zk}6gk<hqM@HH`hY7B%!-ux;)i+Xp@c{_=-Il2a>xVsAdtkPaHtkk5P@G3i#ZXuJF_
zr`z9Y2oscr${C_wUsC$T_6y;v*foSU;j;f0ZYaInejB6wmFnj&Sp*%@YI+^gZ8fst
zYGlvV$hLFrh9=6O9p!A6qsB3kc@FItb!?0_#xOuH!sx?m^y1Y+Na1zPB)}WA65xA;
zcp4a$0GW|<bY!N_5y}jP&k@cH>gNnSXq-d82!0(=Ug&4=0d$hNo5X!&zDkKE$tVvl
zL6@MxgW^ecLOQDQ3n@=B3@cA^tlp3;4TU%!ApQ^_rWz1`L-c=94m19BQjXv<*#`Lf
zFvdtI|24`~oibIYOp!9pcfq|HWlFw2MVXRMP*F}G6HuBgx#Sng{EChr>2&ZR@VG3F
ztLK`#Fo~()@)Dnt$8^<!i&9tnI7xX-sR;e5uX-I=4}kd*;0E_b8N+1E8c678E;NFe
zEkI13>EV?(dGcl%Gng&o7Uyr_ZCVMr#2pcoo|$CToAG9ecdHGaXjyP><4zE(u}<Ni
zn(%J7z|-&!=IS7|I*n7F%^>pxS!e?yO%#y%mLQR4kh?8G7FvTunn9Kcl5GPb8WNDj
zmLPgF$ZAWFrPd$~A8A!N4+)ZM10oU@5dNIgN}ErqK~YZb4;YW1qcah!piAUjK|JwF
v)elwBow!u>!xi)-E?51C_=&2o)9?ANg5C=HngzJkkWVhqv4(p}2lxL0bsVr8

literal 2020
zcmah}Yf~F#7(H*;TnLduO1Kp*)LuepSZir*p+#FFr5H*Dh8e#&vm{%(nB9%pO~>l^
zlN@zMQb%X}0sbh*^XzUeK%)8ZUZ3}z^PK0&{{7D%e*w6QgEX>uIE-<urm==cvU)7T
zdJ><ek-)<gK9l*03{O+okhzq?=Q3}~@JxoSB%UX+t&pl44b$<TR}~buns3>r!bJJR
zcw^|^w>ABM2cB=(^)=o$44=2Eq>y-IIhMb!FqB_B<jsa#<;|tC<(My;_L12*Fpg?G
z$(G%UQ9Cpmmh7WL&3|oq3fIdO*Vf%ywQjogn)%wbO`TdS|E<1d8V!GsY-F9vZ-;Vf
zhI6d%`wh!EUMmS}_Tst1OgsFn`ryIHvFX3;Buwc{dBp2I)AHMboMfP6t}vNj>~F@*
zUXxmF^U(4vruM{fT;K35*I{PGAhTD7=bMf1?3#XJRKD?CM>je_`Zo8QZo@WwrkJc7
zK0_Ua%WwHB?(7t+)%mThRoh<mh?f$g?_Gy_;?H&tmLBj4Wrqr<^8Ez1vk()5DzRwt
zCfsZJz>k#ghJLc-?L2#3R!Hx=%|^xCw4|7$ow6)Te`GL&*$ggYB8e|DC}Sss940fE
z!Zgbkv``P))23Ccnhjdofhig85A6ngoWTq1%J7m(Z_i80!P%F=R$4FE?n%gg2KR7Z
z;oARqkiuA3$?nmKS@GF97yFwmZ;V>g+<m2xk1Xv`zc!!^5=OmlI{f<-2fyioiA-S4
z=h$f%`nP+11}>D{mM{RW^j~mu`HjKXSl|~V%MZ*DVp2}7Vp7RqW-&RZ!G9KJIbPxJ
zE@#C#UU&!fYY;XU1jRUxLnGMxTxG%_e1NOm3BWu@0jQHI!FgH$3Rh1ND-?gn&?&US
zw04Sk7jqJE#!V12hha(@XLpGt!7uQX7!kg#M7#)_X7mC%WF^sBz<w=aw<Gpk5Boss
zSw6l(>N$*(bb@4E>Rg99*P+e@&Ixs{L;WGHN7Oo<4W0W9v7Z<eBQWTN94_>A?FMc}
zkJqVNfD?gZU60a40dCN#n*qXPuupWvB_eSOw~*(ZR6r+YTZr}x4|;_x_7Sqkm@z&n
zFmlPmZ4^B$bFbqgjsm&P8xfKyEYZ#L@`{wVJV2iGn#j3>k0Y#JpW;8ClXs_&JjJG5
z=?H22bn8qng+AS*koyCKNUw+xeq17~uj#n>wDKnsU%f*zn`&XWz~Z%#&W?m@t%XeX
fy>K0GVRY=r7B00gcHY+29^ETZbre1cvU~6^<bQc8

diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class
index 849a156438b108a3cf8d7f44c49b9dc307c0551a..6f8367e2175de0dc6cdbdbcf64e1869b76761563 100644
GIT binary patch
delta 1078
zcmZ9LeN$9r7{-6k*<H@=*^`YM#x9W3f~Ks6Zj!KMuRtP11)8EoY)J$W7%ZexonADg
z7kXJ=;!8B+(1g^CAHYAF{KwCcUjVzFvkuKTv**6A`}Mi+>v{HW?ca65t&Kl#0#CEz
z@ffG#yp`l_hU2{BGU8F>T`S)6h;ceWJ)=q9XUyXR#;tF{njcy;Y0*b<x|2*X?Qw>W
z;~b9D<1xdm6{R@6ar#{5JTlDN{7<S}&bpkt9$a#~^C4bv`E+$_<bX-XW{RcJ{RY!%
z2yxyJnLc}NwLkisc_d4t+_R<POvz=z=QBPpKU}qMDDe4$FMYn^Yo9C^e73X0<)Y6w
zEV^8>;UydS*5^AGE&AT)2OC@V`H`Po&fA=yU4F5;>~onbhHUvCC;O01zv^?1Uk!W8
zBWBO)zg4%Ln#}GaeG|p`V#{Q4YOH0jG&4Rm*3sEnzLRJV>cuM<96N|~gRCm)$E73E
zT12u*R*STejy11gt_wKql(fl^W|yR2N#F@~%hC)qtBH!uit=3fmU1a)orpsrnoC93
zDKC40*;(F_><DawGbDLRZF1~YK|#e&%8oFw=^NhkEo}PK_WqF;wXiQ7V~PFbHRPhc
zN*9knPbp87YUVf~6r)wAHmGMI2pc~mSvkU@N~uK$m9~q>28Xmpn|_V=w7uR(yGtST
zbX5FdJ4or!XEny5Q<zzv<9YdC(6_~rFuZ6(vl`Iw5-)3@CM|BNC49x_%L9Hs$fau5
z+3IkE)D5=%!K3YNE|q@3mH3OyP(vn~j-}mnVvX8DviWxsndCZk4)&HJ;Vor}3m?>6
zZMx=mtzMvu4o+yw2`x3J8SMoOgn9F#Gq6{vS?E-vQQ>L2c|~jO;5dgv7W0bra6~M2
zX_a0fR}Ht*CzMcIpI7PEPL|`!)3DuMQ@7XUad<<_qkpZX%DGR~0E41zl%uU2+honP
WFYnE;=6EPigq4=$A=&>EeeyqWkCIma

delta 949
zcmYL|*-jH-7>1vjw*2jM;sI(31qI6@;sPQHw2G(*3UvcFM9~U}AXaP(sHjy@S=_Cj
zco8N96QU+wfCrp=5gvE}qTfF?HR*io`)%(`my3P{)8ALVd;@my-lB*zUe5aI;hdLV
z#d(Vh^l5R?!owvWL1KO`({C}rppIS9?vS>wYHQd_tDh0BS&VYsOPiN=i#Rv57*pJ|
z2$0aoq#~slUwATWS`&^vskpTmaMc?=cOsS=G%#8h``sUn)un7O@FY{Qgj7u0+~!WE
zJg>HA%H}TjZ0?h`DdmApG3yi$Z5}bLc&yV;bmpne4Aa`0wVBhod7EcES4?Qk3&l&V
zU)j9ojX@~0;tN?C{?;bLyTu=Qzs<FQs*dPLY$8@O8jBCrbf*%-@u5iOr>|)sD8zw*
zsppGcFJ7ML645TvvcJfXcr~I8(Vprhj0G`F%0y}~6i_bG&H|{QQapo=R7sOiX5RW>
zlw~UXk+epQ;b)s*H&HFsVL@zWi^#5AtS=Xv%Egf5vwgL-RXXUobFx;gY%(KHwu?oY
z?GkgdhH>h|^2i5*9O5FJb{f}<%#P4jwp3d?1y+e`g*_;C$*=5>jLcIsC>oteQ#LL*
z%~QS%4a*vlUW_EWr3{+oS!Iea*sD`Xhqo5?$wDDHoMq|lm3%ZaY}ci~66h%{bQgG*
zC<v?SPxuPeX9`U;!7hj3ppXO&GObbGN|T%vriBQdGEvjn?Bt_4a-!_#fQ-%;Tq_4<
z#}c8d&7q`D{siqD5=vTx*u%s-WE;&+_RZ<iPAQE_#N>!`WU+Ik`R~Z19Ft=QInIgP
Xxk`T*T~0~2BTweoIVJvohED$ltQ&g#

diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
index 7ea5d26..d667f5c 100644
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
@@ -7,7 +7,9 @@
     <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
         <id column="pid" property="parentId" jdbcType="BIGINT"/>
         <result column="time" property="time" jdbcType="TIMESTAMP"/>
-        <result column="rate" property="rate" jdbcType="DOUBLE"/>
+        <result column="rate1" property="rate1" jdbcType="DOUBLE"/>
+        <result column="rate2" property="rate2" jdbcType="DOUBLE"/>
+        <result column="oxy" property="oxy" jdbcType="DOUBLE"/>
     </resultMap>
 
     <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
         select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
     </select>
     <insert id="insert" parameterType="HeartRate">
-        insert into heartrate(pid, time, rate)
-        values (#{parentId}, #{time}, #{rate})
+        insert into heartrate(pid, time, rate1,rate2,oxy)
+        values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
     </insert>
 </mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class
index b0520ea78d6992690b86f00c46199cd03b5ae22b..2fab708b1fbb78298cdb8cb4d95690bc7e269c2a 100644
GIT binary patch
literal 2519
zcma)+4O1Ic6o%g=$z}<W(tto)C;_8{09^~!R=#RW1WH3eK(u}@u%(O1ZcG-Y==d|7
z@lQDFjHHgv_yhb=j_<kIgfvZ5m^t^{uXCSs&b#^R@8ACfFpK>d`mx-JSCJL-o|qLe
zt76t-c!2dN9>!o`*+5Rl4Ka@lY|6N0;C&gl4eS`$754)%dr^EC#YY;9qE)h8|G}XK
zZCyjycM7(KzTB~OYMJG)^X4uW%Dz=7&TEL2EZ@G#li9$Z(Gc>UooUb)9M|!eI89IN
zG0d`e$S{|3j%z<UDeT*&U28wjl|;@vu=0CW$&q=m81|n!Weus^fmblS{9)1dih28~
zSFlZ@IsTcsW?LnHn~xLXT6(<|T{fGQm#@@z^Ok#L?)W9gJ(>^p64iT+I~ux<Y=5g>
z1LCs^UFF8LaC%)LM|n_+p`kxL(TaeNZ=aC2VDC9)hw0sOUC+0C$8(w8w94*@Rrc-D
zvqIiHwhq23d#-8K51H$nuXv?`<ulD_(eioJ)zEv!zv+#Q>BGb1+S**9Fjr<gLmv9Z
zbIB7~-PoPH!z;wD5)PzW0ZJAIvyeivi_DdMG<Ydk2&YvEYe(4J+9q9{7dKU_c|kdb
z?^Wwdz0@l5Vr^qP-bv}eUU8)L-SsBk5OKvZf@B;67>wfzuEuc<Lvaj?xsIVI9>?)9
zKG86sl-LmW{)v-6v`ef@J>a)B5iiE^DLxbPIm<DXlp3kEFPO_zQps1%zpT$^7Ma^r
zk}6gk<hqM@HH`hY7B%!-ux;)i+Xp@c{_=-Il2a>xVsAdtkPaHtkk5P@G3i#ZXuJF_
zr`z9Y2oscr${C_wUsC$T_6y;v*foSU;j;f0ZYaInejB6wmFnj&Sp*%@YI+^gZ8fst
zYGlvV$hLFrh9=6O9p!A6qsB3kc@FItb!?0_#xOuH!sx?m^y1Y+Na1zPB)}WA65xA;
zcp4a$0GW|<bY!N_5y}jP&k@cH>gNnSXq-d82!0(=Ug&4=0d$hNo5X!&zDkKE$tVvl
zL6@MxgW^ecLOQDQ3n@=B3@cA^tlp3;4TU%!ApQ^_rWz1`L-c=94m19BQjXv<*#`Lf
zFvdtI|24`~oibIYOp!9pcfq|HWlFw2MVXRMP*F}G6HuBgx#Sng{EChr>2&ZR@VG3F
ztLK`#Fo~()@)Dnt$8^<!i&9tnI7xX-sR;e5uX-I=4}kd*;0E_b8N+1E8c678E;NFe
zEkI13>EV?(dGcl%Gng&o7Uyr_ZCVMr#2pcoo|$CToAG9ecdHGaXjyP><4zE(u}<Ni
zn(%J7z|-&!=IS7|I*n7F%^>pxS!e?yO%#y%mLQR4kh?8G7FvTunn9Kcl5GPb8WNDj
zmLPgF$ZAWFrPd$~A8A!N4+)ZM10oU@5dNIgN}ErqK~YZb4;YW1qcah!piAUjK|JwF
v)elwBow!u>!xi)-E?51C_=&2o)9?ANg5C=HngzJkkWVhqv4(p}2lxL0bsVr8

literal 2020
zcmah}Yf~F#7(H*;TnLduO1Kp*)LuepSZir*p+#FFr5H*Dh8e#&vm{%(nB9%pO~>l^
zlN@zMQb%X}0sbh*^XzUeK%)8ZUZ3}z^PK0&{{7D%e*w6QgEX>uIE-<urm==cvU)7T
zdJ><ek-)<gK9l*03{O+okhzq?=Q3}~@JxoSB%UX+t&pl44b$<TR}~buns3>r!bJJR
zcw^|^w>ABM2cB=(^)=o$44=2Eq>y-IIhMb!FqB_B<jsa#<;|tC<(My;_L12*Fpg?G
z$(G%UQ9Cpmmh7WL&3|oq3fIdO*Vf%ywQjogn)%wbO`TdS|E<1d8V!GsY-F9vZ-;Vf
zhI6d%`wh!EUMmS}_Tst1OgsFn`ryIHvFX3;Buwc{dBp2I)AHMboMfP6t}vNj>~F@*
zUXxmF^U(4vruM{fT;K35*I{PGAhTD7=bMf1?3#XJRKD?CM>je_`Zo8QZo@WwrkJc7
zK0_Ua%WwHB?(7t+)%mThRoh<mh?f$g?_Gy_;?H&tmLBj4Wrqr<^8Ez1vk()5DzRwt
zCfsZJz>k#ghJLc-?L2#3R!Hx=%|^xCw4|7$ow6)Te`GL&*$ggYB8e|DC}Sss940fE
z!Zgbkv``P))23Ccnhjdofhig85A6ngoWTq1%J7m(Z_i80!P%F=R$4FE?n%gg2KR7Z
z;oARqkiuA3$?nmKS@GF97yFwmZ;V>g+<m2xk1Xv`zc!!^5=OmlI{f<-2fyioiA-S4
z=h$f%`nP+11}>D{mM{RW^j~mu`HjKXSl|~V%MZ*DVp2}7Vp7RqW-&RZ!G9KJIbPxJ
zE@#C#UU&!fYY;XU1jRUxLnGMxTxG%_e1NOm3BWu@0jQHI!FgH$3Rh1ND-?gn&?&US
zw04Sk7jqJE#!V12hha(@XLpGt!7uQX7!kg#M7#)_X7mC%WF^sBz<w=aw<Gpk5Boss
zSw6l(>N$*(bb@4E>Rg99*P+e@&Ixs{L;WGHN7Oo<4W0W9v7Z<eBQWTN94_>A?FMc}
zkJqVNfD?gZU60a40dCN#n*qXPuupWvB_eSOw~*(ZR6r+YTZr}x4|;_x_7Sqkm@z&n
zFmlPmZ4^B$bFbqgjsm&P8xfKyEYZ#L@`{wVJV2iGn#j3>k0Y#JpW;8ClXs_&JjJG5
z=?H22bn8qng+AS*koyCKNUw+xeq17~uj#n>wDKnsU%f*zn`&XWz~Z%#&W?m@t%XeX
fy>K0GVRY=r7B00gcHY+29^ETZbre1cvU~6^<bQc8

diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class
index 849a156438b108a3cf8d7f44c49b9dc307c0551a..6f8367e2175de0dc6cdbdbcf64e1869b76761563 100644
GIT binary patch
delta 1078
zcmZ9LeN$9r7{-6k*<H@=*^`YM#x9W3f~Ks6Zj!KMuRtP11)8EoY)J$W7%ZexonADg
z7kXJ=;!8B+(1g^CAHYAF{KwCcUjVzFvkuKTv**6A`}Mi+>v{HW?ca65t&Kl#0#CEz
z@ffG#yp`l_hU2{BGU8F>T`S)6h;ceWJ)=q9XUyXR#;tF{njcy;Y0*b<x|2*X?Qw>W
z;~b9D<1xdm6{R@6ar#{5JTlDN{7<S}&bpkt9$a#~^C4bv`E+$_<bX-XW{RcJ{RY!%
z2yxyJnLc}NwLkisc_d4t+_R<POvz=z=QBPpKU}qMDDe4$FMYn^Yo9C^e73X0<)Y6w
zEV^8>;UydS*5^AGE&AT)2OC@V`H`Po&fA=yU4F5;>~onbhHUvCC;O01zv^?1Uk!W8
zBWBO)zg4%Ln#}GaeG|p`V#{Q4YOH0jG&4Rm*3sEnzLRJV>cuM<96N|~gRCm)$E73E
zT12u*R*STejy11gt_wKql(fl^W|yR2N#F@~%hC)qtBH!uit=3fmU1a)orpsrnoC93
zDKC40*;(F_><DawGbDLRZF1~YK|#e&%8oFw=^NhkEo}PK_WqF;wXiQ7V~PFbHRPhc
zN*9knPbp87YUVf~6r)wAHmGMI2pc~mSvkU@N~uK$m9~q>28Xmpn|_V=w7uR(yGtST
zbX5FdJ4or!XEny5Q<zzv<9YdC(6_~rFuZ6(vl`Iw5-)3@CM|BNC49x_%L9Hs$fau5
z+3IkE)D5=%!K3YNE|q@3mH3OyP(vn~j-}mnVvX8DviWxsndCZk4)&HJ;Vor}3m?>6
zZMx=mtzMvu4o+yw2`x3J8SMoOgn9F#Gq6{vS?E-vQQ>L2c|~jO;5dgv7W0bra6~M2
zX_a0fR}Ht*CzMcIpI7PEPL|`!)3DuMQ@7XUad<<_qkpZX%DGR~0E41zl%uU2+honP
WFYnE;=6EPigq4=$A=&>EeeyqWkCIma

delta 949
zcmYL|*-jH-7>1vjw*2jM;sI(31qI6@;sPQHw2G(*3UvcFM9~U}AXaP(sHjy@S=_Cj
zco8N96QU+wfCrp=5gvE}qTfF?HR*io`)%(`my3P{)8ALVd;@my-lB*zUe5aI;hdLV
z#d(Vh^l5R?!owvWL1KO`({C}rppIS9?vS>wYHQd_tDh0BS&VYsOPiN=i#Rv57*pJ|
z2$0aoq#~slUwATWS`&^vskpTmaMc?=cOsS=G%#8h``sUn)un7O@FY{Qgj7u0+~!WE
zJg>HA%H}TjZ0?h`DdmApG3yi$Z5}bLc&yV;bmpne4Aa`0wVBhod7EcES4?Qk3&l&V
zU)j9ojX@~0;tN?C{?;bLyTu=Qzs<FQs*dPLY$8@O8jBCrbf*%-@u5iOr>|)sD8zw*
zsppGcFJ7ML645TvvcJfXcr~I8(Vprhj0G`F%0y}~6i_bG&H|{QQapo=R7sOiX5RW>
zlw~UXk+epQ;b)s*H&HFsVL@zWi^#5AtS=Xv%Egf5vwgL-RXXUobFx;gY%(KHwu?oY
z?GkgdhH>h|^2i5*9O5FJb{f}<%#P4jwp3d?1y+e`g*_;C$*=5>jLcIsC>oteQ#LL*
z%~QS%4a*vlUW_EWr3{+oS!Iea*sD`Xhqo5?$wDDHoMq|lm3%ZaY}ci~66h%{bQgG*
zC<v?SPxuPeX9`U;!7hj3ppXO&GObbGN|T%vriBQdGEvjn?Bt_4a-!_#fQ-%;Tq_4<
z#}c8d&7q`D{siqD5=vTx*u%s-WE;&+_RZ<iPAQE_#N>!`WU+Ik`R~Z19Ft=QInIgP
Xxk`T*T~0~2BTweoIVJvohED$ltQ&g#

diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
index 7ea5d26..d667f5c 100644
--- a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
+++ b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
@@ -7,7 +7,9 @@
     <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
         <id column="pid" property="parentId" jdbcType="BIGINT"/>
         <result column="time" property="time" jdbcType="TIMESTAMP"/>
-        <result column="rate" property="rate" jdbcType="DOUBLE"/>
+        <result column="rate1" property="rate1" jdbcType="DOUBLE"/>
+        <result column="rate2" property="rate2" jdbcType="DOUBLE"/>
+        <result column="oxy" property="oxy" jdbcType="DOUBLE"/>
     </resultMap>
 
     <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
         select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
     </select>
     <insert id="insert" parameterType="HeartRate">
-        insert into heartrate(pid, time, rate)
-        values (#{parentId}, #{time}, #{rate})
+        insert into heartrate(pid, time, rate1,rate2,oxy)
+        values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
     </insert>
 </mapper>
\ No newline at end of file
diff --git a/server/README.md b/server/README.md
index 5d3a652..224c88f 100644
--- a/server/README.md
+++ b/server/README.md
@@ -96,4 +96,4 @@
 | Sleep          | /sleep/get/1           | GET      | 查找id=1的老人睡眠信息                    | 参数格式：yyyy-mm-dd  加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
 | Sleep          | /sleep/add             | POST     | 添加老人睡眠信息                          | parent，date，deep，light，awake                             |
 | HeartRate      | /heartrate/get/1       | GET      | 查找id=1的心率信息                        | 参数格式：yyyy-mm-dd hh-mm-ss  加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
-| HeartRate      | /heartrate/add         | POST     | 添加老人睡眠信息                          | parentId，time，rate                                         |
+| HeartRate      | /heartrate/add         | POST     | 添加老人睡眠信息                          | parentId，time，rate1(收缩压)，rate2(舒张压)，oxy。          |