|
@@ -291,7 +291,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
var diagnosisItems = new List<EnumItemDTO>();
|
|
|
//病灶
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(DiagnosisBreastLabelEnum), "Breast", new List<string> { "BIRads1" }));
|
|
|
- diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "Liver", new List<string> { "BIRads1" }, prefix: "Liver"));
|
|
|
+ diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "Liver", new List<string> { "BIRads1" }));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(AIThyroidLabelEnum), "Thyroid", new List<string> { "TIRADS0" }));
|
|
|
//病灶特性描述
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesShapeValue)));
|
|
@@ -300,18 +300,18 @@ namespace WingAIDiagnosisService.Service
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesLesionBoundaryValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesMarginValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumCalcificationsValue), "Calcification"));
|
|
|
- diagnosisItems.Add(GetEnumItem(typeof(EnumDesLiverShapeValue), prefix: "LiveShape"));
|
|
|
+ diagnosisItems.Add(GetEnumItem(typeof(EnumDesLiverShapeValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesLiverBoundaryValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesLiverEchoTextureValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesThyroidEchoPatternValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesThyroidShapeValue)));
|
|
|
- diagnosisItems.Add(GetEnumItem(typeof(EnumDesThyroidMarginValue), prefix: "Thyroid"));
|
|
|
+ diagnosisItems.Add(GetEnumItem(typeof(EnumDesThyroidMarginValue)));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(EnumDesThyroidEchogenicFociValue)));
|
|
|
//局灶和弥漫区分
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(DiagnosisBreastLabelEnum), "BreastLocalLesion", includeFields: new List<string> { "Lipomyoma", "BIRads2", "BIRads3" }));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(DiagnosisBreastLabelEnum), "BreastDiffuseLesion", includeFields: new List<string> { "BIRads4A", "BIRads4B", "BIRads4C", "BIRads5" }));
|
|
|
- diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "LiverLocalLesion", includeFields: new List<string> { "Hyperechoic", "HHE", "CYST", "PossibleCancer" }, prefix: "Liver"));
|
|
|
- diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "LiverDiffuseLesion", includeFields: new List<string> { "FattyLiver", "DiffuseLesions", "Cirrhosis", "PCLD" }, prefix: "Liver"));
|
|
|
+ diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "LiverLocalLesion", includeFields: new List<string> { "Hyperechoic", "HHE", "CYST", "PossibleCancer" }));
|
|
|
+ diagnosisItems.Add(GetEnumItem(typeof(DiagnosisLiverLabelEnum), "LiverDiffuseLesion", includeFields: new List<string> { "FattyLiver", "DiffuseLesions", "Cirrhosis", "PCLD" }));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(AIThyroidLabelEnum), "ThyroidLocalLesion", includeFields: new List<string> { "TIRADS2", "TIRADS3", "TIRADS4a", "TIRADS4b", "TIRADS4c", "TIRADS5" }));
|
|
|
diagnosisItems.Add(GetEnumItem(typeof(AIThyroidLabelEnum), "ThyroidDiffuseLesion", includeFields: new List<string> { "DiffuseDisease" }));
|
|
|
|
|
@@ -319,7 +319,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
return await Task.FromResult(resultData);
|
|
|
}
|
|
|
|
|
|
- private EnumItemDTO GetEnumItem(Type enumType, string keyCode = "", List<string> excludeFields = null, List<string> includeFields = null, string prefix = "")
|
|
|
+ private EnumItemDTO GetEnumItem(Type enumType, string keyCode = "", List<string> excludeFields = null, List<string> includeFields = null)
|
|
|
{
|
|
|
keyCode = !string.IsNullOrWhiteSpace(keyCode) ? keyCode : enumType.Name.ToString().Replace("EnumDes", "").Replace("Enum", "").Replace("Value", "");
|
|
|
var enumNames = Enum.GetNames(enumType).ToList();
|
|
@@ -335,10 +335,15 @@ namespace WingAIDiagnosisService.Service
|
|
|
foreach (var val in enumNames)
|
|
|
{
|
|
|
var id = (int)enumType.GetField(val).GetValue(val);
|
|
|
+ var fieldValue = val.ToString();
|
|
|
+ if (enumType == typeof(DiagnosisLiverLabelEnum) && fieldValue == "Hyperechoic")
|
|
|
+ {
|
|
|
+ fieldValue = "LiverHyperechoic";
|
|
|
+ }
|
|
|
children.Add(new EnumFieldDTO
|
|
|
{
|
|
|
Id = id,
|
|
|
- Value = $"{prefix}{val}",
|
|
|
+ Value = fieldValue,
|
|
|
});
|
|
|
}
|
|
|
return new EnumItemDTO
|