csx 3 anni fa
parent
commit
b23983b00b
1 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 3 1
      controllers/his_api_controller.go

+ 3 - 1
controllers/his_api_controller.go Vedi File

5182
 	var treatCostPartSelfTotal float64 = 0 //治疗费用
5182
 	var treatCostPartSelfTotal float64 = 0 //治疗费用
5183
 
5183
 
5184
 	decimal.DivisionPrecision = 2
5184
 	decimal.DivisionPrecision = 2
5185
+	orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
5185
 
5186
 
5186
 	if his.BalanceAccountsType == 2 {
5187
 	if his.BalanceAccountsType == 2 {
5187
-		orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
5188
+		//orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
5188
 		for _, item := range orderInfos_two {
5189
 		for _, item := range orderInfos_two {
5189
 			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
5190
 			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
5190
 			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
5191
 			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
5359
 		"medfee_sumamt":                       order.MedfeeSumamt,       //总费用
5360
 		"medfee_sumamt":                       order.MedfeeSumamt,       //总费用
5360
 		"admin_user_name":                     admin.UserName,           //收款员
5361
 		"admin_user_name":                     admin.UserName,           //收款员
5361
 		"order":                               order,
5362
 		"order":                               order,
5363
+		"order_info":                          orderInfos_two,
5362
 		"his":                                 his,
5364
 		"his":                                 his,
5363
 		"bedCostTotal":                        bedCostTotal,
5365
 		"bedCostTotal":                        bedCostTotal,
5364
 		"bedCostSelfTotal":                    bedCostSelfTotal,
5366
 		"bedCostSelfTotal":                    bedCostSelfTotal,