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

controllers/sg/his_api_controller.go

@@ -3025,55 +3025,21 @@ func (c *HisApiController) GetRegisterInfo() {
 			Age = psn_info.Age
 			infoStr = psn_info.Insuinfo
 			idetinfoStr = psn_info.Idetinfo
+			infocode = 0
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
-			var res ResultTwo
-			api := "http://192.168.3.111:9532/" + "jsyb/1101?cert_no=" + "" +
-				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
-			fmt.Println(api)
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			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), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			PsnNo = res.Output.Baseinfo.PsnNo
-			PsnCertType = res.Output.Baseinfo.PsnCertType
-			Certno = res.Output.Baseinfo.Certno
-			PsnName = res.Output.Baseinfo.PsnName
-			Gend = res.Output.Baseinfo.Gend
-			Naty = res.Output.Baseinfo.Naty
-			Brdy = res.Output.Baseinfo.Brdy
-			Age = res.Output.Baseinfo.Age
-			Iinfos, _ := json.Marshal(res.Output.Iinfo)
-			Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-			infoStr = string(Iinfos)
-			idetinfoStr = string(Idetinfos)
-			infocode = res.Infcode
+			psn_info, _ := service.GetPsnByPatientId(id)
+			PsnNo = psn_info.PsnNo
+			PsnCertType = psn_info.PsnCertType
+			Certno = psn_info.Certno
+			PsnName = psn_info.PsnName
+			Gend = psn_info.Gend
+			Naty = psn_info.Naty
+			Brdy = psn_info.Brdy
+			Age = psn_info.Age
+			infoStr = psn_info.Insuinfo
+			idetinfoStr = psn_info.Idetinfo
+			infocode = 0
 
 		} 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)
@@ -3286,12 +3252,15 @@ func (c *HisApiController) GetRegisterInfo() {
 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 				result, _ := json.Marshal(respJSON)
 
-				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+				if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				infocode = resThree.Infcode
+				resThree.ErrMsg = resThree10265.ErrMsg
+				resThree.Output = resThree10265.Output
+				resThree.InfRefmsgid = resThree10265.InfRefmsgid
+				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 
 			} else {