diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientManageController.java
index b892659..178d72a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientManageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientManageController.java
@@ -249,7 +249,7 @@ public class PatientManageController extends BaseController
     /**
      *
      */
-    @RequiresPermissions("patient:patientManage:addCure")
+    @RequiresPermissions("patient:patientManage:isDead")
     @GetMapping("/isDead/{patientId}")
     public String isDead(@PathVariable("patientId") Long patientId, ModelMap mmap)
     {
@@ -268,4 +268,28 @@ public class PatientManageController extends BaseController
     {
         return toAjax(patientManageService.updateIsDead(patientManage));
     }
+
+
+    /**
+     *
+     */
+    @RequiresPermissions("patient:patientManage:isCure")
+    @GetMapping("/isCure/{patientId}")
+    public String isCure(@PathVariable("patientId") Long patientId, ModelMap mmap)
+    {
+        PatientManage patientManage = patientManageService.selectPatientManageByPatientId(patientId);
+        mmap.put("patientManage", patientManage);
+        return prefix + "/isCure";
+    }
+
+    /**
+     *
+     */
+    @RequiresPermissions("patient:patientManage:isCure")
+    @PostMapping("/isCure")
+    @ResponseBody
+    public AjaxResult isCureSave( PatientManage patientManage)
+    {
+        return toAjax(patientManageService.updateIsCure(patientManage));
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index ac0b461..51b79df 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -103,7 +103,7 @@
                 {
                     name:'死亡',
                     type:'line',
-                    data:[5, 3, 1, 6, 8, 4, 2],
+                    data:[5, 3, 5, 6, 8, 4, 7],
                     markPoint : {
                         data : [
                             {type : 'max', name: '最大值'},
@@ -159,13 +159,13 @@
                     radius :  ['30%', '70%'],
                     center: ['50%', '60%'],
                     data:[
-                        {value:335, name:'0-10'},
-                        {value:310, name:'10-20'},
-                        {value:234, name:'20-30'},
-                        {value:135, name:'30-40'},
-                        {value:1548, name:'40-50'},
-                        {value:548, name:'50-60'},
-                        {value:548, name:'70以上'}
+                        {value:12, name:'0-10'},
+                        {value:36, name:'10-20'},
+                        {value:26, name:'20-30'},
+                        {value:31, name:'30-40'},
+                        {value:40, name:'40-50'},
+                        {value:12, name:'50-60'},
+                        {value:23, name:'70以上'}
                     ]
                 }
             ]
@@ -304,9 +304,9 @@
                         borderRadius: 5
                     },
                     data: [
-                        { value: 26, name: "分宜县" },
-                        { value: 20, name: "渝水区" },
-                        { value: 18, name: "仙女湖风景名胜区" },
+                        { value: 67, name: "分宜县" },
+                        { value: 89, name: "渝水区" },
+                        { value: 24, name: "仙女湖风景名胜区" },
                         { value: 22, name: "新余高新技术产业开发区" }
                     ],
                     label: {
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
index 2379502..18fa730 100644
--- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html
@@ -24,9 +24,9 @@
                     <label class="col-sm-3 control-label">性别：</label>
                     <div class="col-sm-9">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="male" name="patientSex">男</label>
+                            <input type="radio" checked="" value="男" id="male" name="patientSex">男</label>
                         <label class="radio-box">
-                            <input type="radio" value="0" id="female" name="patientSex">女</label>
+                            <input type="radio" value="女" id="female" name="patientSex">女</label>
                     </div>
                 </div>
             </div>
@@ -73,32 +73,32 @@
                 <label class="col-sm-3 control-label">是否为密接人员：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio"  value="1" id="touched" name="isTouch">是密接人员</label>
+                        <input type="radio"  value="密接人员" id="touched" name="isTouch">密接人员</label>
                     <label class="radio-box">
-                        <input type="radio" checked="" value="0" id="untouched" name="isTouch">非密接人员</label>
+                        <input type="radio" checked="" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
                 </div>
                 <label class="col-sm-3 control-label">是否去过高风险地区：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="high" name="isHigh">去过高风险地区</label>
+                            <input type="radio"  value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="low" name="isHigh">未去过高风险地区</label>
+                            <input type="radio" checked="" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区</label>
                     </div>
             </div>
             <div class="form-group" >
                 <label class="col-sm-3 control-label">是否为重症：</label>
                     <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="emergency" name="isEmergency">重症患者</label>
+                            <input type="radio"  value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="unemergency" name="isEmergency">非重症患者</label>
+                            <input type="radio" checked="" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
                     </div>
                 <label class="col-sm-3 control-label">目前状况：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="alive" name="isDead">健在</label>
+                            <input type="radio" checked="" value="健在" id="alive" name="isDead">健在</label>
                         <label class="radio-box">
-                            <input type="radio"  value="0" id="dead" name="isDead">已死亡</label>
+                            <input type="radio"  value="已死亡" id="dead" name="isDead">已死亡</label>
                     </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html
index 36db012..25bab84 100644
--- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html
@@ -68,9 +68,9 @@
 			<label class="col-sm-3 control-label">目前状况：</label>
 			<div class="col-sm-3">
 				<label class="radio-box">
-					<input type="radio"  readonly="true" th:field="*{isDead}"  value="1" id="alive" name="isDead" checked>健在</label>
+					<input type="radio"  readonly="true" th:field="*{isDead}"  value="健在" id="alive" name="isDead" checked>健在</label>
 				<label class="radio-box">
-					<input type="radio" readonly="true" th:field="*{isDead}" value="0" id="dead" name="isDead" >已死亡</label>
+					<input type="radio" readonly="true" th:field="*{isDead}" value="已死亡" id="dead" name="isDead" >已死亡</label>
 			</div>
 		</div>
 		<div class="row">
@@ -87,12 +87,13 @@
 	var prefix = ctx + "patientCure/cure";
 
 	function submitHandler() {
-		if ($.validate.form()) {
-		  	if(){
-			$.operate.save(prefix + "/add", $('#form-patientCure-add').serialize());
-			}
-			else alert("患者已存在")
-		}
+		// for (var i = 0; i < dataList.length; i++) {
+		// 	var data = dataList[i];
+		// 	if ($("#" + data.id).length === 0) {
+		// 		// ID在A页面不存在，调用$operate.save添加数据
+		// 	}
+		// }
+		$.operate.save(prefix + "/add", $('#form-patientCure-add').serialize());
 		location.href=ctx+"patient/patientManage";
 		alert("已添加");
 	}
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html
index cb30e43..94fff39 100644
--- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html
@@ -69,9 +69,9 @@
 			<label class="col-sm-3 control-label">目前状况：</label>
 			<div class="col-sm-3">
 				<label class="radio-box">
-					<input type="radio"  readonly="true" th:field="*{isDead}"  value="1" id="alive" name="isDead">健在</label>
+					<input type="radio"  readonly="true" th:field="*{isDead}"  value="健在" id="alive" name="isDead">健在</label>
 				<label class="radio-box">
-					<input type="radio" readonly="true" th:field="*{isDead}" value="0" id="dead" name="isDead" checked>已死亡</label>
+					<input type="radio" readonly="true" th:field="*{isDead}" value="已死亡" id="dead" name="isDead" checked>已死亡</label>
 			</div>
 		</div>
 		<div class="row">
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
index 097d344..af5fbe1 100644
--- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html
@@ -19,9 +19,9 @@
                     <label class="col-sm-3 control-label">性别：</label>
                     <div class="col-sm-9">
                         <label class="radio-box">
-                            <input type="radio" th:field="*{patientSex}" value="1" id="male" name="patientSex">男</label>
+                            <input type="radio" th:field="*{patientSex}" value="男" id="male" name="patientSex">男</label>
                         <label class="radio-box">
-                            <input type="radio" th:field="*{patientSex}" value="0" id="female" name="patientSex">女</label>
+                            <input type="radio" th:field="*{patientSex}" value="女" id="female" name="patientSex">女</label>
                     </div>
                 </div>
             </div>
@@ -68,32 +68,32 @@
                 <label class="col-sm-3 control-label">是否为密接人员：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isTouch}" value="1" id="touched" name="isTouch">是</label>
+                        <input type="radio" th:field="*{isTouch}" value="密接人员" id="touched" name="isTouch">密接人员</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isTouch}" value="0" id="untouched" name="isTouch">否</label>
+                        <input type="radio" th:field="*{isTouch}" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
                 </div>
                 <label class="col-sm-3 control-label">是否去过高风险地区：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isHigh}" value="1" id="high" name="isHigh">是</label>
