111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10088
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -147,8 +147,8 @@ func (c *HisApiController) Get9001() {
 	}
 
 }
-func Check3101ForOne(c *HisApiController, patient_id int64, his models.VMHisPatient, admin_user_id int64, trig_scen string, record_time string, prescriptions []*models.HisPrescription) (res Result3101) {
-
+func Check3101ForOne(c *HisApiController, patient_id int64, his models.VMHisPatient, admin_user_id int64, trig_scen string, record_time string, prescriptions []*models.HisPrescription) (res2 Result3101) {
+	var res Result3101
 	adminUser := c.GetAdminUserInfo()
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	//his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
@@ -201,7 +201,7 @@ func Check3101ForOne(c *HisApiController, patient_id int64, his models.VMHisPati
 	pd.PatnName = his.Name
 	pd.Gend = his.Gend
 	pd.Brdy = his.Brdy
-	pd.Poolarea = his.InsuplcAdmdvs
+	pd.Poolarea = miConfig.MdtrtareaAdmvs
 	pd.CurrMdtrtID = his.Number
 
 	var fed models.FsiEncounterDtos
@@ -417,8 +417,10 @@ func Check3101ForOne(c *HisApiController, patient_id int64, his models.VMHisPati
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return res
 	}
-	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+	fmt.Println(respJSON)
 	result, _ := json.Marshal(respJSON)
+	fmt.Println(result)
 	if err := json.Unmarshal([]byte(result), &res); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -699,7 +701,7 @@ func Check3101(c *HisApiController, patient_id int64, his_patient_id int64, admi
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return res
 	}
-	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
 	result, _ := json.Marshal(respJSON)
 	if err := json.Unmarshal([]byte(result), &res); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
@@ -1073,7 +1075,7 @@ func Check3102(c *HisApiController, patient_id int64, his_patient_id int64, admi
 		return res
 	}
 
-	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
 	result, _ := json.Marshal(respJSON)
 	if err := json.Unmarshal([]byte(result), &res); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
@@ -5720,6 +5722,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			timeFormat := tempTime.Format("20060102150405")
 			chrgBchno := rand.Intn(100000) + 10000
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
+			his.Number = ipt_otp_no
 			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(department)
 			//doctor_id := strconv.FormatInt(patientPrescription., 10)
@@ -5781,11 +5784,6 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = med_type
 			}
 
-			//for _, item := range rf {
-			//	if item.Insutype == insutype {
-			//		insuplc_admdvs = item.InsuplcAdmdvs
-			//	}
-			//}
 			var infocode int64
 			var resThree ResultThree
 			var resThree10265 ResultThree10265
@@ -5851,83 +5849,102 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 
 				var hisPrescription []*models.HisPrescription
+
+				for _, item := range rf {
+					if item.Insutype == insutype {
+						//insuplc_admdvs = item.InsuplcAdmdvs
+						his.InsuplcAdmdvs = insuplc_admdvs
+					}
+				}
+				his.Insutype = insutype
+
 				res3101 := Check3101ForOne(c, patient.ID, his, admin_user_id, "1", record_time, hisPrescription)
+				fmt.Println(res3101)
+				fmt.Println(res3101.Infcode)
 
-				if res3101.Infcode == "0" && len(res3101.Output.Result) > 0 {
-					for _, item := range res3101.Output.Result {
-						if len(res3101.ErrMsg) == 0 {
-							res3101.ErrMsg = item.VolaCont
-						} else {
-							res3101.ErrMsg = res3101.ErrMsg + "\n" + item.VolaCont
+				if res3101.Infcode == "0" {
+					fmt.Println("33333333")
+					if len(res3101.Output.Result) > 0 {
+						fmt.Println("222222")
+
+						for _, item := range res3101.Output.Result {
+							if len(res3101.ErrMsg) == 0 {
+								res3101.ErrMsg = item.VolaCont
+							} else {
+								res3101.ErrMsg = res3101.ErrMsg + "\n" + item.VolaCont
+							}
 						}
-					}
-					c.ServeSuccessJSON(map[string]interface{}{
-						"failed_code": -10,
-						"msg":         res3101.ErrMsg,
-					})
-					return
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": -10,
+							"msg":         res3101.ErrMsg,
+						})
+						return
+					} else {
+						fmt.Println("11111")
+						var api string
+						if miConfig.MdtrtareaAdmvs == "320921" {
 
-				} else if res3101.Infcode != "0" {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"failed_code": -10,
-						"msg":         res3101.ErrMsg,
-					})
-					return
-				}
+							api = "http://192.168.2.110:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
+								"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
+								"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
-				var api string
-				if miConfig.MdtrtareaAdmvs == "320921" {
+						} else {
+							api = "http://192.168.5.251:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
+								"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
+								"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
-					api = "http://192.168.2.110:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
-						"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						}
 
-				} else {
-					api = "http://192.168.5.251:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
-						"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						resp, requestErr := http.Get(api)
+						if requestErr != nil {
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				}
+						body, ioErr := ioutil.ReadAll(resp.Body)
 
-				resp, requestErr := http.Get(api)
-				if requestErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						if ioErr != nil {
+							utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				body, ioErr := ioutil.ReadAll(resp.Body)
+						var respJSON map[string]interface{}
 
-				if ioErr != nil {
-					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				var respJSON map[string]interface{}
+						respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 
-				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						result, _ := json.Marshal(respJSON)
 
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+						if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				result, _ := json.Marshal(respJSON)
+						resThree.ErrMsg = resThree10265.ErrMsg
 
-				if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						resThree.Output = resThree10265.Output
 
-				resThree.ErrMsg = resThree10265.ErrMsg
+						resThree.InfRefmsgid = resThree10265.InfRefmsgid
 
-				resThree.Output = resThree10265.Output
+						infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 
-				resThree.InfRefmsgid = resThree10265.InfRefmsgid
+					}
+
+				} else if res3101.Infcode != "0" {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res3101.ErrMsg,
+					})
+					return
+				}
 
-				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 
 				psn_info, _ := service.GetPsnByPatientId(id)
@@ -6931,7 +6948,7 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
-							result3101 := Check3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
+							result3101 := Check3102(c, id, his_patient_id, admin_user_id, "7", order.ID)
 							if result3101.Infcode == "0" {
 								if len(result3101.Output.Result) > 0 {
 									var errMsgs []string
@@ -6944,76 +6961,76 @@ func (c *HisApiController) GetUploadInfo() {
 										"msg":         errMsgs,
 									})
 									return
-								}
-							}
+								} else {
+									psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+									psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
+									bas := strings.Split(psn_info.CardInfo, "|")
+									if his.IdCardType == 1 {
+										cert_no = bas[2]
+									} else if his.IdCardType == 3 {
+										cert_no = his.Certno
+										psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
+									} else if his.IdCardType == 4 {
+										cert_no = his.Certno
+										psn_info.VerifyNumber = token
+									}
+									var api string
+									if miConfig.MdtrtareaAdmvs == "320921" {
+										api = "http://192.168.2.110:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+											"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+									} else {
+										api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+											"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
-							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
-							psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-							bas := strings.Split(psn_info.CardInfo, "|")
-							if his.IdCardType == 1 {
-								cert_no = bas[2]
-							} else if his.IdCardType == 3 {
-								cert_no = his.Certno
-								psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
-							} else if his.IdCardType == 4 {
-								cert_no = his.Certno
-								psn_info.VerifyNumber = token
-							}
-							var api string
-							if miConfig.MdtrtareaAdmvs == "320921" {
-								api = "http://192.168.2.110:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-									his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-									"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-									"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-									"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-									"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-									"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
-							} else {
-								api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-									his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-									"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-									"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-									"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-									"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-									"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+									}
 
-							}
+									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
+									}
 
-							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)
 
