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

controllers/sg/his_api_controller.go

@@ -2423,7 +2423,7 @@ func (c *HisApiController) GetBatchSettleList() {
 		struct4101.IteminfoStruct = iteminfoStructs
 		struct4101.Ntly = "中国"
 		struct4101.AdmCaty = "A03.06"
-		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, c.GetAdminUserInfo().CurrentOrgId)
 		fmt.Println(result)
 
 		var dat map[string]interface{}