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

controllers/sg/his_api_controller.go

@@ -3834,7 +3834,7 @@ func (c *HisApiController) GetPatientInfo() {
 		}
 
 		userJSONBytes, _ := json.Marshal(dat)
-		var res ResultFourteen
+		var res ResultTwo
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)