-							respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-							result, _ := json.Marshal(respJSON)
+									if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
+										utils.ErrorLog("解析失败：%v", err)
+										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+										return
+									}
 
-							if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
-								utils.ErrorLog("解析失败：%v", err)
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-								return
+									res.InfRefmsgid = resSeven10265.InfRefmsgid
+									res.Output = resSeven10265.Output
+									res.ErrMsg = resSeven10265.ErrMsg
+									res.Cainfo = resSeven10265.Cainfo
+									res.WarnMsg = resSeven10265.WarnMsg
+									infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+									res.Infcode = infocode
+								}
 							}
 
-							res.InfRefmsgid = resSeven10265.InfRefmsgid
-							res.Output = resSeven10265.Output
-							res.ErrMsg = resSeven10265.ErrMsg
-							res.Cainfo = resSeven10265.Cainfo
-							res.WarnMsg = resSeven10265.WarnMsg
-							infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
-							res.Infcode = infocode
-
 						} else if miConfig.MdtrtareaAdmvs == "350500" {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							var cert_no string
@@ -7366,7 +7383,7 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
-				result3101 := Check3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
+				result3101 := Check3102(c, id, his_patient_id, admin_user_id, "7", tempOrder.ID)
 				if result3101.Infcode == "0" {
 					if len(result3101.Output.Result) > 0 {
 						var errMsgs []string
@@ -7379,99 +7396,101 @@ func (c *HisApiController) GetUploadInfo() {
 							"msg":         errMsgs,
 						})
 						return
-					}
-				}
-				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
-				psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
+					} else {
+						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
-				//psn_info, _ := service.GetPsnByPatientId(id)
-				bas := strings.Split(psn_info.CardInfo, "|")
+						//psn_info, _ := service.GetPsnByPatientId(id)
+						bas := strings.Split(psn_info.CardInfo, "|")
 
-				if his.IdCardType == 1 {
-					cert_no = bas[2]
-				} else {
-					cert_no = bas[1]
-				}
-
-				//江苏地区国家医保医疗类别
-				//职工透析：医疗类别选特殊情况门诊9933
-				//居民血透门慢： 医疗类别选门诊慢病1402
-				//var med_type string
-				//if his.Insutype == "310" {
-				//	if reg_type == 14 {
-				//		med_type = "9933"
-				//	} else if reg_type == 11 {
-				//		med_type = "11"
-				//
-				//	}
-				//} else if his.Insutype == "390" {
-				//	if reg_type == 14 {
-				//		med_type = "1402"
-				//	} else if reg_type == 11 {
-				//		med_type = "11"
-				//	}
-				//}
-
-				var api string
-				if miConfig.MdtrtareaAdmvs == "320921" {
-					api = "http://192.168.2.110:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-						his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-						"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-						"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-						"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-						"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						if his.IdCardType == 1 {
+							cert_no = bas[2]
+						} else {
+							cert_no = bas[1]
+						}
 
-					//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
+						//江苏地区国家医保医疗类别
+						//职工透析：医疗类别选特殊情况门诊9933
+						//居民血透门慢： 医疗类别选门诊慢病1402
+						//var med_type string
+						//if his.Insutype == "310" {
+						//	if reg_type == 14 {
+						//		med_type = "9933"
+						//	} else if reg_type == 11 {
+						//		med_type = "11"
+						//
+						//	}
+						//} else if his.Insutype == "390" {
+						//	if reg_type == 14 {
+						//		med_type = "1402"
+						//	} else if reg_type == 11 {
+						//		med_type = "11"
+						//	}
+						//}
 
-				} else {
-					//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
-					api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-						his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-						"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-						"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-						"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-						"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						var api string
+						if miConfig.MdtrtareaAdmvs == "320921" {
+							api = "http://192.168.2.110:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
-				}
+							//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 
-				resp, requestErr := http.Get(api)
-				if requestErr != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						} else {
+							//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
+							api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
-				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), &resSeven10265); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						resp, requestErr := http.Get(api)
+						if requestErr != nil {
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				res.InfRefmsgid = resSeven10265.InfRefmsgid
-				res.Output = resSeven10265.Output
-				res.ErrMsg = resSeven10265.ErrMsg
-				res.Cainfo = resSeven10265.Cainfo
-				res.WarnMsg = resSeven10265.WarnMsg
-				infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
-				res.Infcode = infocode
+						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), &resSeven10265); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+						res.InfRefmsgid = resSeven10265.InfRefmsgid
+						res.Output = resSeven10265.Output
+						res.ErrMsg = resSeven10265.ErrMsg
+						res.Cainfo = resSeven10265.Cainfo
+						res.WarnMsg = resSeven10265.WarnMsg
+						infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+						res.Infcode = infocode
+
+					}
+				}
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
@@ -8587,50 +8606,52 @@ func (c *HisApiController) GetPreUploadInfo() {
 							"msg":         errMsgs,
 						})
 						return
