diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CheckManageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CheckManageController.java index 3c17544..a9a4cd9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CheckManageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CheckManageController.java @@ -1,10 +1,13 @@ package com.ruoyi.web.controller; import java.util.List; + +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; 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 2247d2c..633c821 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 @@ -1,10 +1,13 @@ package com.ruoyi.web.controller; import java.util.List; + +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -73,8 +76,13 @@ public class PatientManageController extends BaseController @Log(title = "患者管理", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(PatientManage patientManage) + public AjaxResult addSave(@Validated PatientManage patientManage) { + + if (StringUtils.isNotEmpty(patientManage.getPatientIdCard()) && !patientManageService.checkPatientIdCardUnique(patientManage)) + { + return error("新增患者'" + patientManage.getPatientName() + "'失败,身份证已存在"); + } return toAjax(patientManageService.insertPatientManage(patientManage)); } @@ -99,6 +107,10 @@ public class PatientManageController extends BaseController @ResponseBody public AjaxResult editSave(PatientManage patientManage) { + if (StringUtils.isNotEmpty(patientManage.getPatientIdCard()) && !patientManageService.checkPatientIdCardUnique(patientManage)) + { + return error("新增患者'" + patientManage.getPatientName() + "'失败,身份证已存在"); + } return toAjax(patientManageService.updatePatientManage(patientManage)); } 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 597a6ed..e14607b 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html @@ -122,20 +122,28 @@ checkName:{ isName:true, }, - currentPosition:{ - }, - healthState:{ - }, - checkDatetime:{ - }, temperature:{ isTemperature:true }, checkPhonenumber:{ isPhone:true, + remote: { + url: prefix + "/checkPatientIdCardUnique", + type: "post", + dataType: "json", + data: { + "checkPhonenumber": function () { + return $.common.trim($("#checkPhonenumber").val()); + } + } + }, }, - description: { + messages: { + "checkPhonenumber":{ + remote: "电话号码已经存在" + } }, + }, @@ -167,8 +175,8 @@ maximumAge : 1000 } if (navigator.geolocation) { - //浏览器支持geolocation - navigator.geolocation.getcurrentPosition(onSuccess, onError, options); + //浏览器支持geolocationC + navigator.geolocation.getCurrentPosition(onSuccess, onError, options); } else { //浏览器不支持geolocation alert('您的浏览器不支持地理位置定位'); 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 b05d701..ebc3e78 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html @@ -19,7 +19,7 @@ -