+                        <input type="radio" th:field="*{isHigh}" value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isHigh}" value="0" id="low" name="isHigh">否</label>
+                        <input type="radio" th:field="*{isHigh}" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区label>
                 </div>
             </div>
             <div class="form-group" >
                 <label class="col-sm-3 control-label">是否为重症：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio"  th:field="*{isEmergency}" value="1" id="emergency" name="isEmergency">是</label>
+                        <input type="radio"  th:field="*{isEmergency}" value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isEmergency}" value="0" id="unemergency" name="isEmergency">否</label>
+                        <input type="radio" th:field="*{isEmergency}" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
                 </div>
                 <label class="col-sm-3 control-label">目前状况：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio"  th:field="*{isDead}" value="1" id="alive" name="isDead">健在</label>
+                        <input type="radio"  th:field="*{isDead}" value="健在" id="alive" name="isDead">健在</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{isDead}" value="0" id="dead" name="isDead">已死亡</label>
+                        <input type="radio" th:field="*{isDead}" value="已死亡" id="dead" name="isDead">已死亡</label>
                 </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
index cc8a0f3..b5d7ad1 100644
--- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
+++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html
@@ -135,10 +135,10 @@
                         field: 'isEmergency',
                         title: '是否重症'
                     },
-                    {
-                        field: 'isDead',
-                        title: '目前状况'
-                    },
+                    // {
+                    //     field: 'isDead',
+                    //     title: '目前状况'
+                    // },
                     {
                         field: 'description',
                         title: '备注'
@@ -167,9 +167,7 @@
 
         /* 移交治愈 */
         function cure(patientId) {
-
             var url = prefix+'/addCure/'+patientId;
-
             $.modal.openTab("移交治愈患者", url);
         }
 
diff --git a/ruoyi-admin/src/main/resources/templates/patientCure/cure/add.html b/ruoyi-admin/src/main/resources/templates/patientCure/cure/add.html
index e33413e..96ecf19 100644
--- a/ruoyi-admin/src/main/resources/templates/patientCure/cure/add.html
+++ b/ruoyi-admin/src/main/resources/templates/patientCure/cure/add.html
@@ -18,9 +18,9 @@
                     <label class="col-sm-3 control-label">性别：</label>
                     <div class="col-sm-9">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="male" name="patientSex">男</label>
+                            <input type="radio" checked="" value="男" id="male" name="patientSex">男</label>
                         <label class="radio-box">
-                            <input type="radio" value="0" id="female" name="patientSex">女</label>
+                            <input type="radio" value="女" id="female" name="patientSex">女</label>
                     </div>
                 </div>
             </div>
@@ -67,32 +67,32 @@
                 <label class="col-sm-3 control-label">是否为密接人员：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio"  value="1" id="touched" name="isTouch">是密接人员</label>
+                        <input type="radio"  value="密接人员" id="touched" name="isTouch">密接人员</label>
                     <label class="radio-box">
-                        <input type="radio" checked="" value="0" id="untouched" name="isTouch">非密接人员</label>
+                        <input type="radio" checked="" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
                 </div>
                 <label class="col-sm-3 control-label">是否去过高风险地区：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="high" name="isHigh">去过高风险地区</label>
+                            <input type="radio"  value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="low" name="isHigh">未去过高风险地区</label>
+                            <input type="radio" checked="" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区</label>
                     </div>
             </div>
             <div class="form-group" >
                 <label class="col-sm-3 control-label">是否为重症：</label>
                     <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="emergency" name="isEmergency">重症患者</label>
+                            <input type="radio"  value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="unemergency" name="isEmergency">非重症患者</label>
+                            <input type="radio" checked="" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
                     </div>
                 <label class="col-sm-3 control-label">目前状况：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="alive" name="isDead">健在</label>
+                            <input type="radio" checked="" value="健在" id="alive" name="isDead">健在</label>
                         <label class="radio-box">
-                            <input type="radio"  value="0" id="dead" name="isDead">已死亡</label>
+                            <input type="radio"  value="已死亡" id="dead" name="isDead">已死亡</label>
                     </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/patientCure/cure/cure.html b/ruoyi-admin/src/main/resources/templates/patientCure/cure/cure.html
index 34d84b6..d8117d5 100644
--- a/ruoyi-admin/src/main/resources/templates/patientCure/cure/cure.html
+++ b/ruoyi-admin/src/main/resources/templates/patientCure/cure/cure.html
@@ -1,7 +1,7 @@
 <!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('死亡列表')" />
+    <th:block th:include="include :: header('治愈列表')" />
 </head>
 <body class="gray-bg">
 <div class="container-div">
@@ -66,6 +66,7 @@
     var removeFlag = [[${@permission.hasPermi('patientCure:cure:remove')}]];
     var prefix = ctx + "patientCure/cure";
 
+
     $(function() {
         var options = {
             url: prefix + "/list",
@@ -76,13 +77,13 @@
             exportUrl: prefix + "/export",
             importUrl: prefix + "/importData",
             importTemplateUrl: prefix + "/importTemplate",
-            modalName: "死亡信息",
+            modalName: "治愈信息",
             columns: [{
                 checkbox: true
             },
                 {
                     field: 'patientId',
-                    title: '死亡患者ID',
+                    title: '治愈患者ID',
                     visible: false
                 },
                 {
@@ -90,20 +91,20 @@
                     field: 'patientName',
                     title: '患者姓名'
                 },
-                {
-                    field: 'patientAge',
-                    title: '患者年龄'
-                },
+                // {
+                //     field: 'patientAge',
+                //     title: '患者年龄',
+                // },
                 {
                     field: 'patientSex',
                     title: '患者性别',
 
                 },
-                // {
-                //     isIdentity:true,
-                //     field: 'patientIdCard',
-                //     title: '患者身份证'
-                // },
+                {
+                    isIdentity:true,
+                    field: 'patientIdCard',
+                    title: '患者身份证'
+                },
 
                 {
                     field: 'currentLocation',
@@ -132,8 +133,8 @@
                 //     title: '是否重症'
                 // },
                 // {
-                //     field: 'iscure',
-                //     title: '是否死亡'
+                //     field: 'isDead',
+                //     title: '是否治愈'
                 // },
                 {
                     field: 'description',
@@ -154,8 +155,8 @@
         };
         $.table.init(options);
 
-    });
 
+    });
 </script>
 </body>
 <script id="importTpl" type="text/template">
diff --git a/ruoyi-admin/src/main/resources/templates/patientCure/cure/edit.html b/ruoyi-admin/src/main/resources/templates/patientCure/cure/edit.html
index bbffd30..0f89fa4 100644
--- a/ruoyi-admin/src/main/resources/templates/patientCure/cure/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/patientCure/cure/edit.html
@@ -19,9 +19,9 @@
                 <label class="col-sm-3 control-label">性别：</label>
                 <div class="col-sm-9">
                     <label class="radio-box">
-                        <input type="radio" th:field="*{patientSex}" value="1" id="male" name="patientSex">男</label>
+                        <input type="radio" th:field="*{patientSex}" value="男" id="male" name="patientSex">男</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{patientSex}" value="0" id="female" name="patientSex">女</label>
+                        <input type="radio" th:field="*{patientSex}" value="女" id="female" name="patientSex">女</label>
                 </div>
             </div>
         </div>
@@ -68,32 +68,32 @@
             <label class="col-sm-3 control-label">是否为密接人员：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isTouch}" value="1" id="touched" name="isTouch">是</label>
+                    <input type="radio" th:field="*{isTouch}" value="密接人员" id="touched" name="isTouch">密接人员</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isTouch}" value="0" id="untouched" name="isTouch">否</label>
+                    <input type="radio" th:field="*{isTouch}" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
             </div>
             <label class="col-sm-3 control-label">是否去过高风险地区：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isHigh}" value="1" id="high" name="isHigh">是</label>
