Merge remote-tracking branch 'origin/master'

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true
@@ -44,14 +44,16 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10028
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
-url  = "http://192.168.1.228:17001/szsi-portal/transData"
-#url = "http://192.168.1.88:6666/szsi-portal/transData"
+#url  = "http://192.168.1.228:17001/szsi-portal/transData"
+url = "http://192.168.1.88:6666/szsi-portal/transData"
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_paasid = "sg03_prd"
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh
@@ -149,9 +151,10 @@ sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
-org_id = 9538
+org_id = 4
 url  = "http://192.168.1.228:17001/szsi-portal/transData"
-
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
+gdyb_paasid = "test_hosp"
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root

controllers/base_api_controller.go

@@ -4,7 +4,6 @@ import (
 	"gdyb/enums"
 	"gdyb/models"
 	"github.com/astaxie/beego"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -96,83 +95,65 @@ func (this *BaseAuthAPIController) Prepare() {
 		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		this.SetSession("admin_user_info", &adminUserInfo)
-
 	}
 
-	//if this.Ctx.Request.Method != "GET" {
-	//	adminUserInfo := this.GetAdminUserInfo()
-	//
-	//	err := service.GetOrgSubscibeState(adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId])
-	//	if err != nil || adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId].State == 3 {
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSubscibe)
-	//		this.StopRun()
-	//	}
-	//}
-
-	//if this.Ctx.Request.Header.Get("Permission") == "1" {
-	//	isPermission := false
-	//
-	//	//adminUserInfo := this.GetAdminUserInfo()
-	//
-	//	//service.GetUserAllRole(adminUserInfo.CurrentOrgId)
-	//
-	//
-	//
+	//if this.Ctx.Request.Header.Get("Permission") == "5" { //医保相关权限
+	//	org_id, _ := beego.AppConfig.Int64("org_id")
+	//	org, _ := service.GetOrgById(org_id)
+	//	admin_user_id, _ := this.GetInt64("admin_user_id")
+	//	if admin_user_id != org.Creator { //超级管理员不受此限制
+	//		isPermission := false
+	//		//该机构下该用户有多少个
+	//		role, _ := service.GetUserAllRole(org_id, admin_user_id)
+	//		var roles []string
+	//		if len(role.RoleIds) <= 0 { //该用户没有设置角色
 	//
-	//	roles := []int64{1,2}		//模拟该用户有多少角色
-	//	var targetRole models.RolePurview
-	//	var userRolePurview []string
-	//
-	//	//用户角色1对应的权限
-	//	role1 := models.RolePurview{PurviewIds:"11,12,13"}
-	//
-	//	//用户角色2对应的权限
-	//	role2 := models.RolePurview{PurviewIds:"11,15,16"}
-	//
-	//
-	//	//模拟角色2
-	//	//判断该用户有多少个角色，合并最大角色权限
-	//	if len(roles) == 1{ //单个
-	//		targetRole = role1
-	//		userRolePurview = strings.Split(targetRole.PurviewIds, ",")
-	//
-	//	}else{ //多个
-	//		targetRole = role1
-	//		targetRole.PurviewIds = targetRole.PurviewIds + "," + role2.PurviewIds
-	//		userRolePurview = strings.Split(targetRole.PurviewIds, ",")
-	//	}
-	//
-	//	userRolePurview = RemoveRepeatedElement2(userRolePurview)
+	//		} else {
+	//			roles = strings.Split(role.RoleIds, ",")
+	//		}
+	//		fmt.Println(roles)
 	//
-	//	fmt.Println(userRolePurview)
-	//	//所有权限列表
-	//	allPermission := []models.Purview{{Id:10,Urlfor:"/m/api/dialysis/dialysisPrescription-/api/dialysis/prescription"},
-	//		{Id:11,Urlfor:"/m/api/dialysis/dialysisPrescription1-/api/dialysis/prescription1"},
-	//		{Id:12,Urlfor:"/m/api/dialysis/dialysisPrescription2-/api/dialysis/prescription2"},
-	//		{Id:13,Urlfor:"/m/api/dialysis/dialysisPrescription3-/api/dialysis/prescription3"},
-	//		{Id:14,Urlfor:"/m/api/dialysis/dialysisPrescription4-/api/dialysis/prescription4"},
-	//		{Id:15,Urlfor:"/m/api/dialysis/dialysisPrescription5-/api/dialysis/prescription5"},
-	//		{Id:16,Urlfor:"/m/api/dialysis/dialysisPrescription6-/api/dialysis/prescription6"}}
-	//	for _, item := range allPermission {
-	//		//判断当前路由是否在权限路由列表里面
-	//		if strings.Split(item.Urlfor, "-")[1] == strings.Split(this.Ctx.Request.RequestURI , "?")[0]{
-	//			fmt.Println(strings.Split(this.Ctx.Request.RequestURI , "?")[0])
+	//		//获取该用户下所有角色的权限总集
+	//		var userRolePurviews string
+	//		var userRolePurviewsArr []string
+	//		for _, item := range roles {
+	//			role_id, _ := strconv.ParseInt(item, 10, 64)
+	//			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+	//			if len(userRolePurviews) == 0 {
+	//				userRolePurviews = purviews
+	//			} else {
+	//				userRolePurviews = userRolePurviews + "," + purviews
+	//			}
+	//		}
+	//		//该用户所拥有角色的权限的总集
+	//		userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+	//		fmt.Println(userRolePurviewsArr)
+	//		//系统所记录的权限列表
+	//		allPermission, _ := service.GetAllFunctionPurview()
 	//
+	//		for _, item := range allPermission {
 	//			//获取该角色的所有权限
-	//			for _, items := range userRolePurview{
+	//			for _, items := range userRolePurviewsArr {
 	//				id, _ := strconv.ParseInt(items, 10, 64)
-	//				if id == item.Id{
+	//				if id == item.ID {
 	//					isPermission = true
 	//				}
 	//			}
-	//			if !isPermission{
-	//				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreExist)
+	//			if !isPermission {
+	//				msg, _ := service.FindErrorMsgByStr(item.ID)
+	//				json := make(map[string]interface{})
+	//				json["msg"] = msg
+	//				json["code"] = 0
+	//				json["state"] = 0
+	//				this.Data["json"] = json
+	//				this.ServeJSON()
 	//				this.StopRun()
 	//			}
-	//		}
 	//
+	//		}
 	//	}
 	//}
+
 }
 
 type BaseServeAPIController struct {
@@ -182,16 +163,10 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//org_id, _ := beego.AppConfig.Int64("org_id")
 		org_id, _ := beego.AppConfig.Int64("org_id")
-
-		//org_id, _ := this.GetInt64("org_id")
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "13318599895"
-
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071
@@ -213,21 +188,62 @@ func (this *BaseServeAPIController) Prepare() {
 		this.SetSession("admin_user_info", &adminUserInfo)
 	}
 
-	//if adminUserInfo.AppRole != nil {
-	//	if adminUserInfo.AppRole.Id > 0 {
-	//		app_role, _ := service.FindAppRoleById(adminUserInfo.AppRole.Id)
-	//		if app_role != nil {
-	//			if app_role.Status != 1 {
-	//				this.DelSession("mobile_admin_user_info")
-	//				this.Ctx.SetCookie("token_cookie", "")
-	//				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeForbidden)
+	//if this.Ctx.Request.Header.Get("Permission") == "5" { //医保相关权限
+	//	org_id, _ := beego.AppConfig.Int64("org_id")
+	//	org, _ := service.GetOrgById(org_id)
+	//	admin_user_id, _ := this.GetInt64("admin_user_id")
+	//	if admin_user_id != org.Creator { //超级管理员不受此限制
+	//		isPermission := false
+	//		//该机构下该用户有多少个
+	//		role, _ := service.GetUserAllRole(org_id, admin_user_id)
+	//		var roles []string
+	//		if len(role.RoleIds) <= 0 { //该用户没有设置角色
+	//
+	//		} else {
+	//			roles = strings.Split(role.RoleIds, ",")
+	//		}
+	//		fmt.Println(roles)
+	//
+	//		//获取该用户下所有角色的权限总集
+	//		var userRolePurviews string
+	//		var userRolePurviewsArr []string
+	//		for _, item := range roles {
+	//			role_id, _ := strconv.ParseInt(item, 10, 64)
+	//			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+	//			if len(userRolePurviews) == 0 {
+	//				userRolePurviews = purviews
+	//			} else {
+	//				userRolePurviews = userRolePurviews + "," + purviews
+	//			}
+	//		}
+	//		//该用户所拥有角色的权限的总集
+	//		userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+	//		fmt.Println(userRolePurviewsArr)
+	//		//系统所记录的权限列表
+	//		allPermission, _ := service.GetAllFunctionPurview()
+	//
+	//		for _, item := range allPermission {
+	//			//获取该角色的所有权限
+	//			for _, items := range userRolePurviewsArr {
+	//				id, _ := strconv.ParseInt(items, 10, 64)
+	//				if id == item.ID {
+	//					isPermission = true
+	//				}
+	//			}
+	//			if !isPermission {
+	//				msg, _ := service.FindErrorMsgByStr(item.ID)
+	//				json := make(map[string]interface{})
+	//				json["msg"] = msg
+	//				json["code"] = 0
+	//				json["state"] = 0
+	//				this.Data["json"] = json
+	//				this.ServeJSON()
 	//				this.StopRun()
 	//			}
+	//
 	//		}
 	//	}
-	//
 	//}
-	//fmt.Println("222222222")
 
 }
 

controllers/sg/gdyb_controller.go

@@ -79,7 +79,7 @@ func (c *GdybController) PostOne() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	card_sn := c.GetString("card_sn")
 
-	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, "44022919620927046X")
+	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -11,6 +11,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/axgle/mahonia"
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
@@ -38,12 +39,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/checkaccount/get", &HisApiController{}, "get:GetCheckAccount")
 	beego.Router("/api/checkdetailaccount/get", &HisApiController{}, "get:GetCheckDetailAccount")
 	beego.Router("/api/refund/post", &HisApiController{}, "get:Refund")
-	//beego.Router("/api/sscard", &HisApiController{}, "get:Sscard")
+	beego.Router("/api/sscard", &HisApiController{}, "get:Sscard")
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "get:RefundNumber")
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "get:RefundDetail")
 	beego.Router("/api/treatment/check", &HisApiController{}, "get:CheckTreatment")
 	beego.Router("/api/record/put", &HisApiController{}, "get:PutRecord")
-	beego.Router("/api/patient/info", &HisApiController{}, "get:GetHisPatientInfo")
+	//beego.Router("/api/patient/info", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 
@@ -56,7 +57,10 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
 
+	beego.Router("/api/patient/info", &HisApiController{}, "get:GetPatientInfo")
+
 	//备案撤销相关接口
+
 	beego.Router("/api/checkcode/get", &HisApiController{}, "get:GetCheckCode")
 	beego.Router("/api/uncheckcode/get", &HisApiController{}, "get:UnCheckCode")
 	beego.Router("/api/psn/putonrecord", &HisApiController{}, "get:PsnPutOnRecord")
@@ -240,256 +244,219 @@ func (c *HisApiController) GetHisPatientInfo() {
 	}
 }
 
-//func (c *HisApiController) Sscard() {
-//	id_card_type, _ := c.GetInt64("id_card_type")
-//	adminUser := c.GetAdminUserInfo()
-//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-//
-//	r := CardInit()
-//	fmt.Println(r)
-//	//if r == 0 {
-//	switch id_card_type {
-//	case 1:
-//		basStr, err := GetBasBaseInfo()
-//
-//		if err != nil {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-//			return
-//
-//		} else {
-//			fmt.Println(basStr)
-//
-//			bas := strings.Split(basStr, "|")
-//
-//			basNumber := bas[1]
-//
-//			//basNumber := bas[2]
-//			card_sn := bas[3]
-//
-//			appRole, _ := service.GetAppRole(adminUser.CurrentOrgId)
-//
-//			api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + basNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10) + "&card_sn=" + card_sn
-//			resp, requestErr := http.Get(api)
-//			if requestErr != nil {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//				return
-//			}
-//			defer resp.Body.Close()
-//			body, ioErr := ioutil.ReadAll(resp.Body)
-//			if ioErr != nil {
-//				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//				return
-//			}
-//			var respJSON map[string]interface{}
-//
-//			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-//				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//				return
-//			}
-//
-//			userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-//			userJSONBytes, _ := json.Marshal(userJSON)
-//			var res ResultTwo
-//			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//				utils.ErrorLog("解析失败：%v", err)
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//				return
-//			}
-//			Iinfos, _ := json.Marshal(res.Output.Iinfo)
-//			Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-//			infoStr := string(Iinfos)
-//			idetinfoStr := string(Idetinfos)
-//
-//			if res.Infcode == 0 {
-//				his := models.VMHisPatient{
-//					Status:      1,
-//					Ctime:       time.Now().Unix(),
-//					Mtime:       time.Now().Unix(),
-//					PsnNo:       res.Output.Baseinfo.PsnNo,
-//					PsnCertType: res.Output.Baseinfo.PsnCertType,
-//					Certno:      res.Output.Baseinfo.Certno,
-//					PsnName:     res.Output.Baseinfo.PsnName,
-//					Gend:        res.Output.Baseinfo.Gend,
-//					Naty:        res.Output.Baseinfo.Naty,
-//					Brdy:        res.Output.Baseinfo.Brdy,
-//					Age:         res.Output.Baseinfo.Age,
-//					Iinfo:       infoStr,
-//					Idetinfo:    idetinfoStr,
-//					UserOrgId:   adminUser.CurrentOrgId,
-//					IsReturn:    1,
-//					IdCardType:  id_card_type,
-//				}
-//
-//				patient, err := service.GetPatientByNumber(basNumber, adminUser.CurrentOrgId)
-//				if err == gorm.ErrRecordNotFound {
-//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-//					return
-//
-//				} else if err != nil {
-//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//					return
-//
-//				} else {
-//					c.ServeSuccessJSON(map[string]interface{}{
-//						"patient": patient,
-//						"his":     his,
-//						"number":  basNumber,
-//					})
-//				}
-//			} else {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-//				return
-//			}
-//
-//		}
-//
-//		break
-//	case 2:
-//		////SFZStr, err := GetSFZBaseInfo()
-//		//if err != nil {
-//		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-//		//	return
-//		//
-//		//} else {
-//		//
-//		//	id_card_str := strings.Split(SFZStr, "^")
-//		//	id_card_number := id_card_str[0]
-//		//appRole, _ := service.GetAppRole(adminUser.CurrentOrgId)
-//		//
-//		//api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + id_card_number + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
-//		//resp, requestErr := http.Get(api)
-//		//if requestErr != nil {
-//		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		//	return
-//		//}
-//		//defer resp.Body.Close()
-//		//body, ioErr := ioutil.ReadAll(resp.Body)
-//		//if ioErr != nil {
-//		//	utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-//		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		//	return
-//		//}
-//		//var respJSON map[string]interface{}
-//		//
-//		//if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-//		//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-//		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		//	return
-//		//}
-//		//
-//		//userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-//		//userJSONBytes, _ := json.Marshal(userJSON)
-//		//var res ResultTwo
-//		//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//		//	utils.ErrorLog("解析失败：%v", err)
-//		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//		//	return
-//		//}
-//		//Iinfos, _ := json.Marshal(res.Output.Iinfo)
-//		//Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-//		//infoStr := string(Iinfos)
-//		//idetinfoStr := string(Idetinfos)
-//		//
-//		//if res.Infcode == 0 {
-//		//	his := models.VMHisPatient{
-//		//		Status:      1,
-//		//		Ctime:       time.Now().Unix(),
-//		//		Mtime:       time.Now().Unix(),
-//		//		PsnNo:       res.Output.Baseinfo.PsnNo,
-//		//		PsnCertType: res.Output.Baseinfo.PsnCertType,
-//		//		Certno:      res.Output.Baseinfo.Certno,
-//		//		PsnName:     res.Output.Baseinfo.PsnName,
-//		//		Gend:        res.Output.Baseinfo.Gend,
-//		//		Naty:        res.Output.Baseinfo.Naty,
-//		//		Brdy:        res.Output.Baseinfo.Brdy,
-//		//		Age:         res.Output.Baseinfo.Age,
-//		//		Iinfo:       infoStr,
-//		//		Idetinfo:    idetinfoStr,
-//		//		UserOrgId:   adminUser.CurrentOrgId,
-//		//		IsReturn:    1,
-//		//		IdCardType:  id_card_type,
-//		//	}
-//
-//		//	patient, err := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
-//		//	if err == gorm.ErrRecordNotFound {
-//		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-//		//		return
-//		//
-//		//	} else if err != nil {
-//		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//		//		return
-//		//
-//		//	} else {
-//		//		c.ServeSuccessJSON(map[string]interface{}{
-//		//			"patient": patient,
-//		//			"number":  id_card_number,
-//		//		})
-//		//	}
-//		//}
-//		break
-//	case 3:
-//
-//		break
-//
-//	}
-//}
+func (c *HisApiController) Sscard() {
+	//id_card_type, _ := c.GetInt64("id_card_type")
+	//adminUser := c.GetAdminUserInfo()
+	//miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	id_card_type := 1
+	r := CardInit()
+	fmt.Println(r)
+	//if r == 0 {
+	switch id_card_type {
+	case 1:
+		defer GetBasBaseInfo()
+
+		//if err != nil {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+		//	return
+		//
+		//} else {
+		//	fmt.Println(basStr)
+		//
+		//	bas := strings.Split(basStr, "|")
+		//
+		//	basNumber := bas[1]
+		//
+		//	//basNumber := bas[2]
+		//	card_sn := bas[3]
+		//
+		//	appRole, _ := service.GetAppRole(adminUser.CurrentOrgId)
+		//
+		//	api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + basNumber + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10) + "&card_sn=" + card_sn
+		//	resp, requestErr := http.Get(api)
+		//	if requestErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	}
+		//	defer resp.Body.Close()
+		//	body, ioErr := ioutil.ReadAll(resp.Body)
+		//	if ioErr != nil {
+		//		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	}
+		//	var respJSON map[string]interface{}
+		//
+		//	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	}
+		//
+		//	userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		//	userJSONBytes, _ := json.Marshal(userJSON)
+		//	var res ResultTwo
+		//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//		utils.ErrorLog("解析失败：%v", err)
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//		return
+		//	}
+		//	Iinfos, _ := json.Marshal(res.Output.Iinfo)
+		//	Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+		//	infoStr := string(Iinfos)
+		//	idetinfoStr := string(Idetinfos)
+		//
+		//	if res.Infcode == 0 {
+		//		his := models.VMHisPatient{
+		//			Status:      1,
+		//			Ctime:       time.Now().Unix(),
+		//			Mtime:       time.Now().Unix(),
+		//			PsnNo:       res.Output.Baseinfo.PsnNo,
+		//			PsnCertType: res.Output.Baseinfo.PsnCertType,
+		//			Certno:      res.Output.Baseinfo.Certno,
+		//			PsnName:     res.Output.Baseinfo.PsnName,
+		//			Gend:        res.Output.Baseinfo.Gend,
+		//			Naty:        res.Output.Baseinfo.Naty,
+		//			Brdy:        res.Output.Baseinfo.Brdy,
+		//			Age:         res.Output.Baseinfo.Age,
+		//			Iinfo:       infoStr,
+		//			Idetinfo:    idetinfoStr,
+		//			UserOrgId:   adminUser.CurrentOrgId,
+		//			IsReturn:    1,
+		//			IdCardType:  id_card_type,
+		//		}
+		//
+		//		patient, err := service.GetPatientByNumber(basNumber, adminUser.CurrentOrgId)
+		//		if err == gorm.ErrRecordNotFound {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+		//			return
+		//
+		//		} else if err != nil {
+		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		//			return
+		//
+		//		} else {
+		//			c.ServeSuccessJSON(map[string]interface{}{
+		//				"patient": patient,
+		//				"his":     his,
+		//				"number":  basNumber,
+		//			})
+		//		}
+		//	} else {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		//		return
+		//	}
+		//
+		//}
 
-//func GetBasBaseInfo() (jsonStr string, err error) {
-//
-//	handle, err := syscall.LoadLibrary("SSCard.dll")
-//	if err != nil {
-//		fmt.Printf("Error: %s\n", err)
-//		return "", err
-//	}
-//	defer syscall.FreeLibrary(handle)
-//	str := make([]byte, 256)
-//	str1 := make([]byte, 256)
-//	add, err := syscall.GetProcAddress(handle, "ReadCardBas")
-//	if err != nil {
-//		fmt.Printf("Error: %s\n", err)
-//		return "", err
-//	}
-//	ret, _, _ := syscall.Syscall(add, (uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
-//	if err != nil {
-//		fmt.Printf("Error: %s\n", err)
-//	}
-//	fmt.Println("> Add(4,5)的结果为:", ret)
-//	//return nil
-//
-//	//
-//	//handle := syscall.NewLazyDLL("SSCard.dll")
-//	//ReadCardBas := handle.NewProc("ReadCardBas")
-//	//
-//	//var str2 [1024]C.char
-//	//var str3 [1024]C.char
-//	//
-//	//
-//	//
-//	////sssssswwwww
-//	////a := 256
-//	//
-//	//r, _, _ := ReadCardBas.Call(&str2, 1024, &str3, 1024)
-//	//fmt.Println(r)
-//	////p := (*byte)(unsafe.Pointer(r))
-//	// define a slice to fill with the p string
-//	//data := make([]byte, 0)
-//
-//	// loop until find '\0'
-//	//if *p != 0 {
-//	//
-//	//	//data = append(data, *p)        // append 1 byte
-//	//	//r += unsafe.Sizeof(byte(0))    // move r to next byte
-//	//	//p = (*byte)(unsafe.Pointer(r)) // get the byte value
-//	//} else {
-//	//	return "", nil
-//	//
-//	//}
-//
-//	return "", nil
-//
-//}
+		break
+	case 2:
+		////SFZStr, err := GetSFZBaseInfo()
+		//if err != nil {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+		//	return
+		//
+		//} else {
+		//
+		//	id_card_str := strings.Split(SFZStr, "^")
+		//	id_card_number := id_card_str[0]
+		//appRole, _ := service.GetAppRole(adminUser.CurrentOrgId)
+		//
+		//api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + id_card_number + "&org_name=" + miConfig.OrgName + "&doctor=" + appRole.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
+		//resp, requestErr := http.Get(api)
+		//if requestErr != nil {
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//defer resp.Body.Close()
+		//body, ioErr := ioutil.ReadAll(resp.Body)
+		//if ioErr != nil {
+		//	utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//var respJSON map[string]interface{}
+		//
+		//if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//
+		//userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		//userJSONBytes, _ := json.Marshal(userJSON)
+		//var res ResultTwo
+		//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
+		//Iinfos, _ := json.Marshal(res.Output.Iinfo)
+		//Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+		//infoStr := string(Iinfos)
+		//idetinfoStr := string(Idetinfos)
+		//
+		//if res.Infcode == 0 {
+		//	his := models.VMHisPatient{
+		//		Status:      1,
+		//		Ctime:       time.Now().Unix(),
+		//		Mtime:       time.Now().Unix(),
+		//		PsnNo:       res.Output.Baseinfo.PsnNo,
+		//		PsnCertType: res.Output.Baseinfo.PsnCertType,
+		//		Certno:      res.Output.Baseinfo.Certno,
+		//		PsnName:     res.Output.Baseinfo.PsnName,
+		//		Gend:        res.Output.Baseinfo.Gend,
+		//		Naty:        res.Output.Baseinfo.Naty,
+		//		Brdy:        res.Output.Baseinfo.Brdy,
+		//		Age:         res.Output.Baseinfo.Age,
+		//		Iinfo:       infoStr,
+		//		Idetinfo:    idetinfoStr,
+		//		UserOrgId:   adminUser.CurrentOrgId,
+		//		IsReturn:    1,
+		//		IdCardType:  id_card_type,
+		//	}
+
+		//	patient, err := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
+		//	if err == gorm.ErrRecordNotFound {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+		//		return
+		//
+		//	} else if err != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		//		return
+		//
+		//	} else {
+		//		c.ServeSuccessJSON(map[string]interface{}{
+		//			"patient": patient,
+		//			"number":  id_card_number,
+		//		})
+		//	}
+		//}
+		break
+	case 3:
+
+		break
+
+	}
+}
+
+func GetBasBaseInfo() (jsonStr string, err error) {
+
+	handle := syscall.NewLazyDLL("SSCard.dll")
+	add := handle.NewProc("ReadCardBas")
+	str := make([]byte, 1024)
+	str1 := make([]byte, 1024)
+	ret, _, _ := add.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
+	fmt.Println(ConvertToString(string(str), "gbk", "utf-8"))
+
+	fmt.Println(ConvertToString(string(str1), "gbk", "utf-8"))
+
+	fmt.Println("> Add(4,5)的结果为:", ret)
+	handle.Release()
+
+	return "", nil
+
+}
 
 //func GetSFZBaseInfo() (jsonStr string, err error) {
 //	//handle := syscall.MustLoadDLL("SSCard.dll")
@@ -515,16 +482,16 @@ func (c *HisApiController) GetHisPatientInfo() {
 //	return string(str), nil
 //}
 
-//func CardInit() int {
-//	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
-//	add := DllTestDef.MustFindProc("Init")
-//	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-//	if err != nil {
-//		fmt.Println("SSCard的运算结果为:", ret)
-//	}
-//	result := int(ret)
-//	return result
-//}
+func CardInit() int {
+	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
+	add := DllTestDef.MustFindProc("Init")
+	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+	if err != nil {
+		fmt.Println("SSCard的运算结果为:", ret)
+	}
+	result := int(ret)
+	return result
+}
 
 //func CardInit() int {
 //	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
@@ -561,7 +528,7 @@ type ResultTwo struct {
 		} `json:"baseinfo"`
 		Idetinfo []interface{} `json:"idetinfo"`
 		Iinfo    []struct {
-			Balc                   int64       `json:"balc"`
+			Balc                   float64     `json:"balc"`
 			CvlservFlag            string      `json:"cvlserv_flag"`
 			EmpName                string      `json:"emp_name"`
 			InsuplcAdmdvs          string      `json:"insuplc_admdvs"`
@@ -3639,14 +3606,63 @@ func (c *HisApiController) GetUploadDiag() {
 
 }
 
+type QueryResult struct {
+	ID             int64
+	Name           string
+	Code           string
+	List_type_code string
+}
+
 func (c *HisApiController) GetCheckCode() {
-	name := c.GetString("name")
-	codg := c.GetString("codg")
-	list_type_code := c.GetString("list_type_code")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
+	ids_str := c.GetString("ids")
+	record_type, _ := c.GetInt64("record_type") //1.药品 2.耗材  3.项目
+
+	ids_arr := strings.Split(ids_str, ",")
+	var queryResult []QueryResult
+	ids := make([]int64, 0)
+	for _, item := range ids_arr {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		ids = append(ids, id)
+	}
+	if record_type == 1 {
+		drugs, _ := service.GetBatchDrugList(ids)
+		for _, item := range drugs {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.DrugName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
 
-	adminUser := c.GetAdminUserInfo()
+	} else if record_type == 2 {
+		goods, _ := service.GetBatchGoodInformationList(ids)
+
+		for _, item := range goods {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.GoodName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+	} else if record_type == 3 {
+		projects, _ := service.GetBathchMyPorjecgList(ids)
+		for _, item := range projects {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.ProjectName,
+				Code:           item.MedicalCode,
+				List_type_code: item.MedicalCode,
+			}
+			queryResult = append(queryResult, result)
+		}
+	}
 
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 
@@ -3668,22 +3684,91 @@ func (c *HisApiController) GetCheckCode() {
 	}
 
 	if config.IsOpen == 1 {
-		result := service.Gdyb3301(baseParams, name, codg, list_type_code, "", "")
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
-		}
+		for _, item := range queryResult {
+			result := service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "")
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
 
-	}
+			userJSONBytes, _ := json.Marshal(dat)
+			var res ResultSix
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				if record_type == 1 {
+					service.UpdateBaseDrugById(item.ID)
+				} else if record_type == 2 {
+					service.UpdateGoodInformaitonByDetail(item.ID)
+				} else if record_type == 3 {
+					service.UpdateProjectById(item.ID)
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": 0,
+					"msg":         "目录对照成功",
+				})
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
 
+			}
+		}
+	}
 }
 func (c *HisApiController) UnCheckCode() {
-	name := c.GetString("name")
-	codg := c.GetString("codg")
-	list_type_code := c.GetString("list_type_code")
+	ids_str := c.GetString("ids")
+	record_type, _ := c.GetInt64("record_type") //1.药品 2.耗材  3.项目
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	ids_arr := strings.Split(ids_str, ",")
+	var queryResult []QueryResult
+	ids := make([]int64, 0)
+	for _, item := range ids_arr {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		ids = append(ids, id)
+	}
+	if record_type == 1 {
+		drugs, _ := service.GetBatchDrugList(ids)
+		for _, item := range drugs {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.DrugName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+
+	} else if record_type == 2 {
+		goods, _ := service.GetBatchGoodInformationList(ids)
+
+		for _, item := range goods {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.GoodName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+	} else if record_type == 3 {
+		projects, _ := service.GetBathchMyPorjecgList(ids)
+		for _, item := range projects {
+			result := QueryResult{
+				ID:             item.ID,
+				Name:           item.ProjectName,
+				Code:           item.MedicalCode,
+				List_type_code: item.MedicalCode,
+			}
+			queryResult = append(queryResult, result)
+		}
+	}
 
 	adminUser := c.GetAdminUserInfo()
 
@@ -3708,7 +3793,62 @@ func (c *HisApiController) UnCheckCode() {
 	}
 
 	if config.IsOpen == 1 {
-		result := service.Gdyb3302(baseParams, name, codg, list_type_code)
+		for _, item := range queryResult {
+
+			result := service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			var dat2 map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat2); err == nil {
+				fmt.Println(dat2)
+			} else {
+				fmt.Println(err)
+			}
+
+			userJSONBytes, _ := json.Marshal(dat2)
+			var res ResultSix
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				if record_type == 1 {
+					service.UpdateDrugByIdDetail(item.ID)
+				} else if record_type == 2 {
+					service.UpdateGoodInfoById(item.ID)
+
+				} else if record_type == 3 {
+					service.UpdateMyProjectById(item.ID)
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": 0,
+					"msg":         "撤销目录对照成功",
+				})
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+			}
+		}
+	}
+}
+func (c *HisApiController) GetPatientInfo() {
+	id_card_no := c.GetString("id_card_no")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	patient, _ := service.GetPatientByIDCard(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+
+	if patient.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	role, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(c.GetAdminUserInfo().CurrentOrgId)
+	if config.IsOpen == 1 {
+
+		result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -3716,8 +3856,27 @@ func (c *HisApiController) UnCheckCode() {
 			fmt.Println(err)
 		}
 
-	}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultTwo
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 
+		if res.Infcode == -1 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": 0,
+				"info":        res,
+			})
+		}
+
+	}
 }
 func (c *HisApiController) PsnPutOnRecord() {
 	record_type, _ := c.GetInt64("type")
@@ -3878,106 +4037,63 @@ func (c *HisApiController) PsnUnPutOnRecord() {
 
 }
 func (c *HisApiController) PsnPutNCDSOnRecord() {
-	record_type, _ := c.GetInt64("type")
 	patient_id, _ := c.GetInt64("patient_id")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
+	insutype := c.GetString("insutype")
+	psn_no := c.GetString("psn_no")
+	doctor_id, _ := c.GetInt64("doctor_id")
+	sick_id, _ := c.GetInt64("sick_id")
+	department_id, _ := c.GetInt64("department_id")
 	adminUser := c.GetAdminUserInfo()
-	var patients []*models.Patients
-	if record_type == 1 { //全部备案
-		patient, _ := service.GetAllPatient(adminUser.CurrentOrgId)
-		patients = append(patients, patient...)
-	} else { //单个备案
-		patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
-		patients = append(patients, patient)
-	}
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
-
+	sick, _ := service.FindSickById(sick_id)
+	//role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	if config.IsOpen == 1 {
-		for _, item := range patients {
-			api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + item.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + user_name + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			defer resp.Body.Close()
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(userJSON)
-			var res ResultTwo
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			if res.Infcode == 0 {
-				result := service.Gdyb2503(res.Output.Baseinfo.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, user_name, miConfig.Code, strconv.FormatInt(admin_user_id, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "慢性肾功能不全（血透治疗）", "M07803")
-				var dat map[string]interface{}
-				if err := json.Unmarshal([]byte(result), &dat); err == nil {
-					fmt.Println(dat)
-				} else {
-					fmt.Println(err)
-				}
-
-				userJSONBytes, _ := json.Marshal(dat)
-
-				var res2 ResultThirteen
-				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-
-				//patient, _ := service.GetPatientByIDCard(item.IdCardNo, adminUser.CurrentOrgId)
-
-				if res2.Infcode == 0 {
-					psnResult := &models.GdybPsnNcdsRecord{
-						UserOrgId:     adminUser.CurrentOrgId,
-						PatientId:     item.ID,
-						PsnNo:         res.Output.Baseinfo.PsnNo,
-						Ctime:         time.Now().Unix(),
-						Mtime:         time.Now().Unix(),
-						Status:        1,
-						IsCancel:      1,
-						TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
-					}
-					service.CreatePsnNCDSRecord(psnResult)
-
-				} else {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"failed_code": -10,
-						"msg":         res2.ErrMsg,
-					})
-					return
-				}
+		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.CountryCode)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res2 ResultThirteen
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res2.Infcode == 0 {
+			psnResult := &models.GdybPsnNcdsRecord{
+				UserOrgId:     adminUser.CurrentOrgId,
+				PatientId:     patient.ID,
+				PsnNo:         psn_no,
+				DoctorId:      doctor.ID,
+				DepartmentId:  department_id,
+				SickType:      sick_id,
+				Insutype:      insutype,
+				Ctime:         time.Now().Unix(),
+				Mtime:         time.Now().Unix(),
+				Status:        1,
+				IsCancel:      1,
+				TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
 			}
+			service.CreatePsnNCDSRecord(psnResult)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": 0,
+				"msg":         "备案成功",
+			})
 
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res2.ErrMsg,
+			})
+			return
 		}
-
 	}
-
 }
 func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 	id, _ := c.GetInt64("id")
@@ -4142,3 +4258,19 @@ func RemoveRepeatedCode(arr []string) (newArr []string) {
 	}
 	return
 }
+
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)
+
+func ConvertToString(src string, srcCode string, tagCode string) string {
+	srcCoder := mahonia.NewDecoder(srcCode)
+	srcResult := srcCoder.ConvertString(src)
+	tagCoder := mahonia.NewDecoder(tagCode)
+	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
+	result := string(cdata)
+	return result
+}

controllers/sz/sz_his_api_controller.go

@@ -328,21 +328,14 @@ type SZHisApiController struct {
 func SZHisManagerApiRegistRouters() {
 	//挂号
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
-	//上传明细，预结算
-	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
-
 	//结算
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")
-
 	//退费
 	beego.Router("/sz/api/refund/get", &SZHisApiController{}, "get:Refund")
-
 	beego.Router("/sz/api/readcard", &SZHisApiController{}, "get:ReadCard")
-
 	beego.Router("sz/api/refundnumber/get", &SZHisApiController{}, "get:RefundNumber")
 
 	beego.Router("/sz/api/monthrefund/get", &SZHisApiController{}, "get:MonthRefund")
-
 	//查询交易
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
 	//beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")
@@ -1233,399 +1226,399 @@ func (c *SZHisApiController) GetRegisterInfo() {
 }
 
 //func (c *SZHisApiController) GetInfo() {
-func (c *SZHisApiController) GetRegisterInfo() {
-	adminInfo := c.GetAdminUserInfo()
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	patient_id, _ := c.GetInt64("id")
-	record_time := c.GetString("record_time")
-	settlementValue, _ := c.GetInt64("settlement_value")
-	medical_insurance_card := c.GetString("medical_insurance_card")
-	name := c.GetString("name")
-	id_card_type, _ := c.GetInt64("id_card_type")
-	certificates, _ := c.GetInt64("certificates")
-	medical_care, _ := c.GetInt64("medical_care")
-	birthday := c.GetString("birthday")
-	id_card := c.GetString("id_card")
-	register_type, _ := c.GetInt64("register")
-	doctor, _ := c.GetInt64("doctor")
-	department, _ := c.GetInt64("department")
-	gender, _ := c.GetInt64("sex")
-	registration_fee, _ := c.GetFloat("registration_fee")
-	medical_expenses, _ := c.GetFloat("medical_expenses")
-	social_type, _ := c.GetInt64("social_type")
-
-	is_yidi, _ := c.GetInt64("is_yidi")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
-	birthUnix := birthdays.Unix()
-
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	var patient service.Patients
-	if patient_id == 0 {
-		patient, _ = service.GetPatientByIDCard(id_card, adminInfo.CurrentOrgId)
-	} else {
-		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
-	}
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
-	if patient.ID == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
-	if len(patient.IdCardNo) == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
-		return
-	}
-
-	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
-	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
-
-	var custom_code string
-	var custom_project_name string
-	var allPrice float64
-
-	switch register_type {
-	case 1:
-		custom_code = "110100002"
-		custom_project_name = "普通门诊"
-		allPrice = 10
-		break
-	case 3:
-		custom_code = "110200002-2"
-		custom_project_name = "主任医师"
-		allPrice = 10
-
-		break
-	case 2:
-		custom_code = "110200002-3"
-		custom_project_name = "副主任医师"
-		allPrice = 10
-
-		break
-	case 4:
-		custom_code = "0"
-		custom_project_name = "免受诊金"
-		allPrice = 0
-		break
-	case 5:
-		custom_code = "110200002-1"
-		custom_project_name = "专家"
-		allPrice = 10
-
-		break
-	}
-
-	if his.ID == 0 {
-
-		var doctor_name string
-		var doctor_code string
-		if adminRole.ID == 0 {
-
-			doctor_name = ""
-			doctor_code = "1001"
-			doctor_name = ""
-			doctor_code = ""
-
-		} else {
-			doctor_name = adminRole.UserName
-			doctor_code = strconv.FormatInt(admin_user_id, 10)
-
-		}
-		month := time.Unix(1557042972, 0).Format("1")
-		year := time.Now().Format("2006")
-		month = time.Now().Format("01")
-		day := time.Now().Format("02")
-
-		//流水号
-		//
-		number := miConfig.Code + year + month + day +
-			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-		mz_number := year + month + day + strconv.FormatInt(patient_id, 10) +
-			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
-		//1.判断读卡类型
-		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
-		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
-		fmt.Println(yiliao_number)
-		fmt.Println(id_card_number)
-		fmt.Println(verifyCode)
-		fmt.Println(version_code)
-		fmt.Println(ret4)
-
-		dept_code := "0305"
-		is_yidi = 1
-		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
-		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
-		if tempPatient.ID == patient_id {
-			if ret4 == 0 { //本地卡流程
-				if is_yidi == 1 {
-					//本地就医流程
-					//挂号
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
-					userJSONBytes, _ := json.Marshal(dat)
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-						}
-						service.CreateHisPatientTwo(&his)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
-					}
-
-				} else {
-					//异地就医流程
-					//异地走鉴权流程
-					//authResult := CardAuth(number)
-					//fmt.Println(authResult)
-
-					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
-					//if tempPatient.ID == patient_id {
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
-
-					userJSONBytes, _ := json.Marshal(dat)
-
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-						}
-						service.CreateHisPatientTwo(&his)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
-					}
-
-				}
-
-			} else { //异地卡流程
-				//readCardBasResult := ReadCardBasHSM(number)
-				//fmt.Println(readCardBasResult)
-				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
-				if is_yidi == 1 { //1本地就医
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
-
-					userJSONBytes, _ := json.Marshal(dat)
-
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-						}
-						service.CreateHisPatientTwo(&his)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
-					}
-
-				} else { //异地就医需要走鉴权流程
-					//authResult := CardAuth(number)
-					//fmt.Println(authResult)
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
-
-					userJSONBytes, _ := json.Marshal(dat)
-
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-						}
-						service.CreateHisPatientTwo(&his)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
-					}
-
-				}
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-			return
-		}
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
-		return
-	}
-}
+//func (c *SZHisApiController) GetRegisterInfo() {
+//	adminInfo := c.GetAdminUserInfo()
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	patient_id, _ := c.GetInt64("id")
+//	record_time := c.GetString("record_time")
+//	settlementValue, _ := c.GetInt64("settlement_value")
+//	medical_insurance_card := c.GetString("medical_insurance_card")
+//	name := c.GetString("name")
+//	id_card_type, _ := c.GetInt64("id_card_type")
+//	certificates, _ := c.GetInt64("certificates")
+//	medical_care, _ := c.GetInt64("medical_care")
+//	birthday := c.GetString("birthday")
+//	id_card := c.GetString("id_card")
+//	register_type, _ := c.GetInt64("register")
+//	doctor, _ := c.GetInt64("doctor")
+//	department, _ := c.GetInt64("department")
+//	gender, _ := c.GetInt64("sex")
+//	registration_fee, _ := c.GetFloat("registration_fee")
+//	medical_expenses, _ := c.GetFloat("medical_expenses")
+//	social_type, _ := c.GetInt64("social_type")
+//
+//	is_yidi, _ := c.GetInt64("is_yidi")
+//
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
+//	birthUnix := birthdays.Unix()
+//
+//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+//	if err != nil {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//
+//	var patient service.Patients
+//	if patient_id == 0 {
+//		patient, _ = service.GetPatientByIDCard(id_card, adminInfo.CurrentOrgId)
+//	} else {
+//		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
+//	}
+//
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
+//	if patient.ID == 0 {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+//		return
+//	}
+//	if len(patient.IdCardNo) == 0 {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
+//		return
+//	}
+//
+//	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
+//	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
+//
+//	var custom_code string
+//	var custom_project_name string
+//	var allPrice float64
+//
+//	switch register_type {
+//	case 1:
+//		custom_code = "110100002"
+//		custom_project_name = "普通门诊"
+//		allPrice = 10
+//		break
+//	case 3:
+//		custom_code = "110200002-2"
+//		custom_project_name = "主任医师"
+//		allPrice = 10
+//
+//		break
+//	case 2:
+//		custom_code = "110200002-3"
+//		custom_project_name = "副主任医师"
+//		allPrice = 10
+//
+//		break
+//	case 4:
+//		custom_code = "0"
+//		custom_project_name = "免受诊金"
+//		allPrice = 0
+//		break
+//	case 5:
+//		custom_code = "110200002-1"
+//		custom_project_name = "专家"
+//		allPrice = 10
+//
+//		break
+//	}
+//
+//	if his.ID == 0 {
+//
+//		var doctor_name string
+//		var doctor_code string
+//		if adminRole.ID == 0 {
+//
+//			doctor_name = ""
+//			doctor_code = "1001"
+//			doctor_name = ""
+//			doctor_code = ""
+//
+//		} else {
+//			doctor_name = adminRole.UserName
+//			doctor_code = strconv.FormatInt(admin_user_id, 10)
+//
+//		}
+//		month := time.Unix(1557042972, 0).Format("1")
+//		year := time.Now().Format("2006")
+//		month = time.Now().Format("01")
+//		day := time.Now().Format("02")
+//
+//		//流水号
+//		//
+//		number := miConfig.Code + year + month + day +
+//			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+//		mz_number := year + month + day + strconv.FormatInt(patient_id, 10) +
+//			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
+//		//1.判断读卡类型
+//		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
+//		yiliao_number, id_card_number, verifyCode, version_code, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+//		fmt.Println(yiliao_number)
+//		fmt.Println(id_card_number)
+//		fmt.Println(verifyCode)
+//		fmt.Println(version_code)
+//		fmt.Println(ret4)
+//
+//		dept_code := "0305"
+//		is_yidi = 1
+//		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
+//		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
+//		if tempPatient.ID == patient_id {
+//			if ret4 == 0 { //本地卡流程
+//				if is_yidi == 1 {
+//					//本地就医流程
+//					//挂号
+//					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+//					var dat map[string]interface{}
+//					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+//						fmt.Println(dat)
+//					} else {
+//						fmt.Println(err)
+//					}
+//					userJSONBytes, _ := json.Marshal(dat)
+//					var res ResultOne
+//					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//						utils.ErrorLog("解析失败：%v", err)
+//						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//						return
+//					}
+//					if res.Transreturncode == "00000000" {
+//						his := models.VMHisPatient{
+//							Name:                   name,
+//							Gender:                 gender,
+//							Birthday:               birthUnix,
+//							MedicalTreatmentType:   medical_care,
+//							IdType:                 certificates,
+//							IdCardNo:               id_card,
+//							BalanceAccountsType:    settlementValue,
+//							SocialType:             social_type,
+//							MedicalInsuranceNumber: medical_insurance_card,
+//							RegisterType:           register_type,
+//							RegisterCost:           registration_fee,
+//							TreatmentCost:          medical_expenses,
+//							Status:                 1,
+//							Ctime:                  time.Now().Unix(),
+//							Mtime:                  time.Now().Unix(),
+//							Iinfo:                  resp_result,
+//							PatientId:              patient.ID,
+//							RecordDate:             theTime.Unix(),
+//							UserOrgId:              adminInfo.CurrentOrgId,
+//							AdminUserId:            admin_user_id,
+//							IsReturn:               1,
+//							IdCardType:             id_card_type,
+//							Doctor:                 doctor,
+//							Departments:            department,
+//							YiliaoNumber:           yiliao_number,
+//							MzNumber:               number,
+//							Number:                 mz_number,
+//						}
+//						service.CreateHisPatientTwo(&his)
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"msg": "挂号成功",
+//						})
+//					} else {
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"failed_code": -10,
+//							"msg":         res.Transreturnmessage,
+//						})
+//						return
+//					}
+//
+//				} else {
+//					//异地就医流程
+//					//异地走鉴权流程
+//					//authResult := CardAuth(number)
+//					//fmt.Println(authResult)
+//
+//					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
+//					//if tempPatient.ID == patient_id {
+//					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+//					var dat map[string]interface{}
+//					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+//						fmt.Println(dat)
+//					} else {
+//						fmt.Println(err)
+//					}
+//
+//					userJSONBytes, _ := json.Marshal(dat)
+//
+//					var res ResultOne
+//					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//						utils.ErrorLog("解析失败：%v", err)
+//						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//						return
+//					}
+//					if res.Transreturncode == "00000000" {
+//						his := models.VMHisPatient{
+//							Name:                   name,
+//							Gender:                 gender,
+//							Birthday:               birthUnix,
+//							MedicalTreatmentType:   medical_care,
+//							IdType:                 certificates,
+//							IdCardNo:               id_card,
+//							BalanceAccountsType:    settlementValue,
+//							SocialType:             social_type,
+//							MedicalInsuranceNumber: medical_insurance_card,
+//							RegisterType:           register_type,
+//							RegisterCost:           registration_fee,
+//							TreatmentCost:          medical_expenses,
+//							Status:                 1,
+//							Ctime:                  time.Now().Unix(),
+//							Mtime:                  time.Now().Unix(),
+//							Iinfo:                  resp_result,
+//							PatientId:              patient.ID,
+//							RecordDate:             theTime.Unix(),
+//							UserOrgId:              adminInfo.CurrentOrgId,
+//							AdminUserId:            admin_user_id,
+//							IsReturn:               1,
+//							IdCardType:             id_card_type,
+//							Doctor:                 doctor,
+//							Departments:            department,
+//							YiliaoNumber:           yiliao_number,
+//							MzNumber:               number,
+//							Number:                 mz_number,
+//						}
+//						service.CreateHisPatientTwo(&his)
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"msg": "挂号成功",
+//						})
+//					} else {
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"failed_code": -10,
+//							"msg":         res.Transreturnmessage,
+//						})
+//						return
+//					}
+//
+//				}
+//
+//			} else { //异地卡流程
+//				//readCardBasResult := ReadCardBasHSM(number)
+//				//fmt.Println(readCardBasResult)
+//				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
+//				if is_yidi == 1 { //1本地就医
+//					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+//					var dat map[string]interface{}
+//					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+//						fmt.Println(dat)
+//					} else {
+//						fmt.Println(err)
+//					}
+//
+//					userJSONBytes, _ := json.Marshal(dat)
+//
+//					var res ResultOne
+//					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//						utils.ErrorLog("解析失败：%v", err)
+//						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//						return
+//					}
+//					if res.Transreturncode == "00000000" {
+//						his := models.VMHisPatient{
+//							Name:                   name,
+//							Gender:                 gender,
+//							Birthday:               birthUnix,
+//							MedicalTreatmentType:   medical_care,
+//							IdType:                 certificates,
+//							IdCardNo:               id_card,
+//							BalanceAccountsType:    settlementValue,
+//							SocialType:             social_type,
+//							MedicalInsuranceNumber: medical_insurance_card,
+//							RegisterType:           register_type,
+//							RegisterCost:           registration_fee,
+//							TreatmentCost:          medical_expenses,
+//							Status:                 1,
+//							Ctime:                  time.Now().Unix(),
+//							Mtime:                  time.Now().Unix(),
+//							Iinfo:                  resp_result,
+//							PatientId:              patient.ID,
+//							RecordDate:             theTime.Unix(),
+//							UserOrgId:              adminInfo.CurrentOrgId,
+//							AdminUserId:            admin_user_id,
+//							IsReturn:               1,
+//							IdCardType:             id_card_type,
+//							Doctor:                 doctor,
+//							Departments:            department,
+//							YiliaoNumber:           yiliao_number,
+//							MzNumber:               number,
+//							Number:                 mz_number,
+//						}
+//						service.CreateHisPatientTwo(&his)
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"msg": "挂号成功",
+//						})
+//					} else {
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"failed_code": -10,
+//							"msg":         res.Transreturnmessage,
+//						})
+//						return
+//					}
+//
+//				} else { //异地就医需要走鉴权流程
+//					//authResult := CardAuth(number)
+//					//fmt.Println(authResult)
+//					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+//					var dat map[string]interface{}
+//					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+//						fmt.Println(dat)
+//					} else {
+//						fmt.Println(err)
+//					}
+//
+//					userJSONBytes, _ := json.Marshal(dat)
+//
+//					var res ResultOne
+//					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//						utils.ErrorLog("解析失败：%v", err)
+//						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//						return
+//					}
+//					if res.Transreturncode == "00000000" {
+//						his := models.VMHisPatient{
+//							Name:                   name,
+//							Gender:                 gender,
+//							Birthday:               birthUnix,
+//							MedicalTreatmentType:   medical_care,
+//							IdType:                 certificates,
+//							IdCardNo:               id_card,
+//							BalanceAccountsType:    settlementValue,
+//							SocialType:             social_type,
+//							MedicalInsuranceNumber: medical_insurance_card,
+//							RegisterType:           register_type,
+//							RegisterCost:           registration_fee,
+//							TreatmentCost:          medical_expenses,
+//							Status:                 1,
+//							Ctime:                  time.Now().Unix(),
+//							Mtime:                  time.Now().Unix(),
+//							Iinfo:                  resp_result,
+//							PatientId:              patient.ID,
+//							RecordDate:             theTime.Unix(),
+//							UserOrgId:              adminInfo.CurrentOrgId,
+//							AdminUserId:            admin_user_id,
+//							IsReturn:               1,
+//							IdCardType:             id_card_type,
+//							Doctor:                 doctor,
+//							Departments:            department,
+//							YiliaoNumber:           yiliao_number,
+//							MzNumber:               number,
+//							Number:                 mz_number,
+//						}
+//						service.CreateHisPatientTwo(&his)
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"msg": "挂号成功",
+//						})
+//					} else {
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"failed_code": -10,
+//							"msg":         res.Transreturnmessage,
+//						})
+//						return
+//					}
+//
+//				}
+//			}
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+//			return
+//		}
+//	} else {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+//		return
+//	}
+//}
 
 //func (c *SZHisApiController) GetRegisterInfo() {
 //	adminInfo := c.GetAdminUserInfo()
@@ -2470,6 +2463,8 @@ func (c *SZHisApiController) GetSettleInfo() {
 			}
 		}
 
+		total, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", total), 64)
+
 		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
 
 		if ret4 == 0 {

models/gdyb_models.go

@@ -10,6 +10,11 @@ type GdybPsnRecord struct {
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
 	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
 	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
 }
 
 func (GdybPsnRecord) TableName() string {
@@ -26,6 +31,11 @@ type GdybPsnNcdsRecord struct {
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
 	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
 	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
 }
 
 func (GdybPsnNcdsRecord) TableName() string {

service/gdyb_service.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"github.com/astaxie/beego"
 	"io"
 	"io/ioutil"
 	"math/rand"
@@ -50,7 +51,11 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1201"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "1201"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
@@ -60,7 +65,7 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -82,13 +87,12 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, id_card_no string) string {
-	// 生成签名
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string) string {
+	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-
-	// 生成输入报文
+	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
@@ -97,10 +101,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 		inputData["card_sn"] = card_sn      // 卡识别码
-		inputData["certno"] = id_card_no    // 证件号码
-		//inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		//inputData["card_sn"] = ""           // 卡识别码
-		//inputData["certno"] = certNo        // 证件号码
+		inputData["certno"] = certNo        // 证件号码
 	} else {
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 		inputData["card_sn"] = ""           // 卡识别码
@@ -120,7 +121,72 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "1101"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}
+
+func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101"      // 交易编码
+	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = certNo        // 证件号码
+	inputData["psn_cert_type"] = "1"    // 人员证件类型
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = ""          // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "1101"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -131,7 +197,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -195,9 +261,12 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
 
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -206,7 +275,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -254,7 +323,10 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2202"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2202"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2202"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
@@ -266,7 +338,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 	//request.Header.Set("x-tif-paasid", "test_hosp")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
@@ -338,7 +410,11 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2203"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2203"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
@@ -349,7 +425,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -423,7 +499,11 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2203A"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2203A"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2203A"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
@@ -434,7 +514,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -628,7 +708,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return ""
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2204"
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2204"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2204"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
@@ -639,7 +726,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -688,7 +775,13 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2205"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2205"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2205"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
@@ -702,7 +795,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -768,7 +861,13 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2206"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2206"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2206"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
@@ -779,7 +878,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -847,7 +946,13 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2207"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2207"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2207"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
@@ -858,7 +963,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -906,7 +1011,13 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2208"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2208"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2208"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
@@ -917,7 +1028,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -990,7 +1101,12 @@ func Gdyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/6201"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "6201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/6201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/6201"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
@@ -1001,7 +1117,7 @@ func Gdyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1058,7 +1174,12 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3201"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3201"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3201"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3201"
@@ -1069,7 +1190,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1127,9 +1248,14 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9101"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9101"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9101"
 
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "9101"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -1138,7 +1264,7 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1182,7 +1308,12 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9102"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "9102"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9102"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9102"
 
@@ -1194,7 +1325,7 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1244,7 +1375,12 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3202"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3202"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3202"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
@@ -1254,7 +1390,7 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1297,7 +1433,12 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
@@ -1307,7 +1448,7 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1351,16 +1492,21 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
 
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2001"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3301"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1416,16 +1562,21 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+	//
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3301"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1471,16 +1622,21 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
 
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3302"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "3302"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1534,14 +1690,20 @@ func Gdyb2505(psnNo string, doctor string, org_name string, fixmedins_code strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2505"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2505"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2505"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2505"
+
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1583,8 +1745,13 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2506"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2506"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2506"
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2506"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 	request, err := http.NewRequest("POST", url, reader)
@@ -1594,7 +1761,7 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1642,7 +1809,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	inputData["begndate"] = timeFormatTwo          // 医师编码
 	inputData["tel"] = ""                          // 医师编码
 	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = ""                      // 医师编码
+	inputData["enddate"] = "2099-12-31"            // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -1653,7 +1820,13 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2503"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2503"
+
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -1661,7 +1834,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1703,14 +1876,19 @@ func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2504"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2504"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2504"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2504"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1836,7 +2014,11 @@ func Gdyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "5301"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -1844,7 +2026,7 @@ func Gdyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -2095,8 +2277,6 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 
 	// 生成输入报文
 	inputMessage := make(map[string]interface{})
-
-	inputMessage["infno"] = "1101"                                                              // 交易编码
 	inputMessage["msgid"] = fixmedins_code + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
 	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
 	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划

service/sz_his_service.go

@@ -762,7 +762,7 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //
 	inputMessage["transTime"] = year + month + day + hour + min + sec + ":" + msec //
-	inputMessage["transVersion"] = "V0.3"                                          //   //
+	inputMessage["transVersion"] = "V0.2"                                          //   //
 	inputMessage["transChannel"] = "10"                                            //
 
 	return inputMessage
@@ -955,10 +955,28 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *mo
 	feedetail := make([]map[string]interface{}, 0)
 
 	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["aac003"] = doc.UserName                                //医护人员姓名
-	feedetailInfo["bka633"] = "1"                                         //医护人员类别
-	feedetailInfo["aac004"] = doc.Sex                                     //性别
-	feedetailInfo["aac058"] = doc.CardType                                //证件类型
+	feedetailInfo["aac003"] = doc.UserName //医护人员姓名
+	feedetailInfo["bka633"] = "1"          //医护人员类别
+	feedetailInfo["aac004"] = doc.Sex      //性别
+
+	switch doc.CardType {
+
+	}
+
+	if doc.CardType == "1" {
+		feedetailInfo["aac058"] = "01"
+	} else if doc.CardType == "2" {
+		feedetailInfo["aac058"] = "02"
+	} else if doc.CardType == "4" {
+		feedetailInfo["aac058"] = "04"
+	} else if doc.CardType == "6" {
+		feedetailInfo["aac058"] = "06"
+	} else if doc.CardType == "8" {
+		feedetailInfo["aac058"] = "08"
+	} else if doc.CardType == "90" {
+		feedetailInfo["aac058"] = "90"
+	}
+
 	feedetailInfo["aac147"] = doc.IdCard                                  //证件号码
 	feedetailInfo["aae005"] = doc.Phone                                   //联系电话
 	feedetailInfo["bkc322"] = doc.WorkMajorName                           //现从事专业名称

service/user_service.go

@@ -164,3 +164,47 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
 	return appRole, err
 }
+
+func GetOrgById(orgID int64) (*models.Org, error) {
+	var org models.Org
+	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &org, nil
+}
+
+func GetUserAllRole(org_id int64, admin_user_id int64) (role models.App_Role, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ? AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
+	return
+}
+
+func GetAllFunctionPurview() (purview []models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Order("number asc").Find(&purview).Error
+	return
+}
+
+func GetRoleFuncPurviewIds(roleID int64) (string, error) {
+	var rolePurview models.SgjUserRoleFuncPurview
+	err := readUserDb.Where("role_id = ?", roleID).First(&rolePurview).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return "", nil
+		} else {
+			return "", err
+		}
+	}
+	return rolePurview.PurviewIds, nil
+}
+
+func FindErrorMsgByStr(id int64) (string, error) {
+	var purview models.SgjUserOperatePurview
+	var err error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("id = ?", id).First(&purview).Error
+	return purview.ErrorMsg, err
+
+}