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

controllers/sg/his_api_controller.go

@@ -5915,12 +5915,20 @@ func (c *HisApiController) GetPreUploadInfo() {
 						result, _ := json.Marshal(respJSON)
 						fmt.Println("log")
 						fmt.Println(string(result))
-						if err := json.Unmarshal([]byte(result), &res); err != nil {
+						if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
 							utils.ErrorLog("解析失败：%v", err)
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 							return
 						}
 
+						res.InfRefmsgid = resSeven10265.InfRefmsgid
+						res.Output = resSeven10265.Output
+						res.ErrMsg = resSeven10265.ErrMsg
+						res.Cainfo = resSeven10265.Cainfo
+						res.WarnMsg = resSeven10265.WarnMsg
+						infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+						res.Infcode = infocode
+
 					} else {
 
 						var result string

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 
 	//"gdyb/service"
 	"github.com/astaxie/beego"
@@ -17,11 +17,11 @@ 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)
 
 }
 func main() {