完成患者管理模块查看详情功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientManageController.java

@@ -149,4 +149,15 @@ public class PatientManageController extends BaseController
         return util.exportExcel(list, "患者管理数据");
     }
 
+    /**
+     * 展示详细信息
+     */
+    @RequiresPermissions("patient:patientManage:detail")
+    @GetMapping("/detail/{patientId}")
+    public String detail(@PathVariable("patientId") Long patientId, ModelMap mmap)
+    {
+        mmap.put("name", "patientManage");
+        mmap.put("patientManage", patientManageService.selectPatientById(patientId));
+        return prefix + "/detail";
+    }
 }

ruoyi-admin/src/main/resources/templates/check/checkManage/add.html

@@ -133,11 +133,12 @@
                 },
                 checkPhonenumber:{
                     isPhone:true,
-                }
-            },
-            description: {
+                },
+                description: {
+                },
             },
 
+
         });
         function submitCheck () {
             if ($.validate.form()) {
@@ -167,7 +168,7 @@
             }
             if (navigator.geolocation) {
                 //浏览器支持geolocation
-                navigator.geolocation.getCurrentPosition(onSuccess, onError, options);
+                navigator.geolocation.getcurrentPosition(onSuccess, onError, options);
             } else {
                 //浏览器不支持geolocation
                 alert('您的浏览器不支持地理位置定位');

ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html

@@ -18,10 +18,10 @@
                                 <label>打卡人电话：</label>
                                 <input type="text" name="checkPhonenumber"/>
                             </li>
-                            <li>
-                                <label>身份证：</label>
-                                <input type="text" name="patientIdCard"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>身份证：</label>-->
+<!--                                <input type="text" name="patientIdCard"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>最近接触地区：</label>
                                 <input type="text" name="currentPosition"/>

ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html

@@ -19,12 +19,7 @@
                     <input name="checkPhonenumber" th:field="*{checkPhonenumber}" 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="patientIdCard" th:field="*{patientIdCard}" class="form-control" type="text">
-                </div>
-            </div>
+
             <div class="form-group">    
                 <label class="col-sm-3 control-label">是否去高风险地区：</label>
                 <div class="col-sm-8">
@@ -32,12 +27,6 @@
                 </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">

ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html

@@ -13,6 +13,12 @@
                     <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="patientSex" class="form-control" type="text">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">患者年龄：</label>
                 <div class="col-sm-8">
@@ -22,7 +28,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">患者身份证：</label>
                 <div class="col-sm-8">
-                    <input name="patientIdCard" class="form-control" type="text">
+                    <input name="patientIdCard" class="form-control" type="text" maxlength="18">
                 </div>
             </div>
             <div class="form-group">    
@@ -34,7 +40,7 @@
             <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">
+                    <input name="currentLocation" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -52,6 +58,31 @@
                     </div>
                 </div>
             </div>
+            <div class="form-group" style="display: flex">
+                <label class="col-sm-3 control-label">是否为密接人员：</label>
+                <div class="col-sm-2">
+                    <label class="toggle-switch switch-solid">
+                        <input type="checkbox" id="isTouch">
+                        <span></span>
+                    </label>
+                </div>
+                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
+                <div class="col-sm-2">
+                <label class="toggle-switch switch-solid">
+                    <input type="checkbox" id="isHigh">
+                    <span></span>
+                </label>
+            </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="isDiagnosed" class="form-control" placeholder="目前诊断症状" type="text">
+                        <span class="input-group-addon"><i class="fa fa-hospital-o"></i></span>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -64,7 +95,13 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize());
+                var data = $("#form-patientManage-add").serializeArray();
+                var isTouch = $("input[id='isTouch']").is(':checked') == true ? 0 : 1;
+                var isHigh = $("input[id='isHigh']").is(':checked') == true ? 0 : 1;
+                data.push({"patientName": "isTouch", "value": isTouch});
+                data.push({"patientName": "isHigh", "value": isHigh});
+                $.operate.saveTab(prefix+"/add", data);
+                // $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize());
             }
         }
 

