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 306e13c..2247d2c 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 @@ -149,4 +149,15 @@ public class PatientManageController extends BaseController return util.exportExcel(list, "患者管理数据"); } + /** + * 展示详细信息 + */ + @RequiresPermissions("patient:patientManage:detail") + @GetMapping("/detail/{patientId}") + public String detail(@PathVariable("patientId") Long patientId, ModelMap mmap) + { + mmap.put("name", "patientManage"); + mmap.put("patientManage", patientManageService.selectPatientById(patientId)); + return prefix + "/detail"; + } } 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 9ba02f4..597a6ed 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/add.html @@ -133,11 +133,12 @@ }, checkPhonenumber:{ isPhone:true, - } - }, - description: { + }, + description: { + }, }, + }); function submitCheck () { if ($.validate.form()) { @@ -167,7 +168,7 @@ } if (navigator.geolocation) { //浏览器支持geolocation - navigator.geolocation.getCurrentPosition(onSuccess, onError, options); + navigator.geolocation.getcurrentPosition(onSuccess, onError, options); } else { //浏览器不支持geolocation alert('您的浏览器不支持地理位置定位'); 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 7d2a358..8ccfddd 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/checkManage.html @@ -18,10 +18,10 @@ -
  • - - -
  • + + + +
  • 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 ecaba4f..922dc1a 100644 --- a/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/check/checkManage/edit.html @@ -19,12 +19,7 @@ -
    - -
    - -
    -
    +
    @@ -32,12 +27,6 @@
    - -
    - -
    -
    -
    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 0c76eae..b05d701 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/add.html @@ -13,6 +13,12 @@
    +
    + +
    + +
    +
    @@ -22,7 +28,7 @@
    - +
    @@ -34,7 +40,7 @@
    - +
    @@ -52,6 +58,31 @@
    +
    + +
    + +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    @@ -64,7 +95,13 @@ function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize()); + var data = $("#form-patientManage-add").serializeArray(); + var isTouch = $("input[id='isTouch']").is(':checked') == true ? 0 : 1; + var isHigh = $("input[id='isHigh']").is(':checked') == true ? 0 : 1; + data.push({"patientName": "isTouch", "value": isTouch}); + data.push({"patientName": "isHigh", "value": isHigh}); + $.operate.saveTab(prefix+"/add", data); + // $.operate.save(prefix + "/add", $('#form-patientManage-add').serialize()); } } diff --git a/ruoyi-admin/src/main/resources/templates/patient/patientManage/detail.html b/ruoyi-admin/src/main/resources/templates/patient/patientManage/detail.html new file mode 100644 index 0000000..61f6a13 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/detail.html @@ -0,0 +1,81 @@ + + + + + + +
    + +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + + + +
    + +
    +
    + + +
    + +
    +
    + + + +
    + +
    +
    + + +
    + +
    +
    + + + + + + + + + + + + + + +
    + +
    +
    + + +
    + +
    + + + + \ No newline at end of file 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 0b7dc45..9e9f2a5 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/edit.html @@ -15,9 +15,9 @@
    - +
    - +
    @@ -35,7 +35,7 @@
    - +
    @@ -53,7 +53,31 @@
    - +
    + +
    + +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    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 385964e..696ff4d 100644 --- a/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html +++ b/ruoyi-admin/src/main/resources/templates/patient/patientManage/patientManage.html @@ -19,16 +19,12 @@
  • - - -
  • -
  • - +
  • @@ -72,6 +68,7 @@