From 0a4de1559979b171885a4df8e8eaa02a271a3a5a Mon Sep 17 00:00:00 2001 From: qk123 <18211963828@163.com> Date: Tue, 23 Dec 2025 10:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B8=B8=E7=94=A8=E8=AF=AD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BB=B4=E6=8A=A4->=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=9B=E6=A3=80=E6=9F=A5=E6=96=B9=E6=B3=95?= =?UTF-8?q?,=E9=83=A8=E4=BD=8D=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IDoctorPhraseAppService.java | 2 +- .../impl/DoctorPhraesAppServiceImpl.java | 4 +- .../controller/DoctorPhraseController.java | 5 +- .../doctorstation/doctorphrase/index.vue | 96 +++++++++++++++++++ .../checkprojectSettings/index.vue | 24 +++-- 5 files changed, 120 insertions(+), 11 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java index cae5105b..e92d932a 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java @@ -6,7 +6,7 @@ import com.openhis.template.domain.DoctorPhrase; public interface IDoctorPhraseAppService { R getDoctorPhraseList(); - R searchDoctorPhraseList(String phraseType); + R searchDoctorPhraseList(String phraseName ,String phraseType); R addDoctorPhrase(DoctorPhrase doctorPhrase); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java index 12dcc61c..5a81c4ae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java @@ -24,14 +24,14 @@ public class DoctorPhraesAppServiceImpl implements IDoctorPhraseAppService { } @Override - public R searchDoctorPhraseList(String phraseType) { + public R searchDoctorPhraseList(String phraseName,String phraseType) { //1.数据校验 if (phraseType == null || phraseType.equals("")) { return R.fail("模板类型不能为空"); } //2.查询 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(DoctorPhrase::getPhraseType, phraseType); + wrapper.eq(DoctorPhrase::getPhraseName, phraseName).eq(DoctorPhrase::getPhraseType, phraseType); List list = doctorPhraseService.list(wrapper); return R.ok(list); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java index 0089198a..5133ab70 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java @@ -34,9 +34,10 @@ public class DoctorPhraseController { */ @GetMapping("/search") public R searchDoctorPhraseList( - @RequestParam(required = false) String phraseType + @RequestParam(required = false) String phraseType, + @RequestParam(required = false) String phraseName ){ - return R.ok(doctorPhraseAppService.searchDoctorPhraseList(phraseType)); + return R.ok(doctorPhraseAppService.searchDoctorPhraseList(phraseName,phraseType)); } /** diff --git a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue index e69de29b..bf5272aa 100644 --- a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue +++ b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue index a444a138..8e9e4225 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue @@ -328,15 +328,18 @@ -