+                    <input type="radio" th:field="*{isHigh}" value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isHigh}" value="0" id="low" name="isHigh">否</label>
+                    <input type="radio" th:field="*{isHigh}" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区</label>
             </div>
         </div>
         <div class="form-group" >
             <label class="col-sm-3 control-label">是否为重症：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio"  th:field="*{isEmergency}" value="1" id="emergency" name="isEmergency">是</label>
+                    <input type="radio"  th:field="*{isEmergency}" value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isEmergency}" value="0" id="unemergency" name="isEmergency">否</label>
+                    <input type="radio" th:field="*{isEmergency}" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
             </div>
             <label class="col-sm-3 control-label">是否健在：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio"  th:field="*{isDead}" value="1" id="alive" name="iscure">是</label>
+                    <input type="radio"  th:field="*{isDead}" value="健在" id="alive" name="iscure">健在</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isDead}" value="0" id="cure" name="iscure">否</label>
+                    <input type="radio" th:field="*{isDead}" value="已死亡" id="cure" name="iscure">已死亡</label>
             </div>
         </div>
     </form>
diff --git a/ruoyi-admin/src/main/resources/templates/patientDead/dead/add.html b/ruoyi-admin/src/main/resources/templates/patientDead/dead/add.html
index 789a97d..acc54e4 100644
--- a/ruoyi-admin/src/main/resources/templates/patientDead/dead/add.html
+++ b/ruoyi-admin/src/main/resources/templates/patientDead/dead/add.html
@@ -24,9 +24,9 @@
                     <label class="col-sm-3 control-label">性别：</label>
                     <div class="col-sm-9">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="male" name="patientSex">男</label>
