From 40d80db03e4ed5f6b64aae1e56270c4be98a598b Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Tue, 25 Feb 2025 17:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientInformationController.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index da0377c2..611844c7 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java @@ -71,7 +71,7 @@ public class PatientInformationController { // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), + String fullAddress = stringUtils.joinStrings(patient.getAddress(),patient.getAddressProvince(), patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet()); patient.setAddress(fullAddress); @@ -103,7 +103,7 @@ public class PatientInformationController { // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), + String fullAddress = stringUtils.joinStrings(patient.getAddress(),patient.getAddressProvince(), patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet()); patient.setAddress(fullAddress); @@ -117,24 +117,6 @@ public class PatientInformationController { return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"病人信息"})); } - /** - * 删除病人信息 - * - * @param id 主表id - */ - // todo 删除需要么？或者逻辑删除后续再改 - @DeleteMapping("/patient-information") - public R deletePatient(@RequestParam Long id) { - - boolean deleteSuccess = patientService.removeById(id); - - if (!deleteSuccess) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); - } - - return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"病人信息"})); - } - /** * 分页查询病人信息,可选条件 *