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

controllers/sg/his_api_controller.go

@@ -4552,6 +4552,7 @@ func (c *HisApiController) GetSettleAccounts() {
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
 	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	patient, _ := service.GetPatientByIDTwo(adminUser.CurrentOrgId, order.PatientId)
 
 	//var config []*models.HisXtDiagnoseConfig
 	var name string
@@ -4706,6 +4707,46 @@ func (c *HisApiController) GetSettleAccounts() {
 		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
 
+		patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
+		adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+
+		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
+		var doctor_name string
+		if roles.ID == 0 {
+			doctor_name = "管理员"
+		} else {
+			doctor_name = roles.UserName
+		}
+
+		yiliao_leibie := ""
+
+		switch order.MedType {
+		case "11":
+			yiliao_leibie = "普通门诊"
+			break
+		case "12":
+			yiliao_leibie = "门诊挂号"
+			break
+		case "13":
+			yiliao_leibie = "急诊"
+			break
+		case "14":
+			yiliao_leibie = "门诊特殊病"
+			break
+		case "15":
+			yiliao_leibie = "门诊统筹"
+			break
+		case "16":
+			yiliao_leibie = "门诊慢性病"
+			break
+		case "21":
+			yiliao_leibie = "普通住院"
+			break
+		}
+
+		departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+
 		if res.Infcode == 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"diagnosis":                                   name,
@@ -4742,6 +4783,16 @@ 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,
 			})
 		}
 	}