+                            <input type="radio" checked="" value="男" id="male" name="patientSex">男</label>
                         <label class="radio-box">
-                            <input type="radio" value="0" id="female" name="patientSex">女</label>
+                            <input type="radio" value="女" id="female" name="patientSex">女</label>
                     </div>
                 </div>
             </div>
@@ -73,32 +73,32 @@
                 <label class="col-sm-3 control-label">是否为密接人员：</label>
                 <div class="col-sm-3">
                     <label class="radio-box">
-                        <input type="radio"  value="1" id="touched" name="isTouch">是密接人员</label>
+                        <input type="radio"  value="密接人员" id="touched" name="isTouch">密接人员</label>
                     <label class="radio-box">
-                        <input type="radio" checked="" value="0" id="untouched" name="isTouch">非密接人员</label>
+                        <input type="radio" checked="" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
                 </div>
                 <label class="col-sm-3 control-label">是否去过高风险地区：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="high" name="isHigh">去过高风险地区</label>
+                            <input type="radio"  value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="low" name="isHigh">未去过高风险地区</label>
+                            <input type="radio" checked="" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区</label>
                     </div>
             </div>
             <div class="form-group" >
                 <label class="col-sm-3 control-label">是否为重症：</label>
                     <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio"  value="1" id="emergency" name="isEmergency">重症患者</label>
+                            <input type="radio"  value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                         <label class="radio-box">
-                            <input type="radio" checked="" value="0" id="unemergency" name="isEmergency">非重症患者</label>
+                            <input type="radio" checked="" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
                     </div>
                 <label class="col-sm-3 control-label">目前状况：</label>
                 <div class="col-sm-3">
                         <label class="radio-box">
-                            <input type="radio" checked="" value="1" id="alive" name="isDead">健在</label>
+                            <input type="radio" checked="" value="健在" id="alive" name="isDead">健在</label>
                         <label class="radio-box">
-                            <input type="radio"  value="0" id="dead" name="isDead">已死亡</label>
+                            <input type="radio"  value="已死亡" id="dead" name="isDead">已死亡</label>
                     </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/patientDead/dead/dead.html b/ruoyi-admin/src/main/resources/templates/patientDead/dead/dead.html
index 4bd7424..273964c 100644
--- a/ruoyi-admin/src/main/resources/templates/patientDead/dead/dead.html
+++ b/ruoyi-admin/src/main/resources/templates/patientDead/dead/dead.html
@@ -95,17 +95,16 @@
                     field: 'patientAge',
                     title: '患者年龄'
                 },
-                {
-                    field: 'patientSex',
-                    title: '患者性别',
-
-                },
                 // {
-                //     isIdentity:true,
-                //     field: 'patientIdCard',
-                //     title: '患者身份证'
+                //     field: 'patientSex',
+                //     title: '患者性别',
+                //
                 // },
-
+                {
+                    isIdentity:true,
+                    field: 'patientIdCard',
+                    title: '患者身份证'
+                },
                 {
                     field: 'currentLocation',
                     title: '最近感染地区'
diff --git a/ruoyi-admin/src/main/resources/templates/patientDead/dead/edit.html b/ruoyi-admin/src/main/resources/templates/patientDead/dead/edit.html
index bd2393c..674335c 100644
--- a/ruoyi-admin/src/main/resources/templates/patientDead/dead/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/patientDead/dead/edit.html
@@ -19,9 +19,9 @@
                 <label class="col-sm-3 control-label">性别：</label>
                 <div class="col-sm-9">
                     <label class="radio-box">
-                        <input type="radio" th:field="*{patientSex}" value="1" id="male" name="patientSex">男</label>
+                        <input type="radio" th:field="*{patientSex}" value="男" id="male" name="patientSex">男</label>
                     <label class="radio-box">
-                        <input type="radio" th:field="*{patientSex}" value="0" id="female" name="patientSex">女</label>
+                        <input type="radio" th:field="*{patientSex}" value="女" id="female" name="patientSex">女</label>
                 </div>
             </div>
         </div>
@@ -68,32 +68,32 @@
             <label class="col-sm-3 control-label">是否为密接人员：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isTouch}" value="1" id="touched" name="isTouch">是</label>
