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

controllers/sg/his_api_controller.go

 			if status == "0" { //读卡成功
 				var card_info string //卡信息
 				var busi_card_info string
-				var res ResultTwo //1101结果
+				var res ResultTwo           //1101结果
+				var res10265 ResultTwo10265 //1101结果
 
 				card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
 				busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 
 				respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
 				result, _ := json.Marshal(respJSON)
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
+
+				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
+				res.ErrMsg = res10265.ErrMsg
+				infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+				res.Infcode = infocode
+				res.Output = res10265.Output
+				res.InfRefmsgid = res10265.InfRefmsgid
 
 				if res.Infcode == 0 {
 					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)

main.go

 	"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"
 )
 
 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() {