From 5755cac345e824c0b4feb7cf973a179eb10fe6cf Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期四, 17 七月 2025 11:47:04 +0800 Subject: [PATCH] fix: 修复订单年龄为空导致民航接口报错 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java index 1c907a9..c3bbec5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java @@ -146,8 +146,16 @@ Calendar calendar = Calendar.getInstance(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂� + + if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals("")) + { + model.setPtName(tbOrders.getPatientName()); // 鎮h�呭鍚� + } + else + { + model.setPtName("鎮h��"); // 闅忔満鐢熸垚鎮h�呭鍚� + } - model.setPtName(tbOrders.getPatientName()); // 鎮h�呭鍚� model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮h�呭勾榫� model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮h�呮�у埆 // model.setPtNat("涓浗"); // 璁剧疆鎮h�呭浗绫� @@ -229,9 +237,26 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂� - model.setPtName(tbOrders.getPatientName()); // 鎮h�呭鍚� - model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮h�呭勾榫� - model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮h�呮�у埆 + if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals("")) + { + model.setPtName(tbOrders.getPatientName()); // 鎮h�呭鍚� + } + else + { + model.setPtName("鎮h��"); // 闅忔満鐢熸垚鎮h�呭鍚� + } + + + + if(tbOrders.getAge()!=null && !tbOrders.getAge().equals("")) + { + model.setPtAge(tbOrders.getAge()); // 鎮h�呭勾榫� + } + else { + model.setPtAge("骞撮緞"); + } + + model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // model.setPtNat("涓浗"); // 璁剧疆鎮h�呭浗绫� model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌 model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌 -- Gitblit v1.9.1