-					}
-				}
+					} else {
 
-				bytesData, _ := json.Marshal(data)
-				var req *http.Request
-				if miConfig.MdtrtareaAdmvs == "320921" {
-					req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
+						bytesData, _ := json.Marshal(data)
+						var req *http.Request
+						if miConfig.MdtrtareaAdmvs == "320921" {
+							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))
-				}
+						} else {
+							req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
+						}
 
-				resp, _ := client.Do(req)
-				defer resp.Body.Close()
-				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(body), &respJSON); err != nil {
-					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						resp, _ := client.Do(req)
+						defer resp.Body.Close()
+						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(body), &respJSON); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-				userJSONBytes, _ := json.Marshal(respJSON)
-				fmt.Println("log")
-				fmt.Println(string(userJSONBytes))
-				if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
+						respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+						userJSONBytes, _ := json.Marshal(respJSON)
+						fmt.Println("log")
+						fmt.Println(string(userJSONBytes))
+						if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 
-				res.InfRefmsgid = resFour10265.InfRefmsgid
-				res.Output = resFour10265.Output
-				res.ErrMsg = resFour10265.ErrMsg
-				res.Cainfo = resFour10265.Cainfo
-				res.WarnMsg = resFour10265.WarnMsg
-				infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
-				res.Infcode = infocode
+						res.InfRefmsgid = resFour10265.InfRefmsgid
+						res.Output = resFour10265.Output
+						res.ErrMsg = resFour10265.ErrMsg
+						res.Cainfo = resFour10265.Cainfo
+						res.WarnMsg = resFour10265.WarnMsg
+						infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+						res.Infcode = infocode
+
+					}
+				}
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 
@@ -8925,100 +8946,101 @@ func (c *HisApiController) GetPreUploadInfo() {
 									"msg":         errMsgs,
 								})
 								return
