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

controllers/zh/zh_his_api_controller.go

@@ -881,7 +881,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	} else {
 		data["dept_code"] = department.Number
 	}
-	data["med_type"] = record.MedType
+	data["med_type"] = strconv.FormatInt(record.MedType, 10)
 	data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
 	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 	data["secret_key"] = miConfig.SecretKey