diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagnosisTreatmentManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagnosisTreatmentManageAppServiceImpl.java index 698656ce..23397452 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagnosisTreatmentManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagnosisTreatmentManageAppServiceImpl.java @@ -293,6 +293,9 @@ public class DiagnosisTreatmentManageAppServiceImpl implements IDiagnosisTreatme ActivityDefinition activityDefinition = new ActivityDefinition(); BeanUtils.copyProperties(diagnosisTreatmentUpDto, activityDefinition); + // 使用10位数基础采番 + String code = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_DEFINITION_NUM.getPrefix(), 10); + activityDefinition.setBusNo(code); // 拼音码 activityDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(activityDefinition.getName())); // 五笔码 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java index 36922f1f..0db963c1 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiseaseManageAppServiceImpl.java @@ -9,7 +9,9 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; +import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.ChineseConvertUtils; +import com.openhis.common.enums.AssignSeqEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,6 +49,8 @@ public class DiseaseManageAppServiceImpl implements IDiseaseManageAppService { private ConditionDefinitionMapper conditionDefinitionMapper; @Autowired private IConditionDefinitionService ConditionDefinitionService; + @Autowired(required = false) + AssignSeqUtil assignSeqUtil; /** * 病种目录初始化 @@ -191,6 +195,10 @@ public class DiseaseManageAppServiceImpl implements IDiseaseManageAppService { public R addDisease(DiseaseManageUpDto diseaseManageUpDto) { ConditionDefinition conditionDefinition = new ConditionDefinition(); BeanUtils.copyProperties(diseaseManageUpDto, conditionDefinition); + // 使用10位数基础采番 + String code = assignSeqUtil.getSeq(AssignSeqEnum.CONDITION_DEFINITION_NUM.getPrefix(), 10); + conditionDefinition.setConditionCode(code); + // 新增外来病种目录 conditionDefinition.setStatusEnum(PublicationStatus.DRAFT.getValue()); // 拼音码 diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java index 1a045d13..30bb37a0 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java @@ -68,7 +68,12 @@ public enum AssignSeqEnum { /** * 诊疗项目编码 */ - ACTIVITY_DEFINITION_NUM("11", "诊疗编码", "AD");; + ACTIVITY_DEFINITION_NUM("11", "诊疗编码", "AD"), + + /** + * 诊断定义编码 + */ + CONDITION_DEFINITION_NUM("11", "诊断编码", "CD"); private final String code; private final String info;