+                    <input type="radio" th:field="*{isTouch}" value="密接人员" id="touched" name="isTouch">密接人员</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isTouch}" value="0" id="untouched" name="isTouch">否</label>
+                    <input type="radio" th:field="*{isTouch}" value="非密接人员" id="untouched" name="isTouch">非密接人员</label>
             </div>
             <label class="col-sm-3 control-label">是否去过高风险地区：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isHigh}" value="1" id="high" name="isHigh">是</label>
+                    <input type="radio" th:field="*{isHigh}" value="去过高风险地区" id="high" name="isHigh">去过高风险地区</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isHigh}" value="0" id="low" name="isHigh">否</label>
+                    <input type="radio" th:field="*{isHigh}" value="未去过高风险地区" id="low" name="isHigh">未去过高风险地区</label>
             </div>
         </div>
         <div class="form-group" >
             <label class="col-sm-3 control-label">是否为重症：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio"  th:field="*{isEmergency}" value="1" id="emergency" name="isEmergency">是</label>
+                    <input type="radio"  th:field="*{isEmergency}" value="重症患者" id="emergency" name="isEmergency">重症患者</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isEmergency}" value="0" id="unemergency" name="isEmergency">否</label>
+                    <input type="radio" th:field="*{isEmergency}" value="非重症患者" id="unemergency" name="isEmergency">非重症患者</label>
             </div>
             <label class="col-sm-3 control-label">是否健在：</label>
             <div class="col-sm-3">
                 <label class="radio-box">
-                    <input type="radio"  th:field="*{isDead}" value="1" id="alive" name="isDead">是</label>
+                    <input type="radio"  th:field="*{isDead}" value="健在" id="alive" name="isDead">健在</label>
                 <label class="radio-box">
-                    <input type="radio" th:field="*{isDead}" value="0" id="dead" name="isDead">否</label>
+                    <input type="radio" th:field="*{isDead}" value="已死亡" id="dead" name="isDead">已死亡</label>
             </div>
         </div>
     </form>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
index 9633a55..09f057d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java
@@ -40,7 +40,7 @@ public class CheckManage extends BaseEntity
     private String isHigh;
 
     /** 是否接触过密接人员 */
-    @Excel(name = "是否接触过密接人员",readConverterExp = "0=不是密接人员,1=是密接人员,不是密接人员=不是密接人员,是密接人员=是密接人员")
+    @Excel(name = "是否接触过密接人员",readConverterExp = "0=非密接人员,1=密接人员,非密接人员=非密接人员,密接人员=密接人员")
     private String isTouch;
 
     /** 备注 */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientCure.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientCure.java
index 5486b3b..ca08410 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientCure.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientCure.java
@@ -29,11 +29,11 @@ public class PatientCure extends BaseEntity
     private String patientAge;
 
     /** 患者性别 */
-    @Excel(name = "患者性别" ,readConverterExp = "0=女,1=男, 女=女,男=男")
+    @Excel(name = "患者性别" )
     private String patientSex;
 
     /** 患者联系电话 */
-    @Excel(name = "患者联系电话")
+    @Excel(name = "患者身份证")
     private String patientIdCard;
 
     /** 备注 */
@@ -54,18 +54,18 @@ public class PatientCure extends BaseEntity
     private Date diagnosedTime;
 
     /** 重症状态 */
-    @Excel(name = "重症状态" ,readConverterExp = "0=非重症患者,1=重症患者，非重症患者=非重症患者,重症患者=重症患者")
+    @Excel(name = "重症状态" )
     private String isEmergency;
     /** 密接状态 */
-    @Excel(name = "密接状态" ,readConverterExp = "0=不是密接人员,1=是密接人员,不是密接人员=不是密接人员,是密接人员=是密接人员")
+    @Excel(name = "密接状态")
     private String isTouch;
 
     /** 目前状况 */
-    @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在,已死亡=已死亡,健在=健在")
+    @Excel(name = "目前状况" )
     private String isDead;
 
     /** 是否去高风险地区 */
-    @Excel(name = "是否去高风险地区",readConverterExp = "0=未经过高风险地区,1=去过高风险地区,未去过高风险地区=未去过高风险地区,去过高风险地区=去过高风险地区")
+    @Excel(name = "是否去高风险地区")
     private String isHigh;
 
     public void setPatientId(Long patientId)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientDead.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientDead.java
index b77d9e5..2892c0f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientDead.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientDead.java
@@ -7,6 +7,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.Size;
+
 /**
  * 死亡患者对象 patient_dead
  * 
@@ -19,7 +21,6 @@ public class PatientDead extends BaseEntity
 
     /** 已死亡患者id */
     private Long patientId;
-
     /** 患者姓名 */
     @Excel(name = "患者姓名")
     private String patientName;
