From 9edfcfb7129cfcc9270a2f04e1b36cef072d2cf9 Mon Sep 17 00:00:00 2001
From: loser <12524321+loser111@user.noreply.gitee.com>
Date: Sun, 30 Apr 2023 13:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/supplies/NucleicController.java |  14 +-
 .../web/controller/supplies/VaccineController.java |   4 +-
 .../src/main/resources/templates/check/add.html    |  84 ----------
 .../src/main/resources/templates/check/check.html  | 142 -----------------
 .../resources/templates/check/checkManage/add.html |  85 +++++++++++
 .../templates/check/checkManage/checkManage.html   | 162 ++++++++++++++++++++
 .../templates/check/checkManage/edit.html          |  86 +++++++++++
 .../src/main/resources/templates/check/edit.html   |  85 -----------
 .../main/resources/templates/checkManage/add.html  |  85 -----------
 .../templates/checkManage/checkManage.html         | 162 --------------------
 .../main/resources/templates/checkManage/edit.html |  86 -----------
 .../resources/templates/individual/check/add.html  |  84 ++++++++++
 .../templates/individual/check/check.html          | 142 +++++++++++++++++
 .../resources/templates/individual/check/edit.html |  85 +++++++++++
 .../templates/patient/patientManage/add.html       | 102 +++++++++++++
 .../templates/patient/patientManage/edit.html      | 103 +++++++++++++
 .../patient/patientManage/patientManage.html       | 170 +++++++++++++++++++++
 .../resources/templates/patientManage/add.html     | 102 -------------
 .../resources/templates/patientManage/edit.html    | 103 -------------
 .../templates/patientManage/patientManage.html     | 170 ---------------------
 .../resources/templates/supplies/nucleic/add.html  |   8 +-
 .../resources/templates/supplies/nucleic/edit.html |  10 +-
 .../templates/supplies/nucleic/nucleic.html        |  32 ++--
 .../resources/templates/supplies/vaccine/add.html  |   2 +-
 .../resources/templates/supplies/vaccine/edit.html |   2 +-
 .../templates/supplies/vaccine/vaccine.html        |  14 +-
 .../main/java/com/ruoyi/system/domain/Nucleic.java |  48 +++---
 .../com/ruoyi/system/domain/PatientManage.java     |  24 +--
 .../com/ruoyi/system/mapper/NucleicMapper.java     |  12 +-
 .../com/ruoyi/system/service/INucleicService.java  |  12 +-
 .../system/service/impl/NucleicServiceImpl.java    |  18 +--
 .../main/resources/mapper/PatientManageMapper.xml  |  22 +--
 .../resources/mapper/supplies/NucleicMapper.xml    |  67 ++++++++
 .../resources/mapper/supplies/VaccineMapper.xml    |  67 ++++++++
 .../mapper/suppliesManage/NucleicMapper.xml        |  67 --------
 .../mapper/suppliesManage/VaccineMapper.xml        |  67 --------
 36 files changed, 1264 insertions(+), 1264 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/resources/templates/check/add.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/check/check.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/check/checkManage/add.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/check/edit.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/checkManage/add.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/checkManage/checkManage.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/checkManage/edit.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/individual/check/add.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/individual/check/check.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/individual/check/edit.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/patientManage/add.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/patientManage/edit.html
 delete mode 100644 ruoyi-admin/src/main/resources/templates/patientManage/patientManage.html
 create mode 100644 ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
 create mode 100644 ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
 delete mode 100644 ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml
 delete mode 100644 ruoyi-system/src/main/resources/mapper/suppliesManage/VaccineMapper.xml

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java
index da22803..c7d3bba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/NucleicController.java
@@ -22,14 +22,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 核酸管理Controller
  * 
