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

controllers/sz/sz_his_api_controller.go

@@ -869,7 +869,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 						DoctorCode:         doctor_code,
 						Total:              detItemFeeSumamt,
 						DoseCode:           "",
-						Spec:               "",
+						Spec:               "次",
 					}
 					customs = append(customs, cus)
 				}
@@ -1523,6 +1523,11 @@ func (c *SZHisApiController) GetSettleAccounts() {
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
 
+	patient, _ := service.GetPatientByIDTwo(adminUser.CurrentOrgId, patient_id)
+
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+
 	if order.ID == 0 {
 		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 
@@ -1571,7 +1576,12 @@ func (c *SZHisApiController) GetSettleAccounts() {
 		}
 		if res.Transreturncode == "00000000" {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"result": res,
+				"result":       res,
+				"org_name":     miConfig.OrgName,
+				"org_code":     miConfig.Code,
+				"patient_name": patient.Name,
+				"doctor_code":  adminRole_two.DoctorCode,
+				"doctor_name":  doctor_name,
 			})
 		} else {
 			c.ServeSuccessJSON(map[string]interface{}{