diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html index d374f0f..0e64753 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html @@ -21,7 +21,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html index 54bdfff..141c47e 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html @@ -20,7 +20,7 @@
  • - +
  • @@ -113,7 +113,7 @@ title: '打卡人性别' }, { - field: 'patientPhone', + field: 'patientIdCard', title: '联系电话' }, { diff --git a/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html index d1b0a42..8b63072 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html @@ -22,7 +22,7 @@
    - +
    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 44e8fc6..40667eb 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html @@ -22,7 +22,7 @@
    - +
    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 1fe9f58..b18d535 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html @@ -23,7 +23,7 @@
    - +
    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 b0b4d0c..e92f831 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html @@ -19,8 +19,8 @@
  • - - + +
  • @@ -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: '治愈状态' 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 373517b..f241b45 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 @@ -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()) 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 493dd9c..9c94d8d 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 @@ -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()) diff --git a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml index c7ef69e..7839b74 100644 --- a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and patient_name like concat('%', #{patientName}, '%') and patient_age = #{patientAge} and patient_sex = #{patientSex} - and patient_phone = #{patientPhone} + and patient_id_card = #{patientIdCard} and description = #{description} and curren_postition = #{currentPosition} and temperature = #{temperature} @@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" patient_name, patient_age, patient_sex, - patient_phone, + patient_id_card, description, curren_postition, temperature, @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{patientName}, #{patientAge}, #{patientSex}, - #{patientPhone}, + #{patientIdCard}, #{description}, #{currentPosition}, #{temperature}, @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" patient_name = #{patientName}, patient_age = #{patientAge}, patient_sex = #{patientSex}, - patient_phone = #{patientPhone}, + patient_id_card = #{patientIdCard}, description = #{description}, curren_postition = #{currentPosition}, temperature = #{temperature},