From 09b8ad1f7eea2f558b96cca94ac4c160fae5b2ac Mon Sep 17 00:00:00 2001 From: loser <12524321+loser111@user.noreply.gitee.com> Date: Sun, 14 May 2023 22:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=B2=BB=E6=84=88=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E7=A7=BB?= =?UTF-8?q?=E4=BA=A4=E5=AE=8C=E6=88=90=EF=BC=8C=E9=9D=A2=E5=AF=B9=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E5=B0=9A=E6=9C=AA?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PatientDeadController.java | 1 + .../web/controller/PatientManageController.java | 58 +++++++++++++ .../templates/patient/patientManage/addCure.html | 96 ++++++++++++++++++++++ .../templates/patient/patientManage/addDead.html | 96 ++++++++++++++++++++++ .../patient/patientManage/patientManage.html | 17 ++-- .../resources/templates/system/user/resetPwd.html | 2 +- .../java/com/ruoyi/system/domain/PatientCure.java | 4 +- .../java/com/ruoyi/system/domain/PatientDead.java | 4 +- .../com/ruoyi/system/domain/PatientManage.java | 4 +- .../ruoyi/system/mapper/PatientManageMapper.java | 19 +++++ .../system/service/IPatientManageService.java | 16 ++++ .../service/impl/PatientManageServiceImpl.java | 10 +++ .../main/resources/mapper/PatientCureMapper.xml | 1 + .../main/resources/mapper/PatientDeadMapper.xml | 1 + .../main/resources/mapper/PatientManageMapper.xml | 41 ++++++++- 15 files changed, 354 insertions(+), 16 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html create mode 100644 ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientDeadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientDeadController.java index 2f9c8ad..a8f08b4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientDeadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatientDeadController.java @@ -175,4 +175,5 @@ public class PatientDeadController extends BaseController { return patientDeadService.checkPatientIdCardUnique(patientDead); } + } 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 1fe1425..af96ab5 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 @@ -181,4 +181,62 @@ public class PatientManageController extends BaseController { return patientManageService.checkPatientIdCardUnique(user); } + + /** + * 添加患者信息至治愈管理 + */ + @RequiresPermissions("patient:patientManage:addCure") + @GetMapping("/addCure/{patientId}") + public String addCure(@PathVariable("patientId") Long patientId, ModelMap mmap) + { + PatientManage patientManage = patientManageService.selectPatientManageByPatientId(patientId); + mmap.put("patientManage", patientManage); + return prefix + "/addCure"; + } + + /** + * 添加患者信息至治愈管理 + */ + @RequiresPermissions("patient:patientManage:addCure") + @Log(title = "添加治愈患者", businessType = BusinessType.INSERT) + @PostMapping("/addCure") + @ResponseBody + public AjaxResult addCure(@Validated PatientManage patientManage) + { + + if (StringUtils.isNotEmpty(patientManage.getPatientIdCard()) && !patientManageService.checkPatientIdCardUnique(patientManage)) + { + return error("治愈患者'" + patientManage.getPatientName() + "'失败，身份证已存在"); + } + return toAjax(patientManageService.insertCurePatientManage(patientManage)); + } + + /** + * 添加患者信息至死亡管理 + */ + @RequiresPermissions("patient:patientManage:addCure") + @GetMapping("/addDead/{patientId}") + public String addDead(@PathVariable("patientId") Long patientId, ModelMap mmap) + { + PatientManage patientManage = patientManageService.selectPatientManageByPatientId(patientId); + mmap.put("patientManage", patientManage); + return prefix + "/addDead"; + } + + /** + * 添加患者信息至死亡管理 + */ + @RequiresPermissions("patient:patientManage:addDead") + @Log(title = "添加死亡患者", businessType = BusinessType.INSERT) + @PostMapping("/addDead") + @ResponseBody + public AjaxResult addDead(@Validated PatientManage patientManage) + { + + if (StringUtils.isNotEmpty(patientManage.getPatientIdCard()) && !patientManageService.checkPatientIdCardUnique(patientManage)) + { + return error("死亡患者'" + patientManage.getPatientName() + "'失败，身份证已存在"); + } + return toAjax(patientManageService.insertDeadPatientManage(patientManage)); + } } diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html new file mode 100644 index 0000000..ffa0ffb --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addCure.html @@ -0,0 +1,96 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ +
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+   + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html new file mode 100644 index 0000000..945d669 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/addDead.html @@ -0,0 +1,96 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ +
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+   + +
+
+
+
+ + + + + \ No newline at end of file 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 0cf5272..2cb539c 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html @@ -149,11 +149,11 @@ formatter: function(value, row, index) { var actions = []; - actions.push('详情 '); - actions.push('编辑 '); - actions.push('删除'); + actions.push('详情 ') + actions.push('编辑 ') + actions.push('删除') var more = []; - more.push("已治愈 "); + more.push("已治愈 ") more.push("已死亡"); actions.push('选择患者状态'); return actions.join(''); @@ -164,16 +164,17 @@ }); + /* 移交治愈 */ function cure(patientId) { - var url = ''+patientId; - location.href=url; + var url = prefix+'/addCure/'+patientId; + $.modal.openTab("分配用户", url); } /* 移交死亡 */ function dead(patientId) { - var url = prefix +'//'+patientId; - location.href=url; + var url = prefix +'/addDead/'+patientId; + $.modal.openTab("分配用户", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html b/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html index ec00812..17358b2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html @@ -33,7 +33,7 @@ }, focusCleanup: true }); - + function submitHandler() { if ($.validate.form()) { $.operate.save(ctx + "system/user/resetPwd", $('#form-user-resetPwd').serialize()); 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 b03c167..18ae1a0 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 @@ -61,8 +61,8 @@ public class PatientCure extends BaseEntity @Excel(name = "密接状态" ,readConverterExp = "0=非密接人员,1=密接人员") private String isTouch; - /** 死亡状态 */ - @Excel(name = "死亡状态" ,readConverterExp = "0=健在,1=已死亡") + /** 目前状况 */ + @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在") private String isDead; /** 是否去高风险地区 */ 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 14b76cd..fb15998 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 @@ -61,8 +61,8 @@ public class PatientDead extends BaseEntity @Excel(name = "密接状态" ,readConverterExp = "0=非密接人员,1=密接人员") private String isTouch; - /** 死亡状态 */ - @Excel(name = "死亡状态" ,readConverterExp = "0=健在,1=已死亡") + /** 目前状况 */ + @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在") private String isDead; /** 是否去高风险地区 */ 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 fcc1f03..5fa1d1c 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 @@ -64,8 +64,8 @@ public class PatientManage extends BaseEntity @Excel(name = "密接状态" ,readConverterExp = "0=非密接人员,1=密接人员") private String isTouch; - /** 死亡状态 */ - @Excel(name = "死亡状态" ,readConverterExp = "0=健在,1=已死亡") + /** 目前状况 */ + @Excel(name = "目前状况" ,readConverterExp = "0=已死亡,1=健在") private String isDead; /** 是否去高风险地区 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientManageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientManageMapper.java index 8f8fe8b..3f9e8a3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientManageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PatientManageMapper.java @@ -82,4 +82,23 @@ public interface PatientManageMapper * @return 患者信息 */ public PatientManage checkPatientIdCardUnique(String patientIdCard); + + /** + * 新增添加治愈患者管理 + * + * @param patientManage 患者管理 + * @return 结果 + */ + public int insertCurePatientManage(PatientManage patientManage); + + + /** + * 新增添加死亡患者管理 + * + * @param patientManage 患者管理 + * @return 结果 + */ + public int insertDeadPatientManage(PatientManage patientManage); + + } 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 fc63f20..d705f2d 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 @@ -83,4 +83,20 @@ public interface IPatientManageService */ public boolean checkPatientIdCardUnique(PatientManage patientManage); + /** + * 新增治愈患者管理 + * + * @param patientManage 患者管理 + * @return 结果 + */ + public int insertCurePatientManage(PatientManage patientManage); + + /** + * 新增治愈患者管理 + * + * @param patientManage 患者管理 + * @return 结果 + */ + public int insertDeadPatientManage(PatientManage patientManage); + } 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 38aeb7a..344401e 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 @@ -211,4 +211,14 @@ public class PatientManageServiceImpl implements IPatientManageService return UserConstants.UNIQUE; } + @Override + public int insertCurePatientManage(PatientManage patientManage) { + return patientManageMapper.insertCurePatientManage(patientManage); + } + + @Override + public int insertDeadPatientManage(PatientManage patientManage) { + return patientManageMapper.insertCurePatientManage(patientManage); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml b/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml index 6cf668b..54d4e9f 100644 --- a/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/PatientCureMapper.xml @@ -121,4 +121,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select patient_id, patient_id_card from patient_cure where patient_id_card=#{patientIdCard} + \ 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 fb6e248..3718c78 100644 --- a/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/PatientDeadMapper.xml @@ -121,4 +121,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select patient_id, patient_id_card from patient_dead where patient_id_card=#{patientIdCard} + \ 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 1170c7e..d2e1dd5 100644 --- a/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/PatientManageMapper.xml @@ -125,6 +125,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into patient_cure + + 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, + 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 ) + - + + insert into patient_dead + + 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, + + 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 ) + \ No newline at end of file