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

controllers/sg/his_api_controller.go

@@ -2616,7 +2616,7 @@ type ResultThirteen struct {
 type ResultThirteen10265 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
+	Infcode     string `json:"infcode"`
 	Output      struct {
 		Result struct {
 			TrtDclaDetlSn string `json:"trt_dcla_detl_sn"`
@@ -7821,6 +7821,8 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 				return
 			}
 			res2.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res2.Infcode = infocode
 			res2.Output = res10265.Output
 			res2.InfRefmsgid = res10265.InfRefmsgid