Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -9009,20 +9009,20 @@ func (c *HisApiController) GetSettleAccounts() {
 				"treatCostTotal":              treatCostTotal,
 				"treatCostSelfTotal":          treatCostSelfTotal,
 				"treatCostPartSelfTotal":      treatCostPartSelfTotal,
-
-				"doctor_code":    adminRole_two.DoctorCode,
-				"doctor_name":    doctor_name,
-				"health_card_no": order.PsnNo,
-				"department":     departments.Name,
-				"yiliao_leibie":  yiliao_leibie,
-				"after_money":    order.AccountPrice,
-				"patient":        patient,
-				"org_name":       miConfig.OrgName,
-				"org_code":       miConfig.Code,
-				"order_number":   order.Number,
-				"his_hospital":   his_hospital,
-				"his":            his,
-				"dia_config":     dia_config,
+				"doctor_info":                 adminRole_two,
+				"doctor_code":                 adminRole_two.DoctorCode,
+				"doctor_name":                 doctor_name,
+				"health_card_no":              order.PsnNo,
+				"department":                  departments.Name,
+				"yiliao_leibie":               yiliao_leibie,
+				"after_money":                 order.AccountPrice,
+				"patient":                     patient,
+				"org_name":                    miConfig.OrgName,
+				"org_code":                    miConfig.Code,
+				"order_number":                order.Number,
+				"his_hospital":                his_hospital,
+				"his":                         his,
+				"dia_config":                  dia_config,
 
 				//"check_order_info":                            cus_slice,
 			})