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 @@ -