- * @author ruoyi
+ * @author zlx
  * @date 2023-04-22
  */
 @Controller
 @RequestMapping("/supplies/nucleic")
 public class NucleicController extends BaseController
 {
-    private String prefix = "supplies/nucleic";
+    private String prefix = "supplies/nucleic/nucleic";
 
     @Autowired
     private INucleicService nucleicService;
@@ -38,7 +38,7 @@ public class NucleicController extends BaseController
     @GetMapping()
     public String nucleic()
     {
-        return prefix + "/nucleic";
+        return prefix ;
     }
 
     /**
@@ -93,10 +93,10 @@ public class NucleicController extends BaseController
      * 修改核酸管理
      */
     @RequiresPermissions("supplies:nucleic:edit")
-    @GetMapping("/edit/{nucleinId}")
-    public String edit(@PathVariable("nucleinId") Long nucleinId, ModelMap mmap)
+    @GetMapping("/edit/{nucleicId}")
+    public String edit(@PathVariable("nucleicId") Long nucleicId, ModelMap mmap)
     {
-        Nucleic nucleic = nucleicService.selectNucleicByNucleinId(nucleinId);
+        Nucleic nucleic = nucleicService.selectNucleicByNucleicId(nucleicId);
         mmap.put("nucleic", nucleic);
         return prefix + "/edit";
     }
@@ -122,6 +122,6 @@ public class NucleicController extends BaseController
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        return toAjax(nucleicService.deleteNucleicByNucleinIds(ids));
+        return toAjax(nucleicService.deleteNucleicByNucleicIds(ids));
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java
index 73141f6..65d382e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/supplies/VaccineController.java
@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/supplies/vaccine")
 public class VaccineController extends BaseController
 {
-    private String prefix = "supplies/vaccine";
+    private String prefix = "supplies/vaccine/vaccine";
 
     @Autowired
     private IVaccineService vaccineService;
@@ -38,7 +38,7 @@ public class VaccineController extends BaseController
     @GetMapping()
     public String vaccine()
     {
-        return prefix + "/vaccine";
+        return prefix ;
     }
 
     /**
diff --git a/ruoyi-admin/src/main/resources/templates/check/add.html b/ruoyi-admin/src/main/resources/templates/check/add.html
deleted file mode 100644
index 86f906c..0000000
--- a/ruoyi-admin/src/main/resources/templates/check/add.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增个人打卡')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-check-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人姓名：</label>
-                <div class="col-sm-8">
-                    <input name="checkName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">健康状况：</label>
-                <div class="col-sm-8">
-                    <input name="state" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
-                <div class="col-sm-8">
-                    <input name="isHigh" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否接触过密接人员：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">个人状况描述：</label>
-                <div class="col-sm-8">
-                    <input name="description" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">当前时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="checkDatetime" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡位置：</label>
-                <div class="col-sm-8">
-                    <input name="currentPosition" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "system/check"
-        $("#form-check-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-check-add').serialize());
-            }
-        }
-
-        $("input[name='checkDatetime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/check/check.html b/ruoyi-admin/src/main/resources/templates/check/check.html
deleted file mode 100644
index e46c173..0000000
--- a/ruoyi-admin/src/main/resources/templates/check/check.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('个人打卡列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>打卡人姓名：</label>
-                                <input type="text" name="checkName"/>
-                            </li>
-                            <li>
-                                <label>体温：</label>
-                                <input type="text" name="temperature"/>
-                            </li>
-                            <li>
-                                <label>健康状况：</label>
-                                <input type="text" name="state"/>
-                            </li>
-                            <li>
-                                <label>是否去过高风险地区：</label>
-                                <input type="text" name="isHigh"/>
-                            </li>
-                            <li>
-                                <label>是否接触过密接人员：</label>
-                                <input type="text" name="isTouch"/>
-                            </li>
-                            <li>
-                                <label>个人状况描述：</label>
-                                <input type="text" name="description"/>
-                            </li>
-                            <li>
-                                <label>当前时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择当前时间" name="checkDatetime"/>
-                            </li>
-                            <li>
-                                <label>打卡位置：</label>
-                                <input type="text" name="currentPosition"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:check:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:check:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:check:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:check:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:check:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:check:remove')}]];
-        var prefix = ctx + "system/check";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "个人打卡",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'checkId',
-                    title: '打卡id',
-                    visible: false
-                },
-                {
-                    field: 'checkName',
-                    title: '打卡人姓名'
-                },
-                {
-                    field: 'temperature',
-                    title: '体温'
-                },
-                {
-                    field: 'state',
-                    title: '健康状况'
-                },
-                {
-                    field: 'isHigh',
-                    title: '是否去过高风险地区'
-                },
-                {
-                    field: 'isTouch',
-                    title: '是否接触过密接人员'
-                },
-                {
-                    field: 'description',
-                    title: '个人状况描述'
-                },
-                {
-                    field: 'checkDatetime',
-                    title: '当前时间'
-                },
-                {
-                    field: 'currentPosition',
-                    title: '打卡位置'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html
new file mode 100644
index 0000000..d374f0f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增打卡管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-checkManage-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人姓名：</label>
+                <div class="col-sm-8">
+                    <input name="checkName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人年龄：</label>
+                <div class="col-sm-8">
+                    <input name="checkAge" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="patientPhone" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确诊状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDiagnosed" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">治愈状态：</label>
+                <div class="col-sm-8">
+                    <input name="isCure" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">密接状态：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">死亡状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDead" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="description" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最近接触地区：</label>
+                <div class="col-sm-8">
+                    <input name="checkPostition" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "check/checkManage"
+        $("#form-checkManage-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-checkManage-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html
new file mode 100644
index 0000000..54bdfff
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('打卡管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>打卡人姓名：</label>
+                                <input type="text" name="checkName"/>
+                            </li>
+                            <li>
+                                <label>打卡人年龄：</label>
+                                <input type="text" name="checkAge"/>
+                            </li>
+                            <li>
+                                <label>联系电话：</label>
+                                <input type="text" name="patientPhone"/>
+                            </li>
+                            <li>
+                                <label>确诊状态：</label>
+                                <input type="text" name="isDiagnosed"/>
+                            </li>
+                            <li>
+                                <label>治愈状态：</label>
+                                <input type="text" name="isCure"/>
+                            </li>
+                            <li>
+                                <label>密接状态：</label>
+                                <input type="text" name="isTouch"/>
+                            </li>
+                            <li>
+                                <label>死亡状态：</label>
+                                <input type="text" name="isDead"/>
+                            </li>
+                            <li>
+                                <label>备注：</label>
+                                <input type="text" name="description"/>
+                            </li>
+                            <li>
+                                <label>最近接触地区：</label>
+                                <input type="text" name="checkPostition"/>
+                            </li>
+                            <li>
+                                <label>体温：</label>
+                                <input type="text" name="temperature"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="check:checkManage:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="check:checkManage:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="check:checkManage:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="check:checkManage:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('check:checkManage:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('check:checkManage:remove')}]];
+        var prefix = ctx + "check/checkManage";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "打卡管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'checkManageId',
+                    title: '打卡管理ID',
+                    visible: false
+                },
+                {
+                    field: 'checkName',
+                    title: '打卡人姓名'
+                },
+                {
+                    field: 'checkAge',
+                    title: '打卡人年龄'
+                },
+                {
+                    field: 'checkSex',
+                    title: '打卡人性别'
+                },
+                {
+                    field: 'patientPhone',
+                    title: '联系电话'
+                },
+                {
+                    field: 'isDiagnosed',
+                    title: '确诊状态'
+                },
+                {
+                    field: 'isCure',
+                    title: '治愈状态'
+                },
+                {
+                    field: 'isTouch',
+                    title: '密接状态'
+                },
+                {
+                    field: 'isDead',
+                    title: '死亡状态'
+                },
+                {
+                    field: 'description',
+                    title: '备注'
+                },
+                {
+                    field: 'checkPostition',
+                    title: '最近接触地区'
+                },
+                {
+                    field: 'temperature',
+                    title: '体温'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkManageId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkManageId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html
new file mode 100644
index 0000000..d1b0a42
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改打卡管理')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-checkManage-edit" th:object="${checkManage}">
+            <input name="checkManageId" th:field="*{checkManageId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人姓名：</label>
+                <div class="col-sm-8">
+                    <input name="checkName" th:field="*{checkName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人年龄：</label>
+                <div class="col-sm-8">
+                    <input name="checkAge" th:field="*{checkAge}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="patientPhone" th:field="*{patientPhone}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确诊状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDiagnosed" th:field="*{isDiagnosed}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">治愈状态：</label>
+                <div class="col-sm-8">
+                    <input name="isCure" th:field="*{isCure}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">密接状态：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">死亡状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDead" th:field="*{isDead}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="description" th:field="*{description}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最近接触地区：</label>
+                <div class="col-sm-8">
+                    <input name="checkPostition" th:field="*{checkPostition}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "check/checkManage";
+        $("#form-checkManage-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-checkManage-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/check/edit.html b/ruoyi-admin/src/main/resources/templates/check/edit.html
deleted file mode 100644
index 8fc86e0..0000000
--- a/ruoyi-admin/src/main/resources/templates/check/edit.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改个人打卡')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-check-edit" th:object="${check}">
-            <input name="checkId" th:field="*{checkId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人姓名：</label>
-                <div class="col-sm-8">
-                    <input name="checkName" th:field="*{checkName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">健康状况：</label>
-                <div class="col-sm-8">
-                    <input name="state" th:field="*{state}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
-                <div class="col-sm-8">
-                    <input name="isHigh" th:field="*{isHigh}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否接触过密接人员：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">个人状况描述：</label>
-                <div class="col-sm-8">
-                    <input name="description" th:field="*{description}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">当前时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="checkDatetime" th:value="${#dates.format(check.checkDatetime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡位置：</label>
-                <div class="col-sm-8">
-                    <input name="currentPosition" th:field="*{currentPosition}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "system/check";
-        $("#form-check-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-check-edit').serialize());
-            }
-        }
-
-        $("input[name='checkDatetime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/checkManage/add.html b/ruoyi-admin/src/main/resources/templates/checkManage/add.html
deleted file mode 100644
index d374f0f..0000000
--- a/ruoyi-admin/src/main/resources/templates/checkManage/add.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增打卡管理')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-checkManage-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人姓名：</label>
-                <div class="col-sm-8">
-                    <input name="checkName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人年龄：</label>
-                <div class="col-sm-8">
-                    <input name="checkAge" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系电话：</label>
-                <div class="col-sm-8">
-                    <input name="patientPhone" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">确诊状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDiagnosed" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">治愈状态：</label>
-                <div class="col-sm-8">
-                    <input name="isCure" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">密接状态：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">死亡状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDead" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="description" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">最近接触地区：</label>
-                <div class="col-sm-8">
-                    <input name="checkPostition" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "check/checkManage"
-        $("#form-checkManage-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-checkManage-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/checkManage/checkManage.html b/ruoyi-admin/src/main/resources/templates/checkManage/checkManage.html
deleted file mode 100644
index 54bdfff..0000000
--- a/ruoyi-admin/src/main/resources/templates/checkManage/checkManage.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('打卡管理列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>打卡人姓名：</label>
-                                <input type="text" name="checkName"/>
-                            </li>
-                            <li>
-                                <label>打卡人年龄：</label>
-                                <input type="text" name="checkAge"/>
-                            </li>
-                            <li>
-                                <label>联系电话：</label>
-                                <input type="text" name="patientPhone"/>
-                            </li>
-                            <li>
-                                <label>确诊状态：</label>
-                                <input type="text" name="isDiagnosed"/>
-                            </li>
-                            <li>
-                                <label>治愈状态：</label>
-                                <input type="text" name="isCure"/>
-                            </li>
-                            <li>
-                                <label>密接状态：</label>
-                                <input type="text" name="isTouch"/>
-                            </li>
-                            <li>
-                                <label>死亡状态：</label>
-                                <input type="text" name="isDead"/>
-                            </li>
-                            <li>
-                                <label>备注：</label>
-                                <input type="text" name="description"/>
-                            </li>
-                            <li>
-                                <label>最近接触地区：</label>
-                                <input type="text" name="checkPostition"/>
-                            </li>
-                            <li>
-                                <label>体温：</label>
-                                <input type="text" name="temperature"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="check:checkManage:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="check:checkManage:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="check:checkManage:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="check:checkManage:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('check:checkManage:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('check:checkManage:remove')}]];
-        var prefix = ctx + "check/checkManage";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "打卡管理",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'checkManageId',
-                    title: '打卡管理ID',
-                    visible: false
-                },
-                {
-                    field: 'checkName',
-                    title: '打卡人姓名'
-                },
-                {
-                    field: 'checkAge',
-                    title: '打卡人年龄'
-                },
-                {
-                    field: 'checkSex',
-                    title: '打卡人性别'
-                },
-                {
-                    field: 'patientPhone',
-                    title: '联系电话'
-                },
-                {
-                    field: 'isDiagnosed',
-                    title: '确诊状态'
-                },
-                {
-                    field: 'isCure',
-                    title: '治愈状态'
-                },
-                {
-                    field: 'isTouch',
-                    title: '密接状态'
-                },
-                {
-                    field: 'isDead',
-                    title: '死亡状态'
-                },
-                {
-                    field: 'description',
-                    title: '备注'
-                },
-                {
-                    field: 'checkPostition',
-                    title: '最近接触地区'
-                },
-                {
-                    field: 'temperature',
-                    title: '体温'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkManageId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkManageId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/checkManage/edit.html b/ruoyi-admin/src/main/resources/templates/checkManage/edit.html
deleted file mode 100644
index d1b0a42..0000000
--- a/ruoyi-admin/src/main/resources/templates/checkManage/edit.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改打卡管理')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-checkManage-edit" th:object="${checkManage}">
-            <input name="checkManageId" th:field="*{checkManageId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人姓名：</label>
-                <div class="col-sm-8">
-                    <input name="checkName" th:field="*{checkName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">打卡人年龄：</label>
-                <div class="col-sm-8">
-                    <input name="checkAge" th:field="*{checkAge}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">联系电话：</label>
-                <div class="col-sm-8">
-                    <input name="patientPhone" th:field="*{patientPhone}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">确诊状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDiagnosed" th:field="*{isDiagnosed}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">治愈状态：</label>
-                <div class="col-sm-8">
-                    <input name="isCure" th:field="*{isCure}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">密接状态：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">死亡状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDead" th:field="*{isDead}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="description" th:field="*{description}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">最近接触地区：</label>
-                <div class="col-sm-8">
-                    <input name="checkPostition" th:field="*{checkPostition}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "check/checkManage";
-        $("#form-checkManage-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-checkManage-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/individual/check/add.html b/ruoyi-admin/src/main/resources/templates/individual/check/add.html
new file mode 100644
index 0000000..86f906c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/individual/check/add.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增个人打卡')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人姓名：</label>
+                <div class="col-sm-8">
+                    <input name="checkName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">健康状况：</label>
+                <div class="col-sm-8">
+                    <input name="state" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
+                <div class="col-sm-8">
+                    <input name="isHigh" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否接触过密接人员：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">个人状况描述：</label>
+                <div class="col-sm-8">
+                    <input name="description" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">当前时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkDatetime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡位置：</label>
+                <div class="col-sm-8">
+                    <input name="currentPosition" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check"
+        $("#form-check-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-check-add').serialize());
+            }
+        }
+
+        $("input[name='checkDatetime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/individual/check/check.html b/ruoyi-admin/src/main/resources/templates/individual/check/check.html
new file mode 100644
index 0000000..e46c173
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/individual/check/check.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('个人打卡列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>打卡人姓名：</label>
+                                <input type="text" name="checkName"/>
+                            </li>
+                            <li>
+                                <label>体温：</label>
+                                <input type="text" name="temperature"/>
+                            </li>
+                            <li>
+                                <label>健康状况：</label>
+                                <input type="text" name="state"/>
+                            </li>
+                            <li>
+                                <label>是否去过高风险地区：</label>
+                                <input type="text" name="isHigh"/>
+                            </li>
+                            <li>
+                                <label>是否接触过密接人员：</label>
+                                <input type="text" name="isTouch"/>
+                            </li>
+                            <li>
+                                <label>个人状况描述：</label>
+                                <input type="text" name="description"/>
+                            </li>
+                            <li>
+                                <label>当前时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择当前时间" name="checkDatetime"/>
+                            </li>
+                            <li>
+                                <label>打卡位置：</label>
+                                <input type="text" name="currentPosition"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:check:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:check:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:check:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:check:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:check:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:check:remove')}]];
+        var prefix = ctx + "system/check";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "个人打卡",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'checkId',
+                    title: '打卡id',
+                    visible: false
+                },
+                {
+                    field: 'checkName',
+                    title: '打卡人姓名'
+                },
+                {
+                    field: 'temperature',
+                    title: '体温'
+                },
+                {
+                    field: 'state',
+                    title: '健康状况'
+                },
+                {
+                    field: 'isHigh',
+                    title: '是否去过高风险地区'
+                },
+                {
+                    field: 'isTouch',
+                    title: '是否接触过密接人员'
+                },
+                {
+                    field: 'description',
+                    title: '个人状况描述'
+                },
+                {
+                    field: 'checkDatetime',
+                    title: '当前时间'
+                },
+                {
+                    field: 'currentPosition',
+                    title: '打卡位置'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/individual/check/edit.html b/ruoyi-admin/src/main/resources/templates/individual/check/edit.html
new file mode 100644
index 0000000..8fc86e0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/individual/check/edit.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改个人打卡')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-check-edit" th:object="${check}">
+            <input name="checkId" th:field="*{checkId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡人姓名：</label>
+                <div class="col-sm-8">
+                    <input name="checkName" th:field="*{checkName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">健康状况：</label>
+                <div class="col-sm-8">
+                    <input name="state" th:field="*{state}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
+                <div class="col-sm-8">
+                    <input name="isHigh" th:field="*{isHigh}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否接触过密接人员：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">个人状况描述：</label>
+                <div class="col-sm-8">
+                    <input name="description" th:field="*{description}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">当前时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="checkDatetime" th:value="${#dates.format(check.checkDatetime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">打卡位置：</label>
+                <div class="col-sm-8">
+                    <input name="currentPosition" th:field="*{currentPosition}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/check";
+        $("#form-check-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-check-edit').serialize());
+            }
+        }
+
+        $("input[name='checkDatetime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
new file mode 100644
index 0000000..da3548b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增患者管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-patientManage-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者姓名：</label>
+                <div class="col-sm-8">
+                    <input name="patientName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者年龄：</label>
+                <div class="col-sm-8">
+                    <input name="patientAge" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="patientPhone" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="description" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最近感染地区：</label>
+                <div class="col-sm-8">
+                    <input name="currentPosition" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">当天体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">感染时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="diagnosedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确诊状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDiagnosed" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">治愈状态：</label>
+                <div class="col-sm-8">
+                    <input name="isCure" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">密接状态：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">死亡状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDead" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "patient/patientManage"
+        $("#form-patientManage-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize());
+            }
+        }
+
+        $("input[name='diagnosedTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
new file mode 100644
index 0000000..afdc3bf
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改患者管理')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-patientManage-edit" th:object="${patientManage}">
+            <input name="patientId" th:field="*{patientId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者姓名：</label>
+                <div class="col-sm-8">
+                    <input name="patientName" th:field="*{patientName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者年龄：</label>
+                <div class="col-sm-8">
+                    <input name="patientAge" th:field="*{patientAge}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">患者联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="patientPhone" th:field="*{patientPhone}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="description" th:field="*{description}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最近感染地区：</label>
+                <div class="col-sm-8">
+                    <input name="currentPosition" th:field="*{currentPosition}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">当天体温：</label>
+                <div class="col-sm-8">
+                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">感染时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="diagnosedTime" th:value="${#dates.format(patientManage.diagnosedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确诊状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDiagnosed" th:field="*{isDiagnosed}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">治愈状态：</label>
+                <div class="col-sm-8">
+                    <input name="isCure" th:field="*{isCure}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">密接状态：</label>
+                <div class="col-sm-8">
+                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">死亡状态：</label>
+                <div class="col-sm-8">
+                    <input name="isDead" th:field="*{isDead}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "patient/patientManage";
+        $("#form-patientManage-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-patientManage-edit').serialize());
+            }
+        }
+
+        $("input[name='diagnosedTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
new file mode 100644
index 0000000..1a36516
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('患者管理列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>患者姓名：</label>
+                                <input type="text" name="patientName"/>
+                            </li>
+                            <li>
+                                <label>患者年龄：</label>
+                                <input type="text" name="patientAge"/>
+                            </li>
+                            <li>
+                                <label>患者联系电话：</label>
+                                <input type="text" name="patientPhone"/>
+                            </li>
+                            <li>
+                                <label>备注：</label>
+                                <input type="text" name="description"/>
+                            </li>
+                            <li>
+                                <label>最近感染地区：</label>
+                                <input type="text" name="currentPosition"/>
+                            </li>
+                            <li>
+                                <label>当天体温：</label>
+                                <input type="text" name="temperature"/>
+                            </li>
+                            <li>
+                                <label>感染时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择感染时间" name="diagnosedTime"/>
+                            </li>
+                            <li>
+                                <label>确诊状态：</label>
+                                <input type="text" name="isDiagnosed"/>
+                            </li>
+                            <li>
+                                <label>治愈状态：</label>
+                                <input type="text" name="isCure"/>
+                            </li>
+                            <li>
+                                <label>密接状态：</label>
+                                <input type="text" name="isTouch"/>
+                            </li>
+                            <li>
+                                <label>死亡状态：</label>
+                                <input type="text" name="isDead"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="patient:patientManage:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="patient:patientManage:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="patient:patientManage:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="patient:patientManage:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('patient:patientManage:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('patient:patientManage:remove')}]];
+        var prefix = ctx + "patient/patientManage";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "患者管理",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'patientId',
+                    title: '患者ID',
+                    visible: false
+                },
+                {
+                    field: 'patientName',
+                    title: '患者姓名'
+                },
+                {
+                    field: 'patientAge',
+                    title: '患者年龄'
+                },
+                {
+                    field: 'patientSex',
+                    title: '患者性别'
+                },
+                {
+                    field: 'patientPhone',
+                    title: '患者联系电话'
+                },
+                {
+                    field: 'description',
+                    title: '备注'
+                },
+                {
+                    field: 'currentPosition',
+                    title: '最近感染地区'
+                },
+                {
+                    field: 'temperature',
+                    title: '当天体温'
+                },
+                {
+                    field: 'diagnosedTime',
+                    title: '感染时间'
+                },
+                {
+                    field: 'isDiagnosed',
+                    title: '确诊状态'
+                },
+                {
+                    field: 'isCure',
+                    title: '治愈状态'
+                },
+                {
+                    field: 'isTouch',
+                    title: '密接状态'
+                },
+                {
+                    field: 'isDead',
+                    title: '死亡状态'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.patientId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.patientId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patientManage/add.html b/ruoyi-admin/src/main/resources/templates/patientManage/add.html
deleted file mode 100644
index cd598ba..0000000
--- a/ruoyi-admin/src/main/resources/templates/patientManage/add.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增患者管理')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-patientManage-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者姓名：</label>
-                <div class="col-sm-8">
-                    <input name="patientName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者年龄：</label>
-                <div class="col-sm-8">
-                    <input name="patientAge" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者联系电话：</label>
-                <div class="col-sm-8">
-                    <input name="patientPhone" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="description" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">最近感染地区：</label>
-                <div class="col-sm-8">
-                    <input name="currenPostition" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">当天体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">感染时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="diagonosedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">确诊状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDiagnosed" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">治愈状态：</label>
-                <div class="col-sm-8">
-                    <input name="isCure" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">密接状态：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">死亡状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDead" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "patient/patientManage"
-        $("#form-patientManage-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize());
-            }
-        }
-
-        $("input[name='diagonosedTime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patientManage/edit.html b/ruoyi-admin/src/main/resources/templates/patientManage/edit.html
deleted file mode 100644
index 4cedb58..0000000
--- a/ruoyi-admin/src/main/resources/templates/patientManage/edit.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改患者管理')" />
-    <th:block th:include="include :: datetimepicker-css" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-patientManage-edit" th:object="${patientManage}">
-            <input name="patientId" th:field="*{patientId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者姓名：</label>
-                <div class="col-sm-8">
-                    <input name="patientName" th:field="*{patientName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者年龄：</label>
-                <div class="col-sm-8">
-                    <input name="patientAge" th:field="*{patientAge}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">患者联系电话：</label>
-                <div class="col-sm-8">
-                    <input name="patientPhone" th:field="*{patientPhone}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="description" th:field="*{description}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">最近感染地区：</label>
-                <div class="col-sm-8">
-                    <input name="currenPostition" th:field="*{currenPostition}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">当天体温：</label>
-                <div class="col-sm-8">
-                    <input name="temperature" th:field="*{temperature}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">感染时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="diagonosedTime" th:value="${#dates.format(patientManage.diagonosedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">确诊状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDiagnosed" th:field="*{isDiagnosed}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">治愈状态：</label>
-                <div class="col-sm-8">
-                    <input name="isCure" th:field="*{isCure}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">密接状态：</label>
-                <div class="col-sm-8">
-                    <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">死亡状态：</label>
-                <div class="col-sm-8">
-                    <input name="isDead" th:field="*{isDead}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "patient/patientManage";
-        $("#form-patientManage-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-patientManage-edit').serialize());
-            }
-        }
-
-        $("input[name='diagonosedTime']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/patientManage/patientManage.html b/ruoyi-admin/src/main/resources/templates/patientManage/patientManage.html
deleted file mode 100644
index 2c313a2..0000000
--- a/ruoyi-admin/src/main/resources/templates/patientManage/patientManage.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('患者管理列表')" />
-</head>
-<body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>患者姓名：</label>
-                                <input type="text" name="patientName"/>
-                            </li>
-                            <li>
-                                <label>患者年龄：</label>
-                                <input type="text" name="patientAge"/>
-                            </li>
-                            <li>
-                                <label>患者联系电话：</label>
-                                <input type="text" name="patientPhone"/>
-                            </li>
-                            <li>
-                                <label>备注：</label>
-                                <input type="text" name="description"/>
-                            </li>
-                            <li>
-                                <label>最近感染地区：</label>
-                                <input type="text" name="currenPostition"/>
-                            </li>
-                            <li>
-                                <label>当天体温：</label>
-                                <input type="text" name="temperature"/>
-                            </li>
-                            <li>
-                                <label>感染时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择感染时间" name="diagonosedTime"/>
-                            </li>
-                            <li>
-                                <label>确诊状态：</label>
-                                <input type="text" name="isDiagnosed"/>
-                            </li>
-                            <li>
-                                <label>治愈状态：</label>
-                                <input type="text" name="isCure"/>
-                            </li>
-                            <li>
-                                <label>密接状态：</label>
-                                <input type="text" name="isTouch"/>
-                            </li>
-                            <li>
-                                <label>死亡状态：</label>
-                                <input type="text" name="isDead"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="patient:patientManage:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="patient:patientManage:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="patient:patientManage:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="patient:patientManage:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('patient:patientManage:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('patient:patientManage:remove')}]];
-        var prefix = ctx + "patient/patientManage";
-
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "患者管理",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'patientId',
-                    title: '患者ID',
-                    visible: false
-                },
-                {
-                    field: 'patientName',
-                    title: '患者姓名'
-                },
-                {
-                    field: 'patientAge',
-                    title: '患者年龄'
-                },
-                {
-                    field: 'patientSex',
-                    title: '患者性别'
-                },
-                {
-                    field: 'patientPhone',
-                    title: '患者联系电话'
-                },
-                {
-                    field: 'description',
-                    title: '备注'
-                },
-                {
-                    field: 'currenPostition',
-                    title: '最近感染地区'
-                },
-                {
-                    field: 'temperature',
-                    title: '当天体温'
-                },
-                {
-                    field: 'diagonosedTime',
-                    title: '感染时间'
-                },
-                {
-                    field: 'isDiagnosed',
-                    title: '确诊状态'
-                },
-                {
-                    field: 'isCure',
-                    title: '治愈状态'
-                },
-                {
-                    field: 'isTouch',
-                    title: '密接状态'
-                },
-                {
-                    field: 'isDead',
-                    title: '死亡状态'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.patientId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.patientId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html
index a1c3f94..847cd01 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html
@@ -9,26 +9,26 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸名字：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinName" class="form-control" type="text">
+                    <input name="nucleicName" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸数量：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinNumber" class="form-control" type="text">
+                    <input name="nucleicNumber" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸描述：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinDescription" class="form-control" type="text">
+                    <input name="nucleicDescription" class="form-control" type="text">
                 </div>
             </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/nucleic"
+        var prefix = ctx + "supplies/nucleic"
         $("#form-nucleic-add").validate({
             focusCleanup: true
         });
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html
index 932faec..0c8d0a1 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html
@@ -6,30 +6,30 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-nucleic-edit" th:object="${nucleic}">
-            <input name="nucleinId" th:field="*{nucleinId}" type="hidden">
+            <input name="nucleicId" th:field="*{nucleicId}" type="hidden">
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸名字：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinName" th:field="*{nucleinName}" class="form-control" type="text">
+                    <input name="nucleicName" th:field="*{nucleicName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸数量：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinNumber" th:field="*{nucleinNumber}" class="form-control" type="text">
+                    <input name="nucleicNumber" th:field="*{nucleicNumber}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">核酸描述：</label>
                 <div class="col-sm-8">
-                    <input name="nucleinDescription" th:field="*{nucleinDescription}" class="form-control" type="text">
+                    <input name="nucleicDescription" th:field="*{nucleicDescription}" class="form-control" type="text">
                 </div>
             </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/nucleic";
+        var prefix = ctx + "supplies/nucleic";
         $("#form-nucleic-edit").validate({
             focusCleanup: true
         });
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html
index 768869d..c8ff2f2 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic.html
@@ -12,15 +12,15 @@
                         <ul>
                             <li>
                                 <label>核酸名字：</label>
-                                <input type="text" name="nucleinName"/>
+                                <input type="text" name="nucleicName"/>
                             </li>
                             <li>
                                 <label>核酸数量：</label>
-                                <input type="text" name="nucleinNumber"/>
+                                <input type="text" name="nucleicNumber"/>
                             </li>
                             <li>
                                 <label>核酸描述：</label>
-                                <input type="text" name="nucleinDescription"/>
+                                <input type="text" name="nucleicDescription"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -32,16 +32,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:nucleic:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="supplies:nucleic:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:nucleic:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="supplies:nucleic:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:nucleic:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="supplies:nucleic:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:nucleic:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="supplies:nucleic:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -52,9 +52,9 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:nucleic:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:nucleic:remove')}]];
-        var prefix = ctx + "system/nucleic";
+        var editFlag = [[${@permission.hasPermi('supplies:nucleic:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('supplies:nucleic:remove')}]];
+        var prefix = ctx + "supplies/nucleic";
 
         $(function() {
             var options = {
@@ -68,20 +68,20 @@
                     checkbox: true
                 },
                 {
-                    field: 'nucleinId',
+                    field: 'nucleicId',
                     title: '核酸ID',
                     visible: false
                 },
                 {
-                    field: 'nucleinName',
+                    field: 'nucleicName',
                     title: '核酸名字'
                 },
                 {
-                    field: 'nucleinNumber',
+                    field: 'nucleicNumber',
                     title: '核酸数量'
                 },
                 {
-                    field: 'nucleinDescription',
+                    field: 'nucleicDescription',
                     title: '核酸描述'
                 },
                 {
@@ -89,8 +89,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.nucleinId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.nucleinId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.nucleicId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.nucleicId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html
index 2199dab..8155519 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html
@@ -28,7 +28,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/vaccine"
+        var prefix = ctx + "supplies/vaccine"
         $("#form-vaccine-add").validate({
             focusCleanup: true
         });
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html
index dcb53dd..64c245f 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html
@@ -29,7 +29,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var prefix = ctx + "system/vaccine";
+        var prefix = ctx + "supplies/vaccine";
         $("#form-vaccine-edit").validate({
             focusCleanup: true
         });
diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html
index cc75e44..d68555c 100644
--- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html
+++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine.html
@@ -32,16 +32,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:vaccine:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="supplies:vaccine:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:vaccine:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="supplies:vaccine:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:vaccine:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="supplies:vaccine:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:vaccine:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="supplies:vaccine:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -52,9 +52,9 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:vaccine:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:vaccine:remove')}]];
-        var prefix = ctx + "system/vaccine";
+        var editFlag = [[${@permission.hasPermi('supplies:vaccine:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('supplies:vaccine:remove')}]];
+        var prefix = ctx + "supplies/vaccine";
 
         $(function() {
             var options = {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java
index f850c15..5ff7cc9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Nucleic.java
@@ -16,64 +16,64 @@ public class Nucleic extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 核酸ID */
-    private Long nucleinId;
+    private Long nucleicId;
 
     /** 核酸名字 */
     @Excel(name = "核酸名字")
-    private String nucleinName;
+    private String nucleicName;
 
     /** 核酸数量 */
     @Excel(name = "核酸数量")
-    private String nucleinNumber;
+    private String nucleicNumber;
 
     /** 核酸描述 */
     @Excel(name = "核酸描述")
-    private String nucleinDescription;
+    private String nucleicDescription;
 
-    public void setNucleinId(Long nucleinId) 
+    public void setnucleicId(Long nucleicId)
     {
-        this.nucleinId = nucleinId;
+        this.nucleicId = nucleicId;
     }
 
-    public Long getNucleinId() 
+    public Long getnucleicId()
     {
-        return nucleinId;
+        return nucleicId;
     }
-    public void setNucleinName(String nucleinName) 
+    public void setnucleicName(String nucleicName)
     {
-        this.nucleinName = nucleinName;
+        this.nucleicName = nucleicName;
     }
 
-    public String getNucleinName() 
+    public String getnucleicName()
     {
-        return nucleinName;
+        return nucleicName;
     }
-    public void setNucleinNumber(String nucleinNumber) 
+    public void setnucleicNumber(String nucleicNumber)
     {
-        this.nucleinNumber = nucleinNumber;
+        this.nucleicNumber = nucleicNumber;
     }
 
-    public String getNucleinNumber() 
+    public String getnucleicNumber()
     {
-        return nucleinNumber;
+        return nucleicNumber;
     }
-    public void setNucleinDescription(String nucleinDescription) 
+    public void setnucleicDescription(String nucleicDescription)
     {
-        this.nucleinDescription = nucleinDescription;
+        this.nucleicDescription = nucleicDescription;
     }
 
-    public String getNucleinDescription() 
+    public String getnucleicDescription()
     {
-        return nucleinDescription;
+        return nucleicDescription;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("nucleinId", getNucleinId())
-            .append("nucleinName", getNucleinName())
-            .append("nucleinNumber", getNucleinNumber())
-            .append("nucleinDescription", getNucleinDescription())
+            .append("nucleicId", getnucleicId())
+            .append("nucleicName", getnucleicName())
+            .append("nucleicNumber", getnucleicNumber())
+            .append("nucleicDescription", getnucleicDescription())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java
index e7059a9..493dd9c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java
@@ -42,7 +42,7 @@ public class PatientManage extends BaseEntity
 
     /** 最近感染地区 */
     @Excel(name = "最近感染地区")
-    private String currenPostition;
+    private String currentPosition;
 
     /** 当天体温 */
     @Excel(name = "当天体温")
@@ -51,7 +51,7 @@ public class PatientManage extends BaseEntity
     /** 感染时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "感染时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date diagonosedTime;
+    private Date diagnosedTime;
 
     /** 确诊状态 */
     @Excel(name = "确诊状态")
@@ -123,14 +123,14 @@ public class PatientManage extends BaseEntity
     {
         return description;
     }
-    public void setCurrenPostition(String currenPostition) 
+    public void setCurrentPostition(String currentPosition)
     {
-        this.currenPostition = currenPostition;
+        this.currentPosition = currentPosition;
     }
 
-    public String getCurrenPostition() 
+    public String getCurrentPostition()
     {
-        return currenPostition;
+        return currentPosition;
     }
     public void setTemperature(String temperature) 
     {
@@ -141,14 +141,14 @@ public class PatientManage extends BaseEntity
     {
         return temperature;
     }
-    public void setDiagonosedTime(Date diagonosedTime) 
+    public void setDiagnosedTime(Date diagnosedTime)
     {
-        this.diagonosedTime = diagonosedTime;
+        this.diagnosedTime = diagnosedTime;
     }
 
-    public Date getDiagonosedTime() 
+    public Date getDiagnosedTime()
     {
-        return diagonosedTime;
+        return diagnosedTime;
     }
     public void setIsDiagnosed(Integer isDiagnosed) 
     {
@@ -196,9 +196,9 @@ public class PatientManage extends BaseEntity
             .append("patientSex", getPatientSex())
             .append("patientPhone", getPatientPhone())
             .append("description", getDescription())
-            .append("currenPostition", getCurrenPostition())
+            .append("currentPosition", getCurrentPostition())
             .append("temperature", getTemperature())
-            .append("diagonosedTime", getDiagonosedTime())
+            .append("diagnosedTime", getDiagnosedTime())
             .append("isDiagnosed", getIsDiagnosed())
             .append("isCure", getIsCure())
             .append("isTouch", getIsTouch())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java
index c140895..928580e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java
@@ -14,10 +14,10 @@ public interface NucleicMapper
     /**
      * 查询核酸管理
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 核酸管理
      */
-    public Nucleic selectNucleicByNucleinId(Long nucleinId);
+    public Nucleic selectNucleicByNucleicId(Long nucleicId);
 
     /**
      * 查询核酸管理列表
@@ -46,16 +46,16 @@ public interface NucleicMapper
     /**
      * 删除核酸管理
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 结果
      */
-    public int deleteNucleicByNucleinId(Long nucleinId);
+    public int deleteNucleicByNucleicId(Long nucleicId);
 
     /**
      * 批量删除核酸管理
      * 
-     * @param nucleinIds 需要删除的数据主键集合
+     * @param nucleicIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteNucleicByNucleinIds(String[] nucleinIds);
+    public int deleteNucleicByNucleicIds(String[] nucleicIds);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java
index 45412c5..81bf47f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/INucleicService.java
@@ -14,10 +14,10 @@ public interface INucleicService
     /**
      * 查询核酸管理
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 核酸管理
      */
-    public Nucleic selectNucleicByNucleinId(Long nucleinId);
+    public Nucleic selectNucleicByNucleicId(Long nucleicId);
 
     /**
      * 查询核酸管理列表
@@ -46,16 +46,16 @@ public interface INucleicService
     /**
      * 批量删除核酸管理
      * 
-     * @param nucleinIds 需要删除的核酸管理主键集合
+     * @param nucleicIds 需要删除的核酸管理主键集合
      * @return 结果
      */
-    public int deleteNucleicByNucleinIds(String nucleinIds);
+    public int deleteNucleicByNucleicIds(String nucleicIds);
 
     /**
      * 删除核酸管理信息
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 结果
      */
-    public int deleteNucleicByNucleinId(Long nucleinId);
+    public int deleteNucleicByNucleicId(Long nucleicId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java
index b287681..b7336a3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java
@@ -23,13 +23,13 @@ public class NucleicServiceImpl implements INucleicService
     /**
      * 查询核酸管理
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 核酸管理
      */
     @Override
-    public Nucleic selectNucleicByNucleinId(Long nucleinId)
+    public Nucleic selectNucleicByNucleicId(Long nucleicId)
     {
-        return nucleicMapper.selectNucleicByNucleinId(nucleinId);
+        return nucleicMapper.selectNucleicByNucleicId(nucleicId);
     }
 
     /**
@@ -71,24 +71,24 @@ public class NucleicServiceImpl implements INucleicService
     /**
      * 批量删除核酸管理
      * 
-     * @param nucleinIds 需要删除的核酸管理主键
+     * @param nucleicIds 需要删除的核酸管理主键
      * @return 结果
      */
     @Override
-    public int deleteNucleicByNucleinIds(String nucleinIds)
+    public int deleteNucleicByNucleicIds(String nucleicIds)
     {
-        return nucleicMapper.deleteNucleicByNucleinIds(Convert.toStrArray(nucleinIds));
+        return nucleicMapper.deleteNucleicByNucleicIds(Convert.toStrArray(nucleicIds));
     }
 
     /**
      * 删除核酸管理信息
      * 
-     * @param nucleinId 核酸管理主键
+     * @param nucleicId 核酸管理主键
      * @return 结果
      */
     @Override
-    public int deleteNucleicByNucleinId(Long nucleinId)
+    public int deleteNucleicByNucleicId(Long nucleicId)
     {
-        return nucleicMapper.deleteNucleicByNucleinId(nucleinId);
+        return nucleicMapper.deleteNucleicByNucleicId(nucleicId);
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
index 5f18451..dca88a1 100644
--- a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
@@ -11,9 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="patientSex"    column="patient_sex"    />
         <result property="patientPhone"    column="patient_phone"    />
         <result property="description"    column="description"    />
-        <result property="currenPostition"    column="curren_postition"    />
+        <result property="currentPosition"    column="current_position"    />
         <result property="temperature"    column="temperature"    />
-        <result property="diagonosedTime"    column="diagonosed_time"    />
+        <result property="diagnosedTime"    column="diagnosed_time"    />
         <result property="isDiagnosed"    column="is_diagnosed"    />
         <result property="isCure"    column="is_cure"    />
         <result property="isTouch"    column="is_touch"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPatientManageVo">
-        select patient_id, patient_name, patient_age, patient_sex, patient_phone, description, curren_postition, temperature, diagonosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage
+        select patient_id, patient_name, patient_age, patient_sex, patient_phone, description, curren_postition, temperature, diagnosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage
     </sql>
 
     <select id="selectPatientManageList" parameterType="PatientManage" resultMap="PatientManageResult">
@@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null  and patientSex != ''"> and patient_sex = #{patientSex}</if>
             <if test="patientPhone != null  and patientPhone != ''"> and patient_phone = #{patientPhone}</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="currenPostition != null  and currenPostition != ''"> and curren_postition = #{currenPostition}</if>
+            <if test="currentPosition != null  and currentPosition != ''"> and curren_postition = #{currentPosition}</if>
             <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
-            <if test="diagonosedTime != null "> and diagonosed_time = #{diagonosedTime}</if>
+            <if test="diagnosedTime != null "> and diagnosed_time = #{diagnosedTime}</if>
             <if test="isDiagnosed != null "> and is_diagnosed = #{isDiagnosed}</if>
             <if test="isCure != null "> and is_cure = #{isCure}</if>
             <if test="isTouch != null "> and is_touch = #{isTouch}</if>
@@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">patient_sex,</if>
             <if test="patientPhone != null">patient_phone,</if>
             <if test="description != null">description,</if>
-            <if test="currenPostition != null">curren_postition,</if>
+            <if test="currentPosition != null">curren_postition,</if>
             <if test="temperature != null">temperature,</if>
-            <if test="diagonosedTime != null">diagonosed_time,</if>
+            <if test="diagnosedTime != null">diagnosed_time,</if>
             <if test="isDiagnosed != null">is_diagnosed,</if>
             <if test="isCure != null">is_cure,</if>
             <if test="isTouch != null">is_touch,</if>
@@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">#{patientSex},</if>
             <if test="patientPhone != null">#{patientPhone},</if>
             <if test="description != null">#{description},</if>
-            <if test="currenPostition != null">#{currenPostition},</if>
+            <if test="currentPosition != null">#{currentPosition},</if>
             <if test="temperature != null">#{temperature},</if>
-            <if test="diagonosedTime != null">#{diagonosedTime},</if>
+            <if test="diagnosedTime != null">#{diagnosedTime},</if>
             <if test="isDiagnosed != null">#{isDiagnosed},</if>
             <if test="isCure != null">#{isCure},</if>
             <if test="isTouch != null">#{isTouch},</if>
@@ -87,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">patient_sex = #{patientSex},</if>
             <if test="patientPhone != null">patient_phone = #{patientPhone},</if>
             <if test="description != null">description = #{description},</if>
-            <if test="currenPostition != null">curren_postition = #{currenPostition},</if>
+            <if test="currentPosition != null">curren_postition = #{currentPosition},</if>
             <if test="temperature != null">temperature = #{temperature},</if>
-            <if test="diagonosedTime != null">diagonosed_time = #{diagonosedTime},</if>
+            <if test="diagnosedTime != null">diagnosed_time = #{diagnosedTime},</if>
             <if test="isDiagnosed != null">is_diagnosed = #{isDiagnosed},</if>
             <if test="isCure != null">is_cure = #{isCure},</if>
             <if test="isTouch != null">is_touch = #{isTouch},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
new file mode 100644
index 0000000..6d33464
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml
@@ -0,0 +1,67 @@
+<?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.ruoyi.system.mapper.NucleicMapper">
+    
+    <resultMap type="Nucleic" id="NucleicResult">
+        <result property="nucleicId"    column="nucleic_id"    />
+        <result property="nucleicName"    column="nucleic_name"    />
+        <result property="nucleicNumber"    column="nucleic_number"    />
+        <result property="nucleicDescription"    column="nucleic_description"    />
+    </resultMap>
+
+    <sql id="selectNucleicVo">
+        select nucleic_id, nucleic_name, nucleic_number, nucleic_description from nucleic
+    </sql>
+
+    <select id="selectNucleicList" parameterType="Nucleic" resultMap="NucleicResult">
+        <include refid="selectNucleicVo"/>
+        <where>  
+            <if test="nucleicName != null  and nucleicName != ''"> and nucleic_name like concat('%', #{nucleicName}, '%')</if>
+            <if test="nucleicNumber != null  and nucleicNumber != ''"> and nucleic_number = #{nucleicNumber}</if>
+            <if test="nucleicDescription != null  and nucleicDescription != ''"> and nucleic_description = #{nucleicDescription}</if>
+        </where>
+    </select>
+    
+    <select id="selectNucleicBynucleicId" parameterType="Long" resultMap="NucleicResult">
+        <include refid="selectNucleicVo"/>
+        where nucleic_id = #{nucleicId}
+    </select>
+        
+    <insert id="insertNucleic" parameterType="Nucleic" useGeneratedKeys="true" keyProperty="nucleicId">
+        insert into nucleic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="nucleicName != null">nucleic_name,</if>
+            <if test="nucleicNumber != null">nucleic_number,</if>
+            <if test="nucleicDescription != null">nucleic_description,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="nucleicName != null">#{nucleicName},</if>
+            <if test="nucleicNumber != null">#{nucleicNumber},</if>
+            <if test="nucleicDescription != null">#{nucleicDescription},</if>
+         </trim>
+    </insert>
+
+    <update id="updateNucleic" parameterType="Nucleic">
+        update nucleic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nucleicName != null">nucleic_name = #{nucleicName},</if>
+            <if test="nucleicNumber != null">nucleic_number = #{nucleicNumber},</if>
+            <if test="nucleicDescription != null">nucleic_description = #{nucleicDescription},</if>
+        </trim>
+        where nucleic_id = #{nucleicId}
+    </update>
+
+    <delete id="deleteNucleicByNucleicId" parameterType="Long">
+        delete from nucleic where nucleic_id = #{nucleicId}
+    </delete>
+
+    <delete id="deleteNucleicByNucleicIds" parameterType="String">
+        delete from nucleic where nucleic_id in
+        <foreach item="nucleicId" collection="array" open="(" separator="," close=")">
+            #{nucleicId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
new file mode 100644
index 0000000..d9319d0
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml
@@ -0,0 +1,67 @@
+<?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.ruoyi.system.mapper.VaccineMapper">
+    
+    <resultMap type="Vaccine" id="VaccineResult">
+        <result property="vaccineId"    column="vaccine_id"    />
+        <result property="vaccineNumber"    column="vaccine_number"    />
+        <result property="vaccineDescription"    column="vaccine_description"    />
+        <result property="vaccineName"    column="vaccine_name"    />
+    </resultMap>
+
+    <sql id="selectVaccineVo">
+        select vaccine_id, vaccine_number, vaccine_description, vaccine_name from vaccine
+    </sql>
+
+    <select id="selectVaccineList" parameterType="Vaccine" resultMap="VaccineResult">
+        <include refid="selectVaccineVo"/>
+        <where>  
+            <if test="vaccineNumber != null  and vaccineNumber != ''"> and vaccine_number = #{vaccineNumber}</if>
+            <if test="vaccineDescription != null  and vaccineDescription != ''"> and vaccine_description = #{vaccineDescription}</if>
+            <if test="vaccineName != null  and vaccineName != ''"> and vaccine_name like concat('%', #{vaccineName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectVaccineByVaccineId" parameterType="Long" resultMap="VaccineResult">
+        <include refid="selectVaccineVo"/>
+        where vaccine_id = #{vaccineId}
+    </select>
+        
+    <insert id="insertVaccine" parameterType="Vaccine" useGeneratedKeys="true" keyProperty="vaccineId">
+        insert into vaccine
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="vaccineNumber != null">vaccine_number,</if>
+            <if test="vaccineDescription != null">vaccine_description,</if>
+            <if test="vaccineName != null">vaccine_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="vaccineNumber != null">#{vaccineNumber},</if>
+            <if test="vaccineDescription != null">#{vaccineDescription},</if>
+            <if test="vaccineName != null">#{vaccineName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateVaccine" parameterType="Vaccine">
+        update vaccine
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="vaccineNumber != null">vaccine_number = #{vaccineNumber},</if>
+            <if test="vaccineDescription != null">vaccine_description = #{vaccineDescription},</if>
+            <if test="vaccineName != null">vaccine_name = #{vaccineName},</if>
+        </trim>
+        where vaccine_id = #{vaccineId}
+    </update>
+
+    <delete id="deleteVaccineByVaccineId" parameterType="Long">
+        delete from vaccine where vaccine_id = #{vaccineId}
+    </delete>
+
+    <delete id="deleteVaccineByVaccineIds" parameterType="String">
+        delete from vaccine where vaccine_id in 
+        <foreach item="vaccineId" collection="array" open="(" separator="," close=")">
+            #{vaccineId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml b/ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml
deleted file mode 100644
index 0183291..0000000
--- a/ruoyi-system/src/main/resources/mapper/suppliesManage/NucleicMapper.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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.ruoyi.system.mapper.NucleicMapper">
-    
-    <resultMap type="Nucleic" id="NucleicResult">
-        <result property="nucleinId"    column="nuclein_id"    />
-        <result property="nucleinName"    column="nuclein_name"    />
-        <result property="nucleinNumber"    column="nuclein_number"    />
-        <result property="nucleinDescription"    column="nuclein_description"    />
-    </resultMap>
-
-    <sql id="selectNucleicVo">
-        select nuclein_id, nuclein_name, nuclein_number, nuclein_description from nucleic
-    </sql>
-
-    <select id="selectNucleicList" parameterType="Nucleic" resultMap="NucleicResult">
-        <include refid="selectNucleicVo"/>
-        <where>  
-            <if test="nucleinName != null  and nucleinName != ''"> and nuclein_name like concat('%', #{nucleinName}, '%')</if>
-            <if test="nucleinNumber != null  and nucleinNumber != ''"> and nuclein_number = #{nucleinNumber}</if>
-            <if test="nucleinDescription != null  and nucleinDescription != ''"> and nuclein_description = #{nucleinDescription}</if>
-        </where>
-    </select>
-    
-    <select id="selectNucleicByNucleinId" parameterType="Long" resultMap="NucleicResult">
-        <include refid="selectNucleicVo"/>
-        where nuclein_id = #{nucleinId}
-    </select>
-        
-    <insert id="insertNucleic" parameterType="Nucleic" useGeneratedKeys="true" keyProperty="nucleinId">
-        insert into nucleic
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="nucleinName != null">nuclein_name,</if>
-            <if test="nucleinNumber != null">nuclein_number,</if>
-            <if test="nucleinDescription != null">nuclein_description,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="nucleinName != null">#{nucleinName},</if>
-            <if test="nucleinNumber != null">#{nucleinNumber},</if>
-            <if test="nucleinDescription != null">#{nucleinDescription},</if>
-         </trim>
-    </insert>
-
-    <update id="updateNucleic" parameterType="Nucleic">
-        update nucleic
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="nucleinName != null">nuclein_name = #{nucleinName},</if>
-            <if test="nucleinNumber != null">nuclein_number = #{nucleinNumber},</if>
-            <if test="nucleinDescription != null">nuclein_description = #{nucleinDescription},</if>
-        </trim>
-        where nuclein_id = #{nucleinId}
-    </update>
-
-    <delete id="deleteNucleicByNucleinId" parameterType="Long">
-        delete from nucleic where nuclein_id = #{nucleinId}
-    </delete>
-
-    <delete id="deleteNucleicByNucleinIds" parameterType="String">
-        delete from nucleic where nuclein_id in 
-        <foreach item="nucleinId" collection="array" open="(" separator="," close=")">
-            #{nucleinId}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/suppliesManage/VaccineMapper.xml b/ruoyi-system/src/main/resources/mapper/suppliesManage/VaccineMapper.xml
deleted file mode 100644
index d9319d0..0000000
--- a/ruoyi-system/src/main/resources/mapper/suppliesManage/VaccineMapper.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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.ruoyi.system.mapper.VaccineMapper">
-    
-    <resultMap type="Vaccine" id="VaccineResult">
-        <result property="vaccineId"    column="vaccine_id"    />
-        <result property="vaccineNumber"    column="vaccine_number"    />
-        <result property="vaccineDescription"    column="vaccine_description"    />
-        <result property="vaccineName"    column="vaccine_name"    />
-    </resultMap>
-
-    <sql id="selectVaccineVo">
-        select vaccine_id, vaccine_number, vaccine_description, vaccine_name from vaccine
-    </sql>
-
-    <select id="selectVaccineList" parameterType="Vaccine" resultMap="VaccineResult">
-        <include refid="selectVaccineVo"/>
-        <where>  
-            <if test="vaccineNumber != null  and vaccineNumber != ''"> and vaccine_number = #{vaccineNumber}</if>
-            <if test="vaccineDescription != null  and vaccineDescription != ''"> and vaccine_description = #{vaccineDescription}</if>
-            <if test="vaccineName != null  and vaccineName != ''"> and vaccine_name like concat('%', #{vaccineName}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectVaccineByVaccineId" parameterType="Long" resultMap="VaccineResult">
-        <include refid="selectVaccineVo"/>
-        where vaccine_id = #{vaccineId}
-    </select>
-        
-    <insert id="insertVaccine" parameterType="Vaccine" useGeneratedKeys="true" keyProperty="vaccineId">
-        insert into vaccine
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="vaccineNumber != null">vaccine_number,</if>
-            <if test="vaccineDescription != null">vaccine_description,</if>
-            <if test="vaccineName != null">vaccine_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="vaccineNumber != null">#{vaccineNumber},</if>
-            <if test="vaccineDescription != null">#{vaccineDescription},</if>
-            <if test="vaccineName != null">#{vaccineName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateVaccine" parameterType="Vaccine">
-        update vaccine
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="vaccineNumber != null">vaccine_number = #{vaccineNumber},</if>
-            <if test="vaccineDescription != null">vaccine_description = #{vaccineDescription},</if>
-            <if test="vaccineName != null">vaccine_name = #{vaccineName},</if>
-        </trim>
-        where vaccine_id = #{vaccineId}
-    </update>
-
-    <delete id="deleteVaccineByVaccineId" parameterType="Long">
-        delete from vaccine where vaccine_id = #{vaccineId}
-    </delete>
-
-    <delete id="deleteVaccineByVaccineIds" parameterType="String">
-        delete from vaccine where vaccine_id in 
-        <foreach item="vaccineId" collection="array" open="(" separator="," close=")">
-            #{vaccineId}
-        </foreach>
-    </delete>
-
-</mapper>
\ No newline at end of file