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

service/zh_his_service.go

@@ -483,7 +483,7 @@ type ZHCustom struct {
 	HospApprFlag     int64
 }
 type ZHRequestResult struct {
-	Output      Output `json:"output" form:"output"`
+	Output      string `json:"output" form:"output"`
 	Infcode     int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
 	WarnMsg     string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
 	Cainfo      string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`