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 633c821..bbd37af 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 @@ -172,4 +172,49 @@ public class PatientManageController extends BaseController mmap.put("patientManage", patientManageService.selectPatientById(patientId)); return prefix + "/detail"; } + /** + * 校验身份证 + */ + @PostMapping("/checkPatientIdCardUnique") + @ResponseBody + public boolean checkPatientIdCardUnique(PatientManage user) + { + return patientManageService.checkPatientIdCardUnique(user); + } + /** + * 患者移交治愈管理 + */ + @RequiresPermissions("patient:patientManage:cure") + @GetMapping("/cure/{patientId}") + public String cure(@Validated Long patientId) + { + return prefix + "/cure"; + } + /** + * 患者移交死亡管理 + */ + @RequiresPermissions("patient:patientManage:dead") + @GetMapping("/dead/{patientId}") + public String dead(@Validated Long patientId) + { + return prefix + "/dead"; + } + /** + * 患者移交密接管理 + */ + @RequiresPermissions("patient:patientManage:touch") + @GetMapping("/touch/{patientId}") + public String touch(@Validated Long patientId) + { + return prefix + "/touch"; + } + /** + * 患者移交重症管理 + */ + @RequiresPermissions("patient:patientManage:emergency") + @GetMapping("/emergency/{patientId}") + public String emergency (@Validated Long patientId) + { + return prefix + "/emergency"; + } } 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 e14607b..44b6b68 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html @@ -63,22 +63,25 @@
-
+
-
- +
+ +
- -
- -
+
+
+ +
+ + +
+
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 8ccfddd..677e55b 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html @@ -16,7 +16,7 @@
  • - +
    • @@ -76,7 +76,7 @@ exportUrl: prefix + "/export", importUrl: prefix + "/importData", importTemplateUrl: prefix + "/importTemplate", - modalName: "打卡管理", + modalName: "打卡信息", columns: [{ checkbox: true }, 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 922dc1a..72c26d8 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html @@ -16,20 +16,26 @@
    - +
    - + +
    - + +
    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 ebc3e78..953fa45 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html @@ -13,10 +13,21 @@
    -
    - -
    - + + + + + + +
    +
    + +
    + + +
    @@ -46,7 +57,7 @@
    - +
    @@ -58,36 +69,43 @@
    -
    +
    -
    - +
    + +
    -
    - -
    +
    + + +
    -
    - -
    -
    - - +
    + +
    + + +
    + +
    + +
    -
    - \ No newline at end of file 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 7f04410..4efda1f 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 @@ -36,12 +36,12 @@ public class CheckManage extends BaseEntity private String healthState; /** 是否去过高风险地区 */ - @Excel(name = "是否去过高风险地区" ,readConverterExp = "0=否，1=是，2=未知") - private Integer isHigh; + @Excel(name = "是否去过高风险地区" ,readConverterExp = "0=否，1=是") + private String isHigh; /** 是否接触过密接人员 */ - @Excel(name = "是否接触过密接人员",readConverterExp = "0=否，1=是，2=未知") - private Integer isTouch; + @Excel(name = "是否接触过密接人员",readConverterExp = "0=否，1=是") + private String isTouch; /** 备注 */ @Excel(name = "备注") @@ -97,21 +97,21 @@ public class CheckManage extends BaseEntity { return healthState; } - public void setIsHigh(Integer isHigh) + public void setIsHigh(String isHigh) { this.isHigh = isHigh; } - public Integer getIsHigh() + public String getIsHigh() { return isHigh; } - public void setIsTouch(Integer isTouch) + public void setIsTouch(String isTouch) { this.isTouch = isTouch; } - public Integer getIsTouch() + public String getIsTouch() { return isTouch; } 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 c13aaa0..643f409 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=女,2=未知") + @Excel(name = "患者性别" ,readConverterExp = "0=女,1=男") private String patientSex; /** 患者身份证 */ @@ -56,17 +56,21 @@ public class PatientManage extends BaseEntity @Excel(name = "感染时间", width = 30, dateFormat = "yyyy-MM-dd") private Date diagnosedTime; - /** 确诊状态 */ - @Excel(name = "确诊状态") - private Integer isDiagnosed; + /** 重症状态 */ + @Excel(name = "重症状态" ,readConverterExp = "0=否,1=是") + private String isEmergency; /** 密接状态 */ - @Excel(name = "密接状态") - private Integer isTouch; + @Excel(name = "密接状态" ,readConverterExp = "0=否,1=是") + private String isTouch; + + /** 死亡状态 */ + @Excel(name = "死亡状态" ,readConverterExp = "0=否,1=是") + private String isDead; /** 是否去高风险地区 */ - @Excel(name = "是否去高风险地区") - private Integer isHigh; + @Excel(name = "是否去高风险地区",readConverterExp = "0=否,1=是") + private String isHigh; public void setPatientId(Long patientId) { @@ -149,34 +153,42 @@ public class PatientManage extends BaseEntity { return diagnosedTime; } - public void setIsDiagnosed(Integer isDiagnosed) + public void setIsEmergency(String isEmergency) { - this.isDiagnosed = isDiagnosed; + this.isEmergency = isEmergency; } - public Integer getIsDiagnosed() + public String getIsEmergency() { - return isDiagnosed; + return isEmergency; } - public void setIsTouch(Integer isTouch) + public void setIsTouch(String isTouch) { this.isTouch = isTouch; } - public Integer getIsTouch() + public String getIsTouch() { return isTouch; } - public void setIsHigh(Integer isHigh) + public void setIsHigh(String isHigh) { this.isHigh = isHigh; } - public Integer getIsHigh() + public String getIsHigh() { return isHigh; } + public String getIsDead() { + return isDead; + } + + public void setIsDead(String isDead) { + this.isDead = isDead; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -189,9 +201,10 @@ public class PatientManage extends BaseEntity .append("currentLocation", getCurrentLocation()) .append("temperature", getTemperature()) .append("diagnosedTime", getDiagnosedTime()) - .append("isDiagnosed", getIsDiagnosed()) + .append("isEmergency", getIsEmergency()) .append("isTouch", getIsTouch()) .append("isHigh", getIsHigh()) + .append("isDead", getIsDead()) .toString(); } } diff --git a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml index 5277558..eaa3c35 100644 --- a/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/CheckManageMapper.xml @@ -18,7 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select check_manage_id, check_name, temperature, health_state, is_high, is_touch, description, check_datetime, current_position, check_phonenumber + 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 + ,description, check_datetime, current_position, check_phonenumber from check_manage diff --git a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml index 57326c2..ad5e901 100644 --- a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml @@ -14,13 +14,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + - 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 + select patient_id, patient_name, patient_age, CASE patient_sex WHEN '1' 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 + from patient_manage @@ -56,9 +64,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" current_location, temperature, diagnosed_time, - is_diagnosed, + is_emergency, is_touch, is_high, + is_dead, #{patientName}, @@ -69,9 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{currentLocation}, #{temperature}, #{diagnosedTime}, - #{isDiagnosed}, + #{isEmergency}, #{isTouch}, #{isHigh}, + #{isDead}, @@ -86,9 +96,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" current_location = #{currentLocation}, temperature = #{temperature}, diagnosed_time = #{diagnosedTime}, - is_diagnosed = #{isDiagnosed}, + is_emergency = #{isEmergency}, is_touch = #{isTouch}, is_high = #{isHigh}, + is_dead = #{isDead}, where patient_id = #{patientId}