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

controllers/nm/nm_controller.go

 	beego.Router("/nmyb/2304", &NmController{}, "get:Post2304")
 	beego.Router("/nmyb/2305", &NmController{}, "get:Post2305")
 
+	beego.Router("/nmyb/5203", &NmController{}, "get:Post5203")
+
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
 }
 
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+func (c *NmController) Post5203() {
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	psn_no := c.GetString("psn_no")
+	mdtrt_id := c.GetString("mdtrt_id")
+	setl_id := c.GetString("setl_id")
+	bp := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         doctor,
+	}
+	bps := models.BusinessParams{
+		PsnNo:   psn_no,
+		MdtrtId: mdtrt_id,
+		SetlId:  setl_id,
+	}
+	result := service.Gdyb5203(bp, bps)
+	saveJsLog(result, "", "5203", "结算单", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
 func (c *NmController) Post1101() {
 	certNo := c.GetString("cert_no")
 	org_name := c.GetString("org_name")

controllers/sg/his_api_controller.go

 			infocode, _ := strconv.ParseInt(resEleven10265.Infcode, 10, 64)
 			res.Infcode = infocode
 
-		} else {
-			//result2 := service.Gdyb1101()
+		} else if miConfig.MdtrtareaAdmvs == "150499" {
+			api := "http://172.16.13.254:9532/" + "nmyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url
+
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			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
+			}
 
-			//result2 := service.Gdyb5204(baseParams, businessParams)
-			//saveLog(result2, "", "5204", "查询")
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+			fmt.Println("log")
+			fmt.Println(string(result))
+			if err := json.Unmarshal([]byte(result), &resEleven10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			res.InfRefmsgid = resEleven10265.InfRefmsgid
+			res.Output = resEleven10265.Output
+			res.ErrMsg = resEleven10265.ErrMsg
+			res.Cainfo = resEleven10265.Cainfo
+			res.WarnMsg = resEleven10265.WarnMsg
+			infocode, _ := strconv.ParseInt(resEleven10265.Infcode, 10, 64)
+			res.Infcode = infocode
+
+		} else {
 			result := service.Gdyb5203(baseParams, businessParams)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {