diff --git a/openhis-server-new/core-system/pom.xml b/openhis-server-new/core-system/pom.xml
index 51fa2459..2ebe64b5 100644
--- a/openhis-server-new/core-system/pom.xml
+++ b/openhis-server-new/core-system/pom.xml
@@ -24,6 +24,10 @@
core-common
+
+ org.projectlombok
+ lombok
+
io.swagger
diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml
index 3aef36cd..196473e5 100644
--- a/openhis-server-new/openhis-application/pom.xml
+++ b/openhis-server-new/openhis-application/pom.xml
@@ -22,6 +22,11 @@
spring-boot-starter-actuator
+
+ org.projectlombok
+ lombok
+
+
org.springframework.boot
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
new file mode 100644
index 00000000..cae5105b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorPhraseAppService.java
@@ -0,0 +1,16 @@
+package com.openhis.web.doctorstation.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.template.domain.DoctorPhrase;
+
+public interface IDoctorPhraseAppService {
+ R> getDoctorPhraseList();
+
+ R> searchDoctorPhraseList(String phraseType);
+
+ R> addDoctorPhrase(DoctorPhrase doctorPhrase);
+
+ R> updateDoctorPhrase(DoctorPhrase doctorPhrase);
+
+ R> deleteDoctorPhrase(Integer doctorPhraseId);
+}
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
new file mode 100644
index 00000000..12dcc61c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorPhraesAppServiceImpl.java
@@ -0,0 +1,73 @@
+package com.openhis.web.doctorstation.appservice.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
+import com.openhis.template.domain.DoctorPhrase;
+import com.openhis.template.service.IDoctorPhraseService;
+import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class DoctorPhraesAppServiceImpl implements IDoctorPhraseAppService {
+
+ @Resource
+ private IDoctorPhraseService doctorPhraseService;
+
+ @Override
+ public R> getDoctorPhraseList() {
+ List list = doctorPhraseService.list();
+ return R.ok(list);
+ }
+
+ @Override
+ public R> searchDoctorPhraseList(String phraseType) {
+ //1.数据校验
+ if (phraseType == null || phraseType.equals("")) {
+ return R.fail("模板类型不能为空");
+ }
+ //2.查询
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(DoctorPhrase::getPhraseType, phraseType);
+ List list = doctorPhraseService.list(wrapper);
+ return R.ok(list);
+ }
+
+ @Override
+ public R> addDoctorPhrase(DoctorPhrase doctorPhrase) {
+ //1.数据校验
+ if(ObjectUtil.isEmpty(doctorPhrase)){
+ return R.fail("医生常用语不能为空");
+ }
+ //2.新增
+ boolean save = doctorPhraseService.save(doctorPhrase);
+ return R.ok(save);
+ }
+
+ @Override
+ public R> updateDoctorPhrase(DoctorPhrase doctorPhrase) {
+ //1.数据校验
+ if(ObjectUtil.isEmpty(doctorPhrase)){
+ return R.fail("医生常用语不能为空");
+ }
+ //2.更新
+ boolean updateById = doctorPhraseService.updateById(doctorPhrase);
+ return R.ok(updateById);
+ }
+
+ @Override
+ public R> deleteDoctorPhrase(Integer doctorPhraseId) {
+ //1.数据校验
+ if(doctorPhraseId == null){
+ return R.fail("ID不能为空");
+ }
+ //2.删除
+ boolean removeById = doctorPhraseService.removeById(doctorPhraseId);
+ return R.ok(removeById);
+ }
+
+
+}
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
new file mode 100644
index 00000000..0089198a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorPhraseController.java
@@ -0,0 +1,75 @@
+package com.openhis.web.doctorstation.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.template.domain.DoctorPhrase;
+import com.openhis.web.doctorstation.appservice.IDoctorPhraseAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Slf4j
+@RequestMapping("/Doctor-phrase")
+public class DoctorPhraseController {
+
+ @Resource
+ private IDoctorPhraseAppService doctorPhraseAppService;
+
+ /**
+ * 获取医生常用语List
+ *
+ * @return 结果
+ */
+ @GetMapping("/list")
+ public R> getDoctorPhraseList(){
+ return R.ok(doctorPhraseAppService.getDoctorPhraseList());
+ }
+
+ /**
+ * 查询医生常用语
+ *
+ * @param phraseType 模板级别
+ * @return 结果
+ */
+ @GetMapping("/search")
+ public R> searchDoctorPhraseList(
+ @RequestParam(required = false) String phraseType
+ ){
+ return R.ok(doctorPhraseAppService.searchDoctorPhraseList(phraseType));
+ }
+
+ /**
+ * 新增医生常用语
+ *
+ * @param doctorPhrase 医生常用语
+ * @return 结果
+ */
+ @PostMapping("/add")
+ public R> addDoctorPhrase(@RequestBody DoctorPhrase doctorPhrase){
+ return R.ok(doctorPhraseAppService.addDoctorPhrase(doctorPhrase));
+ }
+
+ /**
+ * 更新医生常用语
+ *
+ * @param doctorPhrase 医生常用语
+ * @return 结果
+ */
+ @PostMapping("/update")
+ public R> updateDoctorPhrase(@RequestBody DoctorPhrase doctorPhrase){
+ return R.ok(doctorPhraseAppService.updateDoctorPhrase(doctorPhrase));
+ }
+
+ /**
+ * 删除医生常用语
+ *
+ * @param DoctorPhraseId 医生常用语ID
+ * @return 结果
+ */
+ @PostMapping("/delete/{DoctorPhraseId}")
+ public R> deleteDoctorPhrase(@PathVariable Integer DoctorPhraseId){
+ return R.ok(doctorPhraseAppService.deleteDoctorPhrase(DoctorPhraseId));
+ }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java
new file mode 100644
index 00000000..d3be4752
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorPhraseAppMapper.java
@@ -0,0 +1,7 @@
+package com.openhis.web.doctorstation.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DoctorPhraseAppMapper {
+}
diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml
index 8cee3957..5c85af76 100644
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/openhis-common/pom.xml
@@ -21,6 +21,11 @@
httpclient
+
+ org.projectlombok
+ lombok
+
+
com.core
diff --git a/openhis-server-new/openhis-domain/pom.xml b/openhis-server-new/openhis-domain/pom.xml
index c91532e1..30eb17f7 100644
--- a/openhis-server-new/openhis-domain/pom.xml
+++ b/openhis-server-new/openhis-domain/pom.xml
@@ -18,6 +18,10 @@
+
+ org.projectlombok
+ lombok
+
com.alibaba.fastjson2
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
new file mode 100644
index 00000000..8a5dae76
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/DoctorPhrase.java
@@ -0,0 +1,59 @@
+package com.openhis.template.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName("adm_doctor_phrase")
+@EqualsAndHashCode(callSuper = false)
+public class DoctorPhrase {
+ /** id */
+ private Integer id;
+
+ /** 短语编码 */
+ private String phraseCode;
+
+ /** 模板名称 */
+ private String phraseName;
+
+ /** 模板级别(1-个人 2-科室 3-全院) */
+ private Integer phraseType;
+
+ /** 业务分类(主诉/现病史等) */
+ private String phraseCategory;
+
+ /** 模板内容 */
+ private String phraseContent;
+
+ /** 所属医生ID */
+ private Integer staffId;
+
+ /** 所属科室编码 */
+ private String deptCode;
+
+ /** 排序号 */
+ private Integer sortNo;
+
+ /** 启用状态(0-停用 1-启用) */
+ private Integer enableFlag;
+
+ /** 创建人ID */
+ private Integer creatorId;
+
+ /** 审核人ID */
+ private Integer auditorId;
+
+ /** 审核时间 */
+ private LocalDateTime auditTime;
+
+ /** 创建时间 */
+ private LocalDateTime createTime;
+
+ /** 更新时间 */
+ private LocalDateTime updateTime;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java
new file mode 100644
index 00000000..7c10b395
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/DoctorPhraseMapper.java
@@ -0,0 +1,9 @@
+package com.openhis.template.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.template.domain.DoctorPhrase;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DoctorPhraseMapper extends BaseMapper {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java
new file mode 100644
index 00000000..3bff4e9e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IDoctorPhraseService.java
@@ -0,0 +1,7 @@
+package com.openhis.template.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.template.domain.DoctorPhrase;
+
+public interface IDoctorPhraseService extends IService {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java
new file mode 100644
index 00000000..3d46209b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/DoctorPhraseServiceImpl.java
@@ -0,0 +1,12 @@
+package com.openhis.template.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.template.domain.DoctorPhrase;
+import com.openhis.template.mapper.DoctorPhraseMapper;
+import com.openhis.template.service.IDoctorPhraseService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class DoctorPhraseServiceImpl extends ServiceImpl implements IDoctorPhraseService {
+}
diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml
index 68d3afc6..7ec9ad17 100644
--- a/openhis-server-new/pom.xml
+++ b/openhis-server-new/pom.xml
@@ -38,7 +38,7 @@
9.0.96
1.2.13
- 1.18.38
+ 1.18.26
3.5.3
6.8.0
42.2.27
diff --git a/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue b/openhis-ui-vue3/src/views/doctorstation/doctorphrase/index.vue
new file mode 100644
index 00000000..e69de29b