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

controllers/sg/his_api_controller.go

 			chrgBchno := rand.Intn(100000) + 10000
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
-			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+			department, _ := service.GetDepartMentDetail(department)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
 			IdCardNo := ""