|
@@ -9764,30 +9764,30 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
|
9764
|
9764
|
}
|
9765
|
9765
|
}
|
9766
|
9766
|
|
9767
|
|
- new_order_info := RemoveRepeatedTeam(orderInfos_four)
|
|
9767
|
+ //new_order_info := RemoveRepeatedTeam(orderInfos_four)
|
9768
|
9768
|
var cus_slice []CustomOrderInfo
|
9769
|
|
- for _, item := range new_order_info {
|
9770
|
|
- var cus CustomOrderInfo
|
9771
|
|
- cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
|
9772
|
|
- cus.Unit = ""
|
9773
|
|
- cus.Spec = ""
|
9774
|
|
- var total float64
|
9775
|
|
- for _, subItem := range orderInfos_four {
|
9776
|
|
- if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
|
9777
|
|
- total = total + subItem.DetItemFeeSumamt
|
9778
|
|
- fmt.Println(subItem.DetItemFeeSumamt)
|
9779
|
|
- }
|
9780
|
|
- }
|
9781
|
|
- cus.Count = 1
|
9782
|
|
- cus.Total = total
|
9783
|
|
- cus_slice = append(cus_slice, cus)
|
9784
|
|
- }
|
|
9769
|
+ //for _, item := range new_order_info {
|
|
9770
|
+ // var cus CustomOrderInfo
|
|
9771
|
+ // cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
|
|
9772
|
+ // cus.Unit = ""
|
|
9773
|
+ // cus.Spec = ""
|
|
9774
|
+ // var total float64
|
|
9775
|
+ // for _, subItem := range orderInfos_four {
|
|
9776
|
+ // if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
|
|
9777
|
+ // total = total + subItem.DetItemFeeSumamt
|
|
9778
|
+ // fmt.Println(subItem.DetItemFeeSumamt)
|
|
9779
|
+ // }
|
|
9780
|
+ // }
|
|
9781
|
+ // cus.Count = 1
|
|
9782
|
+ // cus.Total = total
|
|
9783
|
+ // cus_slice = append(cus_slice, cus)
|
|
9784
|
+ //}
|
9785
|
9785
|
|
9786
|
9786
|
orderInfos = append(orderInfos, orderInfos_two...)
|
9787
|
|
- if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
|
9788
|
|
- orderInfos = append(orderInfos, orderInfos_three...)
|
|
9787
|
+ //if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
|
|
9788
|
+ orderInfos = append(orderInfos, orderInfos_three...)
|
9789
|
9789
|
|
9790
|
|
- }
|
|
9790
|
+ //}/**/
|
9791
|
9791
|
|
9792
|
9792
|
patient, _ := service.GetPatientByID(org_id, order.PatientId)
|
9793
|
9793
|
c.ServeSuccessJSON(map[string]interface{}{
|