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

controllers/sg/his_api_controller.go

@@ -8935,6 +8935,8 @@ func (c *HisApiController) GetSettleAccounts() {
 		patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
 		adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
+		doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, his_hospital.Doctor)
+
 		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
 		var doctor_name string
@@ -9009,7 +9011,7 @@ func (c *HisApiController) GetSettleAccounts() {
 				"treatCostTotal":              treatCostTotal,
 				"treatCostSelfTotal":          treatCostSelfTotal,
 				"treatCostPartSelfTotal":      treatCostPartSelfTotal,
-				"doctor_info":                 adminRole_two,
+				"doctor_info":                 doctor_info,
 				"doctor_code":                 adminRole_two.DoctorCode,
 				"doctor_name":                 doctor_name,
 				"health_card_no":              order.PsnNo,