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

controllers/sg/his_api_controller.go

@@ -2664,16 +2664,23 @@ func (c *HisApiController) GetRegisterInfo() {
 		} else {
 			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
 			saveLog(result, requestLog, "1101", "人员基本信息获取")
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
+			if miConfig.Code == "H15049901371" {
 
-			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.ErrMsg = res10265.ErrMsg
+				res.Output = res10265.Output
+				res.InfRefmsgid = res10265.InfRefmsgid
+
+			} else {
+				if err := json.Unmarshal([]byte(result), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
 
 			PsnNo = res.Output.Baseinfo.PsnNo
@@ -2829,8 +2836,6 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				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), &resThree); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
@@ -2840,14 +2845,28 @@ func (c *HisApiController) GetRegisterInfo() {
 				infocode = resThree.Infcode
 
 			} else {
-				fmt.Println(roles.UserName)
+
 				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
 				saveLog(result, requestLog, "2201", "挂号")
-				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
+
+				if miConfig.Code == "H15049901371" {
+
+					if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					resThree.ErrMsg = resThree10265.ErrMsg
+					resThree.Output = resThree10265.Output
+					resThree.InfRefmsgid = resThree10265.InfRefmsgid
+				} else {
+					if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
 				}
+
 				if miConfig.Code == "H15049901371" {
 					infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 				} else {