调整患者管理模块

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

@@ -21,7 +21,7 @@
             <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">
+                    <input name="patientIdCard" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    

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

@@ -20,7 +20,7 @@
                             </li>
                             <li>
                                 <label>联系电话：</label>
-                                <input type="text" name="patientPhone"/>
+                                <input type="text" name="patientIdCard"/>
                             </li>
                             <li>
                                 <label>确诊状态：</label>
@@ -113,7 +113,7 @@
                     title: '打卡人性别'
                 },
                 {
-                    field: 'patientPhone',
+                    field: 'patientIdCard',
                     title: '联系电话'
                 },
                 {

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

@@ -22,7 +22,7 @@
             <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">
+                    <input name="patientIdCard" th:field="*{patientIdCard}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    

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

@@ -22,7 +22,7 @@
             <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">
+                    <input name="patientIdCard" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    

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

@@ -23,7 +23,7 @@
             <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">
+                    <input name="patientIdCard" th:field="*{patientIdCard}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    

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

@@ -19,8 +19,8 @@
                                 <input type="text" name="patientAge"/>
                             </li>
                             <li>
-                                <label>患者联系电话：</label>
+                                <label>患者身份证：</label>
-                                <input type="text" name="patientPhone"/>
+                                <input type="text" name="patientIdCard"/>
                             </li>
                             <li>
                                 <label>备注：</label>
@@ -101,7 +101,7 @@
                     title: '患者性别'
                 },
                 {
-                    field: 'patientPhone',
+                    field: 'patientIdCard',
                     title: '患者联系电话'
                 },
                 {
@@ -124,14 +124,6 @@
                     field: 'isDiagnosed',
                     title: '确诊状态'
                 },
