Commit a18cb637 by 799284587@qq.com

bug修复

parent df0aea33
...@@ -1661,6 +1661,11 @@ ...@@ -1661,6 +1661,11 @@
实发绩效 实发绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.DoctorResponse.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.DtoModels.DrugpropResponse.MaxRange"> <member name="P:Performance.DtoModels.DrugpropResponse.MaxRange">
<summary> <summary>
药占比最大范围(小于) 药占比最大范围(小于)
...@@ -1816,6 +1821,11 @@ ...@@ -1816,6 +1821,11 @@
实发绩效 实发绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.NurseResponse.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.DtoModels.ResComputeResponse.ID"> <member name="P:Performance.DtoModels.ResComputeResponse.ID">
<summary> <summary>
......
...@@ -21,6 +21,8 @@ public class DoctorResponse ...@@ -21,6 +21,8 @@ public class DoctorResponse
/// </summary> /// </summary>
public Nullable<int> SheetID { get; set; } public Nullable<int> SheetID { get; set; }
public int UnitType { get; set; }
/// <summary> /// <summary>
/// 分组名称(医生、护士) /// 分组名称(医生、护士)
/// </summary> /// </summary>
......
...@@ -21,6 +21,7 @@ public class NurseResponse ...@@ -21,6 +21,7 @@ public class NurseResponse
/// </summary> /// </summary>
public Nullable<int> SheetID { get; set; } public Nullable<int> SheetID { get; set; }
public int UnitType { get; set; }
/// <summary> /// <summary>
/// 分组名称(医生、护士) /// 分组名称(医生、护士)
/// </summary> /// </summary>
......
...@@ -117,7 +117,7 @@ public List<DoctorResponse> GetDoctorPerformance(int allotId) ...@@ -117,7 +117,7 @@ public List<DoctorResponse> GetDoctorPerformance(int allotId)
{ {
var list = perforResaccountRepository.GetEntities(t => t.UnitType != (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit); var list = perforResaccountRepository.GetEntities(t => t.UnitType != (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
List<DoctorResponse> doctor = Mapper.Map<List<DoctorResponse>>(list); List<DoctorResponse> doctor = Mapper.Map<List<DoctorResponse>>(list);
doctor?.ForEach(t => t.UnitName = "医生组"); doctor?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
return doctor; return doctor;
} }
...@@ -130,7 +130,7 @@ public List<NurseResponse> GetNursePerformance(int allotId) ...@@ -130,7 +130,7 @@ public List<NurseResponse> GetNursePerformance(int allotId)
{ {
var list = perforResaccountRepository.GetEntities(t => t.UnitType == (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit); var list = perforResaccountRepository.GetEntities(t => t.UnitType == (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
List<NurseResponse> nurse = Mapper.Map<List<NurseResponse>>(list); List<NurseResponse> nurse = Mapper.Map<List<NurseResponse>>(list);
nurse?.ForEach(t => t.UnitName = "护理组"); nurse?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
return nurse; return nurse;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment