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

controllers/zh/zh_his_api_controller.go

@@ -1971,7 +1971,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				data["org_name"] = miConfig.OrgName
 				data["opertor"] = roles.UserName
 				data["fixmedins_code"] = miConfig.Code
-				data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+				data["insuplc_admdvs"] = record.InsuplcAdmdvs
 				data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 				data["secret_key"] = miConfig.SecretKey
 
@@ -2359,7 +2359,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				//请求内网数据
 				api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&feedetl_sn=" + item.FeedetlSn +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
+					"&insuplc_admdvs=" + record.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2455,7 +2455,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				//请求内网数据
 				api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&number=0000" +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
+					"&insuplc_admdvs=" + record.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=" + "1"
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }