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

controllers/zh/zh_his_api_controller.go

@@ -865,7 +865,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(record.PatientId, 10)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
-	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+	department, _ := service.GetDepartMentDetail(record.Departments)
 	strconv.FormatInt(record.PatientId, 10)
 
 	client := &http.Client{}
@@ -875,7 +875,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	data["org_name"] = miConfig.OrgName
 	data["doctor"] = roles.UserName
 	data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
-	data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
+	data["dept"] = strconv.FormatInt(department.ID, 10)
 	data["fixmedins_code"] = miConfig.Code
 	if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
 		data["dept_code"] = "15"