解决合并冲突

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java

@@ -0,0 +1,14 @@
+package com.openhis.clinical.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+public interface IConditionNoDefinitionService extends IService<ConditionNoDefinition> {
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java

@@ -0,0 +1,25 @@
+package com.openhis.clinical.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.mapper.ConditionDefinitionMapper;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.clinical.service.IConditionNoDefinitionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.openhis.clinical.mapper.ConditionNoDefinitionMapper;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ConditionNoDefinitionServiceImpl extends ServiceImpl<ConditionNoDefinitionMapper, ConditionNoDefinition>
+    implements IConditionNoDefinitionService {
+    private final ConditionNoDefinitionMapper conditionNoDefinitionMapper;
+
+}