@@ -29,11 +30,12 @@ public class PatientDead extends BaseEntity
     private String patientAge;
 
     /** 患者性别 */
-    @Excel(name = "患者性别")
-    private String patientSex ,readConverterExp = "0=女,1=男, 女=女,男=男";
+    @Excel(name = "患者性别" )
+    private String patientSex;
 
-    /** 患者联系电话 */
-    @Excel(name = "患者联系电话")
+    /** 患者身份证 */
+    @Size(max=18)
+    @Excel(name = "患者身份证")
     private String patientIdCard;
 
     /** 备注 */
@@ -52,22 +54,23 @@ public class PatientDead extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "感染时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date diagnosedTime;
+
+
     /** 重症状态 */
-    @Excel(name = "重症状态" ,readConverterExp = "0=非重症患者,1=重症患者，非重症患者=非重症患者,重症患者=重症患者")
+    @Excel(name = "重症状态" )
     private String isEmergency;
     /** 密接状态 */
-    @Excel(name = "密接状态" ,readConverterExp = "0=不是密接人员,1=是密接人员,不是密接人员=不是密接人员,是密接人员=是密接人员")
+    @Excel(name = "密接状态" )
     private String isTouch;
 
     /** 目前状况 */
-    @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在,已死亡=已死亡,健在=健在")
+    @Excel(name = "目前状况" )
     private String isDead;
 
     /** 是否去高风险地区 */
-    @Excel(name = "是否去高风险地区",readConverterExp = "0=未经过高风险地区,1=去过高风险地区,未去过高风险地区=未去过高风险地区,去过高风险地区=去过高风险地区")
+    @Excel(name = "是否去高风险地区")
     private String isHigh;
 