-							}
-						}
-
-						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
-						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-
-						bas := strings.Split(psn_info.CardInfo, "|")
-
-						if his.IdCardType == 1 {
-							cert_no = bas[2]
-						} else {
-							cert_no = bas[1]
-						}
-						//江苏地区国家医保医疗类别
-						//职工透析：医疗类别选特殊情况门诊9933
-						//居民血透门慢： 医疗类别选门诊慢病1402
-						//var med_type string
-						//if his.Insutype == "310" {
-						//	if reg_type == 14 {
-						//		med_type = "9933"
-						//	} else if reg_type == 11 {
-						//		med_type = "11"
-						//
-						//	}
-						//} else if his.Insutype == "390" {
-						//	if reg_type == 14 {
-						//		med_type = "1402"
-						//	} else if reg_type == 11 {
-						//		med_type = "11"
-						//	}
-						//}
+							} else {
+								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+								psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
-						var api string
+								bas := strings.Split(psn_info.CardInfo, "|")
 
-						if miConfig.MdtrtareaAdmvs == "320921" {
-							api = "http://192.168.2.110:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
+								if his.IdCardType == 1 {
+									cert_no = bas[2]
+								} else {
+									cert_no = bas[1]
+								}
+								//江苏地区国家医保医疗类别
+								//职工透析：医疗类别选特殊情况门诊9933
+								//居民血透门慢： 医疗类别选门诊慢病1402
+								//var med_type string
+								//if his.Insutype == "310" {
+								//	if reg_type == 14 {
+								//		med_type = "9933"
+								//	} else if reg_type == 11 {
+								//		med_type = "11"
+								//
+								//	}
+								//} else if his.Insutype == "390" {
+								//	if reg_type == 14 {
+								//		med_type = "1402"
+								//	} else if reg_type == 11 {
+								//		med_type = "11"
+								//	}
+								//}
+
+								var api string
+
+								if miConfig.MdtrtareaAdmvs == "320921" {
+									api = "http://192.168.2.110:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+										his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+										"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+										"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+										"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+										"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&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))
+									api = "http://192.168.5.251:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+										his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+										"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+										"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+										"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+										"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&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))
-							api = "http://192.168.5.251:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
-								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
-								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
-								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
+								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
+								}
 
-						resp, requestErr := http.Get(api)
-						if requestErr != nil {
-							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), &resSeven10265); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									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
-						}
+								res.InfRefmsgid = resSeven10265.InfRefmsgid
+								res.Output = resSeven10265.Output
+								res.ErrMsg = resSeven10265.ErrMsg
+								res.Cainfo = resSeven10265.Cainfo
+								res.WarnMsg = resSeven10265.WarnMsg
+								infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+								res.Infcode = infocode
 