ruoyi-admin/src/main/resources/templates/patient/patientManage/detail.html

@@ -0,0 +1,81 @@
+<!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="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" >
+
+    <form class="form-horizontal m-t" id="form-patientManage-detail">
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">姓名：</label>
+                        <div class="form-control-static" th:text="${patientManage.patientName}"></div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">最近感染地区：</label>
+                        <div class="form-control-static" th:text="${patientManage.currentLocation}"></div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">性别：</label>
+                        <div class="form-control-static" th:text="${patientManage.patientSex}"></div>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">感染时间：</label>
+                        <div class="form-control-static" th:text="${patientManage.diagnosedTime}"></div>
+                    </div>
+
+
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label is-required">体温：</label>
+                        <div class="form-control-static" th:text="${patientManage.temperature}"></div>
+                    </div>
+
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">患者年龄：</label>
+                        <div class="form-control-static" th:text="${patientManage.patientAge}"></div>
+                    </div>
+
+
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label is-required">身份证：</label>
+                        <div class="form-control-static" th:text="${patientManage.patientIdCard}"></div>
+                    </div>
+
+
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label ">确诊状态：</label>
+                        <div class="form-control-static" th:text="${patientManage.isDiagnosed}"></div>
+                    </div>
+
+
+<!--                    <div class="form-group" >-->
+<!--                        <label class="col-sm-2 control-label">是否接触密接：</label>-->
+<!--                        <div class="form-control-static" th:text="${patientManage.idTouch}"></div>-->
+<!--                    </div>-->
+
+<!--                        <div class="form-group">-->
+<!--                         <label class="col-sm-2 control-label">是否去过高风险：</label>-->
+<!--                            <div class="form-control-static" th:text="${patientManage.isHigh}"></div>-->
+<!--                        </div>-->
+
+
+
+                    <div class="form-group">
+                        <label class="col-xs-2 control-label">备注：</label>
+                        <div class="form-control-static" th:text="${patientManage.description}"></div>
+                    </div>
+
+
+    </form>
+
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: jsonview-js" />
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html

@@ -15,9 +15,9 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">患者年龄：</label>
+                <label class="col-sm-3 control-label">性别：</label>
                 <div class="col-sm-8">
-                    <input name="patientAge" th:field="*{patientAge}" class="form-control" type="text">
+                    <input name="patientSex" th:field="*{patientSex}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -35,7 +35,7 @@
             <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">
+                    <input name="currentLocation" th:field="*{currentLocation}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
@@ -53,7 +53,31 @@
                     </div>
                 </div>
             </div>
-
+            <div class="form-group" style="display: flex">
+                <label class="col-sm-3 control-label">是否为密接人员：</label>
+                <div class="col-sm-2">
+                    <label class="toggle-switch switch-solid">
+                        <input  id="isTouch" th:field="*{temperature}" class="form-control" type="checkbox">
+                        <span></span>
+                    </label>
+                </div>
+                <label class="col-sm-3 control-label">是否去过高风险地区：</label>
+                <div class="col-sm-2">
+                    <label class="toggle-switch switch-solid" th:field="*{temperature}" class="form-control" type="checkbox">
+                        <input type="checkbox" id="isHigh">
+                        <span></span>
+                    </label>
+                </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="isDiagnosed" class="form-control" placeholder="目前诊断症状" type="text">
+                        <span class="input-group-addon"><i class="fa fa-hospital-o"></i></span>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html

@@ -19,16 +19,12 @@
                                 <input type="text" name="patientAge"/>
                             </li>
                             <li>
-                                <label>备注：</label>
-                                <input type="text" name="description"/>
-                            </li>
-                            <li>
                                 <label>患者身份证：</label>
                                 <input type="text" name="patientIdCard"/>
                             </li>
                             <li>
                                 <label>最近感染地区：</label>
