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

controllers/sg/his_api_controller.go

@@ -91,16 +91,7 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorPsnRecordNoExistWrong)
 		return
 	}
-	result := service.Gdyb5301(psn_record.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
 
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-
-	userJSONBytes, _ := json.Marshal(dat)
 	var res Result5301
 	var res10265 Result5301For10265
 
@@ -142,6 +133,17 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 
 	} else {
 
+		result := service.Gdyb5301(psn_record.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+
 		if miConfig.Code == "H15049901371" {
 			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)