-						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), &resSeven10265); err != nil {
-							utils.ErrorLog("解析失败：%v", err)
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-							return
+							}
 						}
 
-						res.InfRefmsgid = resSeven10265.InfRefmsgid
-						res.Output = resSeven10265.Output
-						res.ErrMsg = resSeven10265.ErrMsg
-						res.Cainfo = resSeven10265.Cainfo
-						res.WarnMsg = resSeven10265.WarnMsg
-						infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
-						res.Infcode = infocode
-
 					} else if miConfig.MdtrtareaAdmvs == "350500" {
 
 						result, request_log, _ := service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)

main.go

@@ -2,19 +2,10 @@ package main
 
 import (
 	"gdyb/service"
-	"github.com/qiniu/api.v7/auth/qbox"
-	"github.com/qiniu/api.v7/storage"
-
-	//"gdyb/service"
-
-	//"context"
-	"fmt"
-	"gdyb/models"
-	//"gdyb/service"
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
-	"strconv"
-	"time"
+
+	//"gdyb/service"
 
 	//"gdyb/models"
 	_ "gdyb/routers"
@@ -26,9 +17,6 @@ import (
 
 	//"gdyb/service"
 	"github.com/astaxie/beego"
-	//"github.com/qiniu/api.v7/auth/qbox"
-	//"github.com/qiniu/api.v7/storage"
-	"os"
 	//"strconv"
 	//"time"
 )
@@ -803,104 +791,104 @@ type ResultSeventeen struct {
 //	}
 //}
 
-func CreateLog(miConfig models.MedicalInsuranceOrgConfig) {
-	Mkdir(miConfig.OrgName + "日志")
-	//org_id,_ := beego.AppConfig.Int("org_id")
-	month := time.Unix(1557042972, 0).Format("1")
-	year := time.Now().Format("2006")
-	month = time.Now().Format("01")
-	day := time.Now().Format("02")
-	file := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + year + month + day + "_log"
-	file_name := file + ".txt"
-	file_path := miConfig.OrgName + "日志" + "/" + file_name
-	exist, _ := PathExists(file_path)
-	if exist { //存在
-		fmt.Println("存在")
-		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
-		if err != nil {
-			fmt.Println("read fail")
-		}
-		content := "\r\r\r"
-		n, _ := f.Seek(0, 2)
-		_, err = f.WriteAt([]byte(content), n)
-
-	} else { //不存在
-		fmt.Println("文件不存在，创建文件")
-		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
-		defer f.Close()
-		if err != nil {
-		} else {
-			_, err = f.Write([]byte("记录日志"))
-		}
-	}
-
-}
-
-func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
-	//获取七牛云上的文件信息，不存在则表示没上传到七牛云，上传昨天日志信息
-	nTime := time.Now()
-	yesTime := nTime.AddDate(0, 0, -1)
-	file_key := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + yesTime.Format("20060102") + "_log.txt"
-	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
-	cfg := storage.Config{
-		// 是否使用https域名进行资源管理
-		UseHTTPS: true,
-	}
-	// 指定空间所在的区域，如果不指定将自动探测
-	// 如果没有特殊需求，默认不需要指定
-	//cfg.Zone=&storage.ZoneHuabei
-	bucketManager := storage.NewBucketManager(mac, &cfg)
-	bucket := beego.AppConfig.String("qiniu_bucket")
-	key := file_key
-	file, sErr := bucketManager.Stat(bucket, key)
-	fmt.Println(file)
-	fmt.Println(sErr)
-	fmt.Println(miConfig.OrgName + "日志" + "/" + file_key)
-
-	if sErr != nil {
-		fmt.Println("七牛云上文件不存在，上传到七牛云")
-		//判断本地文件是否存在，存在则执行上传操作
-		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
-		if exist {
-			//upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
-		} else {
-			fmt.Println("本地文件不存在")
-
-		}
-	} else {
-		fmt.Println("七牛云文件存在")
-	}
+//func CreateLog(miConfig models.MedicalInsuranceOrgConfig) {
+//	Mkdir(miConfig.OrgName + "日志")
+//	//org_id,_ := beego.AppConfig.Int("org_id")
+//	month := time.Unix(1557042972, 0).Format("1")
+//	year := time.Now().Format("2006")
+//	month = time.Now().Format("01")
+//	day := time.Now().Format("02")
+//	file := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + year + month + day + "_log"
+//	file_name := file + ".txt"
+//	file_path := miConfig.OrgName + "日志" + "/" + file_name
+//	exist, _ := PathExists(file_path)
+//	if exist { //存在
+//		fmt.Println("存在")
+//		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+//		if err != nil {
+//			fmt.Println("read fail")
+//		}
+//		content := "\r\r\r"
+//		n, _ := f.Seek(0, 2)
+//		_, err = f.WriteAt([]byte(content), n)
+//
+//	} else { //不存在
+//		fmt.Println("文件不存在，创建文件")
+//		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+//		defer f.Close()
+//		if err != nil {
+//		} else {
+//			_, err = f.Write([]byte("记录日志"))
+//		}
+//	}
+//
+//}
 
-}
-func Mkdir(dir string) {
-	// 创建文件夹
-	exist, err := PathExists(dir)
-	if err != nil {
-		fmt.Println(err.Error())
-	} else {
-		if exist {
-			fmt.Println(dir + "文件夹已存在！")
-		} else {
-			// 文件夹名称，权限
-			err := os.Mkdir(dir, os.ModePerm)
-			if err != nil {
-				fmt.Println(dir+"文件夹创建失败：", err.Error())
-			} else {
-				fmt.Println(dir + "文件夹创建成功！")
-			}
-		}
-	}
-}
-func PathExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
+//func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
+//	//获取七牛云上的文件信息，不存在则表示没上传到七牛云，上传昨天日志信息
+//	nTime := time.Now()
+//	yesTime := nTime.AddDate(0, 0, -1)
+//	file_key := strconv.FormatInt(miConfig.UserOrgId, 10) + "_" + yesTime.Format("20060102") + "_log.txt"
+//	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+//	cfg := storage.Config{
+//		// 是否使用https域名进行资源管理
+//		UseHTTPS: true,
+//	}
+//	// 指定空间所在的区域，如果不指定将自动探测
+//	// 如果没有特殊需求，默认不需要指定
+//	//cfg.Zone=&storage.ZoneHuabei
+//	bucketManager := storage.NewBucketManager(mac, &cfg)
+//	bucket := beego.AppConfig.String("qiniu_bucket")
+//	key := file_key
+//	file, sErr := bucketManager.Stat(bucket, key)
+//	fmt.Println(file)
+//	fmt.Println(sErr)
+//	fmt.Println(miConfig.OrgName + "日志" + "/" + file_key)
+//
+//	if sErr != nil {
+//		fmt.Println("七牛云上文件不存在，上传到七牛云")
+//		//判断本地文件是否存在，存在则执行上传操作
+//		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
+//		if exist {
+//			//upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
+//		} else {
+//			fmt.Println("本地文件不存在")
+//
+//		}
+//	} else {
+//		fmt.Println("七牛云文件存在")
+//	}
+//
+//}
+//func Mkdir(dir string) {
+//	// 创建文件夹
+//	exist, err := PathExists(dir)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//	} else {
+//		if exist {
+//			fmt.Println(dir + "文件夹已存在！")
+//		} else {
+//			// 文件夹名称，权限
+//			err := os.Mkdir(dir, os.ModePerm)
+//			if err != nil {
+//				fmt.Println(dir+"文件夹创建失败：", err.Error())
+//			} else {
+//				fmt.Println(dir + "文件夹创建成功！")
+//			}
+//		}
+//	}
+//}
+//func PathExists(path string) (bool, error) {
+//	_, err := os.Stat(path)
+//	if err == nil {
+//		return true, nil
+//	}
+//	if os.IsNotExist(err) {
+//		return false, nil
+//	}
+//	return false, err
+//}
 
 //func upload_qiniu(filePath string, keys string) {
 //	key := keys

service/his_service.go

@@ -521,7 +521,7 @@ func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date
 }
 
 func FindLastPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ?", org_id, record_date, patient_id).Last(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ?", org_id, patient_id).Last(&info).Error
 	return
 }