diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs index fe90d831..4605c66d 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesDetailResponse.cs @@ -35,7 +35,7 @@ public class DishesDetailResponse /// /// 单价 /// - public decimal Price { get; set; } + public decimal? Price { get; set; } /// /// 剩余数量 @@ -53,7 +53,7 @@ public class DishesDetailResponse { return CurrentUnits.ToObject>(); } - return new () { "个" }; + return new() { "个" }; } } diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs index 14ff5703..ac48ebe3 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs @@ -108,7 +108,7 @@ public class DishesMenuService : IDishesMenuService CustomCode = dishes.CustomCode, Description = dishes.Description, ImageUrl = dishes.ImageUrl, - Price = dishes.Price, + Price = SqlFunc.IIF(x.Price > 0, x.Price, dishes.Price), Name = dishes.Name, Number = x.Number, CurrentUnits = dishes.Units.ToString()