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 c5f75df0..7d046023 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 @@ -223,7 +223,7 @@ public class PatientInformationController { return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } - return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"病人信息"})); + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"})); } /** @@ -249,11 +249,7 @@ public class PatientInformationController { Page patientInformationPage = new Page<>(pageNo, pageSize, total); patientInformationPage.setRecords(listPatients); - if (patientInformationPage == null || patientInformationPage.getRecords().isEmpty()) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); - } - return R.ok(patientInformationPage, - MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"病人信息"})); + return R.ok(patientInformationPage); } } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml index 5f27675b..4ed1cb1d 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml @@ -42,12 +42,17 @@ - AND busNo LIKE CONCAT(#{busNo}, '%') + AND pt.busNo LIKE CONCAT('%',#{busNo}, '%') - AND name LIKE CONCAT(#{name}, '%') + AND pt.name LIKE CONCAT( '%', #{name}, '%') + + + + + AND pt.py_str LIKE CONCAT('%',#{name}, '%') ORDER BY pt.bus_no @@ -62,12 +67,16 @@ - AND busNo LIKE CONCAT(#{busNo}, '%') + AND pt.busNo LIKE CONCAT('%',#{busNo}, '%') - AND name LIKE CONCAT(#{name}, '%') + AND pt.name LIKE CONCAT('%',#{name}, '%') + + + + AND pt.py_str LIKE CONCAT('%',#{name}, '%')