-
     public void setPatientId(Long patientId)
     {
         this.patientId = patientId;
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 8f0bb9a..cbb49ba 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
@@ -31,7 +31,7 @@ public class PatientManage extends BaseEntity
     private String patientAge;
 
     /** 患者性别 */
-    @Excel(name = "患者性别"  ,readConverterExp = "0=女,1=男,女=女,男=男")
+    @Excel(name = "患者性别" )
     private String patientSex;
 
     /** 患者身份证 */
@@ -58,18 +58,18 @@ public class PatientManage extends BaseEntity
 
 
     /** 重症状态 */
-    @Excel(name = "重症状态" ,readConverterExp = "0=非重症患者,1=重症患者，非重症患者=非重症患者,重症患者=重症患者")
+    @Excel(name = "重症状态" )
     private String isEmergency;
     /** 密接状态 */
-    @Excel(name = "密接状态" ,readConverterExp = "0=不是密接人员,1=是密接人员,不是密接人员=不是密接人员,是密接人员=是密接人员")
+    @Excel(name = "密接状态" )
     private String isTouch;
 
     /** 目前状况 */
-    @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在,已死亡=已死亡,健在=健在")
+    @Excel(name = "目前状况" )
     private String isDead;
 
     /** 是否去高风险地区 */
-    @Excel(name = "是否去高风险地区",readConverterExp = "0=未经过高风险地区,1=去过高风险地区,未去过高风险地区=未去过高风险地区,去过高风险地区=去过高风险地区")
+    @Excel(name = "是否去高风险地区")
     private String isHigh;
 
     public void setPatientId(Long patientId) 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientCureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientCureMapper.java
index 9b4cf41..ce78477 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientCureMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientCureMapper.java
@@ -68,5 +68,12 @@ public interface PatientCureMapper
      * @param patientIdCard 身份证唯一
      * @return 患者信息
      */
-    public PatientCure checkPatientIdCardUnique(String patientIdCard);
+    public PatientCure checkPatientCureIdCardUnique(String patientIdCard);
+    /**
+     * 通过身份证查询患者
+     *
+     * @param patientIdCard 身份证
+     * @return 患者信息
+     */
+    public PatientCure selectPatientByPatientIdCard(String patientIdCard);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientDeadMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientDeadMapper.java
index 4c78b41..ad6a456 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientDeadMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientDeadMapper.java
@@ -66,4 +66,11 @@ public interface PatientDeadMapper
      * @return 患者信息
      */
     public PatientDead checkPatientIdCardUnique(String patientIdCard);
+    /**
+     * 通过身份证查询患者
+     *
+     * @param patientIdCard 身份证
+     * @return 患者信息
+     */
+    public PatientDead selectPatientDeadByPatientIdCard(String patientIdCard);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPatientManageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPatientManageService.java
index 7facff3..08fd7d5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPatientManageService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPatientManageService.java
@@ -103,4 +103,5 @@ public interface IPatientManageService
      */
     public int insertDeadPatientManage(PatientManage patientManage);
 
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
index f3df83b..c804b32 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java
@@ -63,7 +63,11 @@ public class CheckManageServiceImpl implements ICheckManageService
     @Override
     public int insertCheckManage(CheckManage checkManage)
     {
-        return checkManageMapper.insertCheckManage(checkManage);
+        if (StringUtils.isNotEmpty(checkManage.getCheckPhonenumber()))
+        {
+            return checkManageMapper.insertCheckManage(checkManage);
+        }
+        else throw new ServiceException("新增打卡信息不能为空！");
     }
 
     /**
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 fcab6f3..b3ff644 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
@@ -65,7 +65,12 @@ public class NucleicServiceImpl implements INucleicService
     @Override
     public int insertNucleic(Nucleic nucleic)
     {
-        return nucleicMapper.insertNucleic(nucleic);
+        if (StringUtils.isNotEmpty(nucleic.getNucleicIdNumber()))
+        {
+            return nucleicMapper.insertNucleic(nucleic);
+        }
+        else throw new ServiceException("核酸编号不能为空！");
+
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientCureServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientCureServiceImpl.java
index 9f30afd..1dc1acb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientCureServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientCureServiceImpl.java
@@ -108,7 +108,7 @@ public class PatientCureServiceImpl implements IPatientCureService
     @Override
     public boolean checkPatientIdCardUnique(PatientCure patientCure) {
         Long patientId = StringUtils.isNull(patientCure.getPatientId()) ? -1L : patientCure.getPatientId();
-        PatientCure info = patientCureMapper.checkPatientIdCardUnique(patientCure.getPatientIdCard());
+        PatientCure info = patientCureMapper.checkPatientCureIdCardUnique(patientCure.getPatientIdCard());
         if (StringUtils.isNotNull(info) && info.getPatientId().longValue() != patientId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -137,7 +137,7 @@ public class PatientCureServiceImpl implements IPatientCureService
             try
             {
                 // 验证是否存在这个患者
-                PatientCure p = patientCureMapper.selectPatientCureByPatientId(patientCure.getPatientId());
+                PatientCure p = patientCureMapper.selectPatientByPatientIdCard(patientCure.getPatientIdCard());
                 if (StringUtils.isNull(p))
                 {
                     BeanValidators.validateWithException(validator, patientCure);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientDeadServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientDeadServiceImpl.java
index 4503c28..06abb36 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientDeadServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientDeadServiceImpl.java
@@ -136,7 +136,7 @@ public class PatientDeadServiceImpl implements IPatientDeadService
             try
             {
                 // 验证是否存在这个患者
-                PatientDead p = patientDeadMapper.selectPatientDeadByPatientId(patientDead.getPatientId());
+                PatientDead p = patientDeadMapper.selectPatientDeadByPatientIdCard(patientDead.getPatientIdCard());
                 if (StringUtils.isNull(p))
                 {
                     BeanValidators.validateWithException(validator, patientDead);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientManageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientManageServiceImpl.java
index 2375f78..6447302 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientManageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientManageServiceImpl.java
@@ -70,7 +70,11 @@ public class PatientManageServiceImpl implements IPatientManageService
     @Override
     public int insertPatientManage(PatientManage patientManage)
     {
-        return patientManageMapper.insertPatientManage(patientManage);
+        if (StringUtils.isNotEmpty(patientManage.getPatientIdCard()))
+        {
+            return patientManageMapper.insertPatientManage(patientManage);
+        }
+        else throw new ServiceException("患者信息不能为空！");
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java
index 9af7ad4..9fa7a72 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java
@@ -65,7 +65,12 @@ public class VaccineServiceImpl implements IVaccineService
     @Override
     public int insertVaccine(Vaccine vaccine)
     {
-        return vaccineMapper.insertVaccine(vaccine);
+        if (StringUtils.isNotEmpty(vaccine.getVaccineIdNumber()))
+        {
+            return vaccineMapper.insertVaccine(vaccine);
+        }
+        else throw new ServiceException("疫苗信息不能为空！");
+
     }
 
     /**
diff --git a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
index bf97c40..9a7af47 100644
--- a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml
@@ -19,8 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCheckManageVo">
        select check_manage_id, check_name, temperature, health_state
-       ,  CASE is_touch WHEN '1' THEN '是密接人员'  ELSE '不是密接人员' END as is_touch
-        , CASE is_high WHEN '1' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
+       ,  CASE is_touch WHEN '密接人员' THEN '密接人员'  ELSE '非密接人员' END as is_touch
+        , CASE is_high WHEN '去过高风险地区' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
        ,description, check_datetime, current_position, check_phonenumber
        from check_manage
     </sql>
diff --git a/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml
index 54d4e9f..9648901 100644
--- a/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPatientCureVo">
-        select patient_id, patient_name, CASE patient_sex WHEN '1' THEN '男'  ELSE '女' END as patient_sex
+        select patient_id, patient_name, CASE patient_sex WHEN '男' THEN '男'  ELSE '女' END as patient_sex
         ,patient_sex, patient_id_card, description, current_location, temperature, diagnosed_time
-        ,  CASE is_emergency WHEN '1' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
-        ,  CASE is_dead WHEN '1' THEN '健在'  ELSE '已死亡' END as is_dead
-        ,  CASE is_touch WHEN '1' THEN '是密接人员'  ELSE '不是密接人员' END as is_touch
-        , CASE is_high WHEN '1' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
+        ,  CASE is_emergency WHEN '重症患者' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
+        ,  CASE is_dead WHEN '健在' THEN '健在'  ELSE '已死亡' END as is_dead
+        ,  CASE is_touch WHEN '密接人员' THEN '密接人员'  ELSE '非密接人员' END as is_touch
+        , CASE is_high WHEN '去过高风险地区' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
         from patient_cure
     </sql>
 
@@ -117,9 +117,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="checkPatientIdCardUnique" parameterType="String" resultMap="PatientCureResult">
+    <select id="checkPatientCureIdCardUnique" parameterType="String" resultMap="PatientCureResult">
 		select patient_id, patient_id_card from patient_cure where patient_id_card=#{patientIdCard}
 	</select>
 
+    <select id="selectPatientByPatientIdCard" parameterType="String" resultMap="PatientCureResult">
+        <include refid="selectPatientCureVo"/>
+        where patient_id_card = #{patientIdCard}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml
index 3718c78..53be276 100644
--- a/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPatientDeadVo">
-        select patient_id, patient_name, patient_age,CASE patient_sex WHEN '1' THEN '男'  ELSE '女' END as patient_sex
+        select patient_id, patient_name, patient_age,CASE patient_sex WHEN '男' THEN '男'  ELSE '女' END as patient_sex
         , patient_id_card, description, current_location, temperature, diagnosed_time
-        ,  CASE is_emergency WHEN '1' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
-        ,  CASE is_dead WHEN '1' THEN '健在'  ELSE '已死亡' END as is_dead
-        ,  CASE is_touch WHEN '1' THEN '是密接人员'  ELSE '不是密接人员' END as is_touch
-        , CASE is_high WHEN '1' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
+        ,  CASE is_emergency WHEN '重症患者' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
+        ,  CASE is_dead WHEN '健在' THEN '健在'  ELSE '已死亡' END as is_dead
+        ,  CASE is_touch WHEN '密接人员' THEN '密接人员'  ELSE '非密接人员' END as is_touch
+        , CASE is_high WHEN '去过高风险地区' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
          from patient_dead
     </sql>
 
@@ -121,5 +121,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select patient_id, patient_id_card from patient_dead where patient_id_card=#{patientIdCard}
 	</select>
 
+    <select id="selectPatientDeadByPatientIdCard" parameterType="String" resultMap="PatientDeadResult">
+        <include refid="selectPatientDeadVo"/>
+        where patient_id_card = #{patientIdCard}
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
index f1ec13d..2e16a21 100644
--- a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPatientManageVo">
-        select patient_id, patient_name, patient_age, CASE patient_sex WHEN '1' THEN '男'  ELSE '女' END as patient_sex
+        select patient_id, patient_name, patient_age, CASE patient_sex WHEN '男' THEN '男'  ELSE '女' END as patient_sex
         , patient_id_card, description, current_location, temperature, diagnosed_time
-        ,  CASE is_emergency WHEN '1' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
-        ,  CASE is_dead WHEN '1' THEN '健在'  ELSE '已死亡' END as is_dead
-        ,  CASE is_touch WHEN '1' THEN '是密接人员'  ELSE '不是密接人员' END as is_touch
-        , CASE is_high WHEN '1' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
+        ,  CASE is_emergency WHEN '重症患者' THEN '重症患者'  ELSE '非重症患者' END as is_emergency
+        ,  CASE is_dead WHEN '健在' THEN '健在'  ELSE '已死亡' END as is_dead
+        ,  CASE is_touch WHEN '密接人员' THEN '密接人员'  ELSE '非密接人员' END as is_touch
+        , CASE is_high WHEN '去过高风险地区' THEN '去过高风险地区'  ELSE '未去过高风险地区' END as is_high
         from patient_manage
     </sql>
 
@@ -119,14 +119,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where patient_id_card = #{patientIdCard}
     </select>
     <select id="selectPatientById" parameterType="Long" resultMap="PatientManageResult">
-        <include refid="selectPatientManageVo"/>l
+        <include refid="selectPatientManageVo"/>
         where  patient_id= #{patientId}
     </select>
-    <select id="checkPatientIdCardUnique" parameterType="String" resultMap="PatientManageResult">
+    <select id="checkPatientCureIdCardUnique" parameterType="String" resultMap="PatientManageResult">
 		select patient_id, patient_id_card from patient_manage where patient_id_card=#{patientIdCard}
 	</select>
     <insert id="insertCurePatientManage" parameterType="PatientManage" useGeneratedKeys="true" keyProperty="patientId">
-
         insert into patient_cure
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="patientId != null">patient_id,</if>
@@ -145,11 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim> select
         patient_id,patient_name,patient_age,patient_sex,patient_id_card,description,current_location,temperature,diagnosed_time,is_emergency,is_touch,is_high,is_dead
         from patient_manage where patient_id not in(SELECT patient_id=#{patientId} from patient_cure );
-        update patient_manage set  is_dead='1' where patient_id=#{patientId};
     </insert>
 
     <insert id="insertDeadPatientManage" parameterType="PatientManage" useGeneratedKeys="true" keyProperty="patientId">
-
         insert into patient_dead
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="patientId != null">patient_id,</if>
@@ -167,20 +164,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDead != null">is_dead,</if>
         </trim>
          select patient_id,patient_name,patient_age,patient_sex,patient_id_card,description,current_location,temperature,diagnosed_time,is_emergency,is_touch,is_high,is_dead
-        from patient_manage where patient_id not in(SELECT patient_id=#{patientId} from patient_dead );
+        from patient_manage where patient_id_card not in(SELECT patient_id_card=#{patientIdCard} from patient_dead );
     </insert>
-    <update id="updateIsDead" parameterType="PatientManage">
-        update patient_manage
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="isDead != null">is_dead = '0',</if>
-        </trim>
-        where patient_id = #{patientId}
-    </update>
-    <update id="updateIsCure" parameterType="PatientManage">
-        update patient_manage
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="isDead != null">is_dead = '0',</if>
-        </trim>
-        where patient_id = #{patientId}
-    </update>
 </mapper>
\ No newline at end of file