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

controllers/sg/his_api_controller.go

@@ -5184,6 +5184,7 @@ type Result5301For10265 struct {
 }
 
 //获取个人信息----挂号-----上传就诊信息
+
 func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -5650,8 +5651,6 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
-				//Check3101(c, patient.ID, his.ID, admin_user_id)
-
 				psn_info, _ := service.GetPsnByPatientId(id)
 				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
 				saveLog(result, requestLog, "2201A", "挂号")
@@ -5717,94 +5716,9 @@ func (c *HisApiController) GetRegisterInfo() {
 			service.UpdateHisPatientStatus(&his)
 			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
 
-			var prescriptions []*models.HisPrescription
-			res := Check3101(c, patient.ID, his.ID, admin_user_id, "1", record_time, prescriptions)
-
-			if res.Infcode == "0" {
-				if len(res.Output.Result) > 0 {
-					var res2 ResultSix
-					var resSix10265 ResultSix10265
-					var api3 string
-					if miConfig.MdtrtareaAdmvs == "320921" {
-						api3 = "http://192.168.2.110:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
-							"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-							"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
-
-						//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
-
-					} else {
-						//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
-						api3 = "http://192.168.5.251:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
-							"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-							"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
-					}
-
-					resp3, requestErr3 := http.Get(api3)
-					if requestErr3 != nil {
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-
-					body3, ioErr3 := ioutil.ReadAll(resp3.Body)
-					if ioErr3 != nil {
-						utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-					var respJSON3 map[string]interface{}
-					if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
-						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-
-					respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
-					userJSONBytes3, _ := json.Marshal(respJSON3)
-					if err := json.Unmarshal(userJSONBytes3, &resSix10265); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
-					}
-
-					res2.InfRefmsgid = resSix10265.InfRefmsgid
-					res2.Output = resSix10265.Output
-					res2.ErrMsg = resSix10265.ErrMsg
-					res2.Cainfo = resSix10265.Cainfo
-					res2.WarnMsg = resSix10265.WarnMsg
-					infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
-					res2.Infcode = infocode
-
-					if res2.Infcode == 0 {
-						var msg []string
-						msg = append(msg, "挂号失败")
-						for _, item := range res.Output.Result {
-							msg = append(msg, item.VolaCont)
-						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         msg,
-						})
-
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res2.ErrMsg,
-						})
-
-					}
-
-				} else {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"his_info": his,
-					})
-				}
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"failed_code": -10,
-					"msg":         res.ErrMsg,
-				})
-
-			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"his_info": his,
+			})
 
 		} else {
 			adminUser := c.GetAdminUserInfo()