解决合并冲突

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

@@ -0,0 +1,40 @@
+package com.openhis.clinical.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Data
+@TableName("cli_condition_no_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ConditionNoDefinition extends HisBaseEntity {
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 国临编码 */
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.clinical.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Repository
+public interface ConditionNoDefinitionMapper extends BaseMapper<ConditionNoDefinition> {
+
+}

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;
+
+}