-                                <input type="text" name="currentPosition"/>
+                                <input type="text" name="currentLocation"/>
                             </li>
                             <li>
                                 <label>当天体温：</label>
@@ -72,6 +68,7 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('patient:patientManage:edit')}]];
+        var detailFlag = [[${@permission.hasPermi('patient:patientManage:detail')}]];
         var removeFlag = [[${@permission.hasPermi('patient:patientManage:remove')}]];
         var prefix = ctx + "patient/patientManage";
 
@@ -79,6 +76,7 @@
             var options = {
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
+                detailUrl: prefix + "/detail/{id}",
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
@@ -98,25 +96,25 @@
                     field: 'patientName',
                     title: '患者姓名'
                 },
-                {
-                    field: 'patientAge',
-                    title: '患者年龄'
-                },
+                // {
+                //     field: 'patientAge',
+                //     title: '患者年龄'
+                // },
                 {
                     field: 'patientSex',
                     title: '患者性别'
                 },
-                {
-                    isIdentity:true,
-                    field: 'patientIdCard',
-                    title: '患者身份证'
-                },
+                // {
+                //     isIdentity:true,
+                //     field: 'patientIdCard',
+                //     title: '患者身份证'
+                // },
                 {
                     field: 'description',
                     title: '备注'
                 },
                 {
-                    field: 'currentPosition',
+                    field: 'currentLocation',
                     title: '最近感染地区'
                 },
                 {
@@ -127,27 +125,24 @@
                     field: 'diagnosedTime',
                     title: '感染时间'
                 },
-                {
-                    field: 'isDiagnosed',
-                    title: '确诊状态'
-                },
-                {
-                    field: 'isCure',
-                    title: '治愈状态'
-                },
-                {
-                    field: 'isTouch',
-                    title: '密接状态'
-                },
-                {
-                    field: 'isDead',
-                    title: '死亡状态'
-                },
+                    {
+                        field: 'isTouch',
+                        title: '接触'
+                    },
+                    {
+                        field: 'isHigh',
+                        title: '高风险地区'
+                    },
+                    {
+                        field: 'isDiagnosed',
+                        title: '诊断'
+                    },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.patientId + '\')"><i class="fa fa-search"></i>详情</a> ');
                         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('');

ruoyi-system/src/main/java/com/ruoyi/system/domain/CheckManage.java

@@ -36,11 +36,11 @@ public class CheckManage extends BaseEntity
     private String healthState;
 
     /** 是否去过高风险地区 */
-    @Excel(name = "是否去过高风险地区")
+    @Excel(name = "是否去过高风险地区" ,readConverterExp = "0=否，1=是，2=未知")
     private Integer isHigh;
 
     /** 是否接触过密接人员 */
-    @Excel(name = "是否接触过密接人员")
+    @Excel(name = "是否接触过密接人员",readConverterExp = "0=否，1=是，2=未知")
     private Integer isTouch;
 
     /** 备注 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/PatientManage.java

@@ -29,7 +29,7 @@ public class PatientManage extends BaseEntity
     private String patientAge;
 
     /** 患者性别 */
-    @Excel(name = "患者性别")
+    @Excel(name = "患者性别"  ,readConverterExp = "0=男,1=女,2=未知")
     private String patientSex;
 
     /** 患者身份证 */
@@ -42,7 +42,7 @@ public class PatientManage extends BaseEntity
 
     /** 最近感染地区 */
     @Excel(name = "最近感染地区")
-    private String currentPosition;
+    private String currentLocation;
 
     /** 当天体温 */
     @Excel(name = "当天体温")
@@ -57,17 +57,13 @@ public class PatientManage extends BaseEntity
     @Excel(name = "确诊状态")
     private Integer isDiagnosed;
 
-    /** 治愈状态 */
-    @Excel(name = "治愈状态")
-    private Integer isCure;
-
     /** 密接状态 */
     @Excel(name = "密接状态")
     private Integer isTouch;
 