-                    {
-                        visible: editFlag == 'hidden' ? false : true,
-                        title: '确诊状态',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            return statusTools(row);
-                        }
-                    },
                 {
                     field: 'isCure',
                     title: '治愈状态'

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

@@ -32,7 +32,7 @@ public class CheckManage extends BaseEntity
 
     /** 联系电话 */
     @Excel(name = "联系电话")
-    private String patientPhone;
+    private String patientIdCard;
 
     /** 确诊状态 */
     @Excel(name = "确诊状态")
@@ -98,14 +98,14 @@ public class CheckManage extends BaseEntity
     {
         return checkSex;
     }
-    public void setPatientPhone(String patientPhone) 
+    public void setPatientIdCard(String patientIdCard)
     {
-        this.patientPhone = patientPhone;
+        this.patientIdCard = patientIdCard;
     }
 
-    public String getPatientPhone() 
+    public String getPatientIdCard()
     {
-        return patientPhone;
+        return patientIdCard;
     }
     public void setIsDiagnosed(Integer isDiagnosed) 
     {
@@ -178,7 +178,7 @@ public class CheckManage extends BaseEntity
             .append("checkName", getCheckName())
             .append("checkAge", getCheckAge())
             .append("checkSex", getCheckSex())
-            .append("patientPhone", getPatientPhone())
+            .append("patientIdCard", getPatientIdCard())
             .append("isDiagnosed", getIsDiagnosed())
             .append("isCure", getIsCure())
             .append("isTouch", getIsTouch())

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

@@ -34,7 +34,7 @@ public class PatientManage extends BaseEntity
 
     /** 患者联系电话 */
     @Excel(name = "患者联系电话")
-    private String patientPhone;
+    private String patientIdCard;
 
     /** 备注 */
     @Excel(name = "备注")
@@ -105,14 +105,14 @@ public class PatientManage extends BaseEntity
     {
         return patientSex;
     }
-    public void setPatientPhone(String patientPhone) 
+    public void setPatientIdCard(String patientIdCard)
     {
-        this.patientPhone = patientPhone;
+        this.patientIdCard = patientIdCard;
     }
 
-    public String getPatientPhone() 
+    public String getPatientIdCard()
     {
-        return patientPhone;
+        return patientIdCard;
     }
     public void setDescription(String description) 
     {
@@ -194,7 +194,7 @@ public class PatientManage extends BaseEntity
             .append("patientName", getPatientName())
             .append("patientAge", getPatientAge())
             .append("patientSex", getPatientSex())
-            .append("patientPhone", getPatientPhone())
+            .append("patientIdCard", getPatientIdCard())
             .append("description", getDescription())
             .append("currentPosition", getCurrentPostition())
             .append("temperature", getTemperature())

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

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="checkName"    column="check_name"    />
         <result property="checkAge"    column="check_age"    />
         <result property="checkSex"    column="check_sex"    />
-        <result property="patientPhone"    column="patient_phone"    />
+        <result property="patientIdCard"    column="patient_id_card"    />
         <result property="isDiagnosed"    column="is_diagnosed"    />
         <result property="isCure"    column="is_cure"    />
         <result property="isTouch"    column="is_touch"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCheckManageVo">
-        select check_manage_id, check_name, check_age, check_sex, patient_phone, is_diagnosed, is_cure, is_touch, is_dead, description, check_postition, temperature from check_manage
+        select check_manage_id, check_name, check_age, check_sex, patient_id_card, is_diagnosed, is_cure, is_touch, is_dead, description, check_postition, temperature from check_manage
     </sql>
 
     <select id="selectCheckManageList" parameterType="CheckManage" resultMap="CheckManageResult">
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkName != null  and checkName != ''"> and check_name like concat('%', #{checkName}, '%')</if>
             <if test="checkAge != null  and checkAge != ''"> and check_age = #{checkAge}</if>
             <if test="checkSex != null "> and check_sex = #{checkSex}</if>
-            <if test="patientPhone != null  and patientPhone != ''"> and patient_phone = #{patientPhone}</if>
+            <if test="patientIdCard != null  and patientIdCard != ''"> and patient_id_card = #{patientIdCard}</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>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkName != null">check_name,</if>
             <if test="checkAge != null">check_age,</if>
             <if test="checkSex != null">check_sex,</if>
-            <if test="patientPhone != null">patient_phone,</if>
+            <if test="patientIdCard != null">patient_id_card,</if>
             <if test="isDiagnosed != null">is_diagnosed,</if>
             <if test="isCure != null">is_cure,</if>
             <if test="isTouch != null">is_touch,</if>
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkName != null">#{checkName},</if>
             <if test="checkAge != null">#{checkAge},</if>
             <if test="checkSex != null">#{checkSex},</if>
-            <if test="patientPhone != null">#{patientPhone},</if>
+            <if test="patientIdCard != null">#{patientIdCard},</if>
             <if test="isDiagnosed != null">#{isDiagnosed},</if>
             <if test="isCure != null">#{isCure},</if>
             <if test="isTouch != null">#{isTouch},</if>
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkName != null">check_name = #{checkName},</if>
             <if test="checkAge != null">check_age = #{checkAge},</if>
             <if test="checkSex != null">check_sex = #{checkSex},</if>
-            <if test="patientPhone != null">patient_phone = #{patientPhone},</if>
+            <if test="patientIdCard != null">patient_id_card = #{patientIdCard},</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>

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

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="patientName"    column="patient_name"    />
         <result property="patientAge"    column="patient_age"    />
         <result property="patientSex"    column="patient_sex"    />
-        <result property="patientPhone"    column="patient_phone"    />
+        <result property="patientIdCard"    column="patient_id_card"    />
         <result property="description"    column="description"    />
         <result property="currentPosition"    column="current_position"    />
         <result property="temperature"    column="temperature"    />
@@ -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, 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, curren_postition, temperature, diagnosed_time, is_diagnosed, is_cure, is_touch, is_dead from patient_manage
     </sql>
 
     <select id="selectPatientManageList" parameterType="PatientManage" resultMap="PatientManageResult">
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientName != null  and patientName != ''"> and patient_name like concat('%', #{patientName}, '%')</if>
             <if test="patientAge != null  and patientAge != ''"> and patient_age = #{patientAge}</if>
             <if test="patientSex != null  and patientSex != ''"> and patient_sex = #{patientSex}</if>
-            <if test="patientPhone != null  and patientPhone != ''"> and patient_phone = #{patientPhone}</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 curren_postition = #{currentPosition}</if>
             <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientName != null">patient_name,</if>
             <if test="patientAge != null">patient_age,</if>
             <if test="patientSex != null">patient_sex,</if>
-            <if test="patientPhone != null">patient_phone,</if>
+            <if test="patientIdCard != null">patient_id_card,</if>
             <if test="description != null">description,</if>
             <if test="currentPosition != null">curren_postition,</if>
             <if test="temperature != null">temperature,</if>
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientName != null">#{patientName},</if>
             <if test="patientAge != null">#{patientAge},</if>
             <if test="patientSex != null">#{patientSex},</if>
-            <if test="patientPhone != null">#{patientPhone},</if>
+            <if test="patientIdCard != null">#{patientIdCard},</if>
             <if test="description != null">#{description},</if>
             <if test="currentPosition != null">#{currentPosition},</if>
             <if test="temperature != null">#{temperature},</if>
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patientName != null">patient_name = #{patientName},</if>
             <if test="patientAge != null">patient_age = #{patientAge},</if>
             <if test="patientSex != null">patient_sex = #{patientSex},</if>
-            <if test="patientPhone != null">patient_phone = #{patientPhone},</if>
+            <if test="patientIdCard != null">patient_id_card = #{patientIdCard},</if>
             <if test="description != null">description = #{description},</if>
             <if test="currentPosition != null">curren_postition = #{currentPosition},</if>
             <if test="temperature != null">temperature = #{temperature},</if>