-    /** 死亡状态 */
-    @Excel(name = "死亡状态")
-    private Integer isDead;
+    /** 是否去高风险地区 */
+    @Excel(name = "是否去高风险地区")
+    private Integer isHigh;
 
     public void setPatientId(Long patientId) 
     {
@@ -123,14 +119,14 @@ public class PatientManage extends BaseEntity
     {
         return description;
     }
-    public void setCurrentPostition(String currentPosition)
+    public void setCurrentLocation(String currentLocation)
     {
-        this.currentPosition = currentPosition;
+        this.currentLocation = currentLocation;
     }
 
-    public String getCurrentPostition()
+    public String getCurrentLocation()
     {
-        return currentPosition;
+        return currentLocation;
     }
     public void setTemperature(String temperature) 
     {
@@ -159,15 +155,6 @@ public class PatientManage extends BaseEntity
     {
         return isDiagnosed;
     }
-    public void setIsCure(Integer isCure) 
-    {
-        this.isCure = isCure;
-    }
-
-    public Integer getIsCure() 
-    {
-        return isCure;
-    }
     public void setIsTouch(Integer isTouch) 
     {
         this.isTouch = isTouch;
@@ -177,14 +164,14 @@ public class PatientManage extends BaseEntity
     {
         return isTouch;
     }
-    public void setIsDead(Integer isDead) 
+    public void setIsHigh(Integer isHigh)
     {
-        this.isDead = isDead;
+        this.isHigh = isHigh;
     }
 
-    public Integer getIsDead() 
+    public Integer getIsHigh()
     {
-        return isDead;
+        return isHigh;
     }
 
     @Override
@@ -196,13 +183,12 @@ public class PatientManage extends BaseEntity
             .append("patientSex", getPatientSex())
             .append("patientIdCard", getPatientIdCard())
             .append("description", getDescription())
-            .append("currentPosition", getCurrentPostition())
+            .append("currentLocation", getCurrentLocation())
             .append("temperature", getTemperature())
             .append("diagnosedTime", getDiagnosedTime())
             .append("isDiagnosed", getIsDiagnosed())
-            .append("isCure", getIsCure())
             .append("isTouch", getIsTouch())
-            .append("isDead", getIsDead())
+            .append("isHigh", getIsHigh())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientManageMapper.java

@@ -66,4 +66,13 @@ public interface PatientManageMapper
      * @return 患者信息
      */
     public PatientManage selectPatientByPatientIdCard(String patientIdCard);
+
+    /**
+     * 通过调度患者ID查询调度信息
+     *
+     * @param patientId 患者ID
+     * @return 患者信息
+     */
+    public PatientManage selectPatientById(Long patientId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IPatientManageService.java

@@ -66,4 +66,12 @@ public interface IPatientManageService
      * @return 结果
      */
     public String importPatient(List<PatientManage> patientList, Boolean isUpdateSupport);
+
+    /**
+     * 通过调度患者ID查询患者详细信息
+     *
+     * @param patientId 患者ID
+     * @return 患者详细信息
+     */
+    public PatientManage selectPatientById(Long patientId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CheckManageServiceImpl.java

@@ -125,19 +125,6 @@ public class CheckManageServiceImpl implements ICheckManageService
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、电话为： " + checkManage.getCheckPhonenumber() + " 的打卡信息导入成功");
                 }
-                else if (isUpdateSupport)
-                {
-                    BeanValidators.validateWithException(validator, checkManage);
-                    checkManage.setCheckManageId(p.getCheckManageId());
-                    this.updateCheckManage(checkManage);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、电话为 " + checkManage.getCheckName() + " 的打卡信息更新成功");
-                }
-                else
-                {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、电话为 " + checkManage.getCheckPhonenumber() + " 已存在");
-                }
             }
             catch (Exception e)
             {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PatientManageServiceImpl.java

@@ -181,4 +181,15 @@ public class PatientManageServiceImpl implements IPatientManageService
         }
         return successMsg.toString();
     }
+
+    /**
+     * 通过调度任务日志ID查询调度信息
+     *
+     * @param patientId 调度任务日志ID
+     * @return 调度任务日志对象信息
+     */
+    @Override
+    public PatientManage selectPatientById(Long patientId) {
+        return patientManageMapper.selectPatientById(patientId);
+    }
 }

ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml

@@ -11,17 +11,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="patientSex"    column="patient_sex"    />
         <result property="patientIdCard"    column="patient_id_card"    />
         <result property="description"    column="description"    />
-        <result property="currentPosition"    column="current_position"    />
+        <result property="currentLocation"    column="current_location"    />
         <result property="temperature"    column="temperature"    />
         <result property="diagnosedTime"    column="diagnosed_time"    />
         <result property="isDiagnosed"    column="is_diagnosed"    />
-        <result property="isCure"    column="is_cure"    />
         <result property="isTouch"    column="is_touch"    />
-        <result property="isDead"    column="is_dead"    />
+        <result property="isHigh"    column="is_high"    />
     </resultMap>
 
     <sql id="selectPatientManageVo">
-        select patient_id, patient_name, patient_age, patient_sex, patient_id_card, description, current_position, temperature, diagnosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage
+        select patient_id, patient_name, patient_age, patient_sex, patient_id_card, description, current_location, temperature, diagnosed_time, is_diagnosed,  is_touch, is_high from patient_manage
     </sql>
 
     <select id="selectPatientManageList" parameterType="PatientManage" resultMap="PatientManageResult">
@@ -32,13 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null  and patientSex != ''"> and patient_sex = #{patientSex}</if>
             <if test="patientIdCard != null  and patientIdCard != ''"> and patient_id_card = #{patientIdCard}</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="currentPosition != null  and currentPosition != ''"> and current_position = #{currentPosition}</if>
+            <if test="currentLocation != null  and currentLocation != ''"> and current_location = #{currentLocation}</if>
             <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</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>
-            <if test="isDead != null "> and is_dead = #{isDead}</if>
+            <if test="isHigh != null "> and is_high = #{isHigh}</if>
         </where>
     </select>
     
@@ -55,13 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">patient_sex,</if>
             <if test="patientIdCard != null">patient_id_card,</if>
             <if test="description != null">description,</if>
-            <if test="currentPosition != null">current_position,</if>
+            <if test="currentLocation != null">current_location,</if>
             <if test="temperature != null">temperature,</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>
-            <if test="isDead != null">is_dead,</if>
+            <if test="isHigh != null">is_dead,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="patientName != null">#{patientName},</if>
@@ -69,13 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">#{patientSex},</if>
             <if test="patientIdCard != null">#{patientIdCard},</if>
             <if test="description != null">#{description},</if>
-            <if test="currentPosition != null">#{currentPosition},</if>
+            <if test="currentLocation != null">#{currentLocation},</if>
             <if test="temperature != null">#{temperature},</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>
-            <if test="isDead != null">#{isDead},</if>
+            <if test="isHigh != null">#{isHigh},</if>
          </trim>
     </insert>
 
@@ -87,13 +83,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientSex != null">patient_sex = #{patientSex},</if>
             <if test="patientIdCard != null">patient_id_card = #{patientIdCard},</if>
             <if test="description != null">description = #{description},</if>
-            <if test="currentPosition != null">current_position = #{currentPosition},</if>
+            <if test="currentLocation != null">current_location = #{currentLocation},</if>
             <if test="temperature != null">temperature = #{temperature},</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>
-            <if test="isDead != null">is_dead = #{isDead},</if>
+            <if test="isHigh != null">is_dead = #{isHigh},</if>
         </trim>
         where patient_id = #{patientId}
     </update>
@@ -112,4 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPatientManageVo"/>
         where patient_id_card = #{patientIdCard}
     </select>
+    <select id="selectPatientById" parameterType="Long" resultMap="PatientManageResult">
+        <include refid="selectPatientManageVo"/>
+        where  patient_id= #{patientId}
+    </select>
 </mapper>