777

controllers/sg/his_api_controller.go

@@ -8152,9 +8152,15 @@ func (c *HisApiController) GetCFYLJG001() {
 				cFYLJG001.Diseinfo = append(cFYLJG001.Diseinfo, dia)
 			}
 		}
-		result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001, his.Insutype)
+		if miConfig.MdtrtareaAdmvs == "340699" {
+			result, request := service.GetAHCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001, his.Insutype)
+			saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
 
-		saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
+		} else {
+			result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001, his.Insutype)
+			saveLog(result, request, "GetCFYLJG001", "GetCFYLJG001")
+
+		}
 
 		var res ResultCFYLJG001
 		var respJSON2 map[string]interface{}
@@ -8268,9 +8274,16 @@ func (c *HisApiController) GetCFYLJG002() {
 
 	fmt.Println(err)
 
-	result, request := service.GetCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
-	//result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001,his.Insutype)
-	saveLog(result, request, "GetCFYLJG002", "GetCFYLJG002")
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+		saveLog(result, request, "GetCFYLJG002", "GetCFYLJG002")
+
+	} else {
+		result, request := service.GetCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+		//result, request := service.GetCFYLJG001(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG001,his.Insutype)
+		saveLog(result, request, "GetCFYLJG002", "GetCFYLJG002")
+
+	}
 
 	var res2 Result002
 	var respJSON2 map[string]interface{}
@@ -8367,8 +8380,16 @@ func (c *HisApiController) GetCFYLJG003() {
 	timeFormatTwo := tempTime2.Format("2006-01-02 15:04:05")
 	cFYLJG003.PharChkTime = timeFormatTwo
 
-	result, request := service.GetCFYLJG003(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
-	saveLog(result, request, "GetCFYLJG003", "GetCFYLJG003")
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+		result, request := service.GetAHCFYLJG003(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
+		saveLog(result, request, "GetAHCFYLJG003", "GetAHCFYLJG003")
+
+	} else {
+		result, request := service.GetCFYLJG003(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
+		saveLog(result, request, "GetCFYLJG003", "GetCFYLJG003")
+
+	}
 
 	var res ResultCFYLJG003
 	var respJSON2 map[string]interface{}
@@ -8431,8 +8452,17 @@ func (c *HisApiController) GetCFYLJG004() {
 	cFYLJG004.UndoTime = time.Now().Format("2006-01-02 15:04:05")
 	cFYLJG004.UndoDrName = doctor_info.UserName
 	cFYLJG004.UndoDrCode = doctor_info.DoctorNumber
-	result, request := service.GetCFYLJG004(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG004)
-	saveLog(result, request, "GetCFYLJG004", "GetCFYLJG004")
+
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+		result, request := service.GetAHCFYLJG004(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG003)
+		saveLog(result, request, "GetAHCFYLJG004", "GetAHCFYLJG004")
+
+	} else {
+		result, request := service.GetCFYLJG004(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG004)
+		saveLog(result, request, "GetCFYLJG004", "GetCFYLJG004")
+
+	}
 
 	var res ResultCFYLJG004
 	var respJSON2 map[string]interface{}
@@ -8485,8 +8515,18 @@ func (c *HisApiController) GetCFYLJG005() {
 	cFYLJG005.PsnName = his.Name
 	cFYLJG005.PsnCertType = "01"
 	cFYLJG005.Certno = his.IdCardNo
-	result, request := service.GetCFYLJG005(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG005)
-	saveLog(result, request, "GetCFYLJG005", "GetCFYLJG005")
+
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+
+		result, request := service.GetAHCFYLJG005(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG005)
+		saveLog(result, request, "GetCFYLJG005", "GetCFYLJG005")
+
+	} else {
+		result, request := service.GetCFYLJG005(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG005)
+		saveLog(result, request, "GetCFYLJG005", "GetCFYLJG005")
+
+	}
 
 	var res ResultCFYLJG005
 	var respJSON2 map[string]interface{}
@@ -8534,8 +8574,17 @@ func (c *HisApiController) GetCFYLJG006() {
 	cFYLJG006.PsnName = patient.Name
 	cFYLJG006.PsnCertType = "01"
 	cFYLJG006.Certno = patient.IdCardNo
-	result, request := service.GetCFYLJG006(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG006)
-	saveLog(result, request, "GetCFYLJG006", "GetCFYLJG006")
+
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		//result, request := service.GetAHCFYLJG002(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, encoded, rx_encoded, "")
+
+		result, request := service.GetAHCFYLJG006(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG006)
+		saveLog(result, request, "GetCFYLJG006", "GetCFYLJG006")
+	} else {
+		result, request := service.GetCFYLJG006(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG006)
+		saveLog(result, request, "GetCFYLJG006", "GetCFYLJG006")
+	}
+
 	var res ResultCFYLJG006
 	var respJSON2 map[string]interface{}
 	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -8585,8 +8634,14 @@ func (c *HisApiController) GetCFYLJG007() {
 	cFYLJG007.PsnCertType = "01"
 	cFYLJG007.Certno = patient.IdCardNo
 	cFYLJG007.PsnName = patient.Name
-	result, request := service.GetCFYLJG007(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG007)
-	saveLog(result, request, "GetCFYLJG007", "GetCFYLJG007")
+
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		result, request := service.GetAHCFYLJG007(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG007)
+		saveLog(result, request, "GetCFYLJG007", "GetCFYLJG007")
+	} else {
+		result, request := service.GetCFYLJG007(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG007)
+		saveLog(result, request, "GetCFYLJG007", "GetCFYLJG007")
+	}
 
 	var res ResultCFYLJG007
 	var respJSON2 map[string]interface{}
@@ -8661,33 +8716,40 @@ func (c *HisApiController) GetCFYLJG008() {
 	MPI.MedListCodg = prescriptions[0].HisDoctorAdviceInfo[0].MedListCodg
 	MPI.Cnt = prescriptions[0].HisDoctorAdviceInfo[0].PrescribingNumber
 	cFYLJG008.MedList = append(cFYLJG008.MedList, MPI)
-	result, request := service.GetCFYLJG008(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG008)
-	saveLog(result, request, "GetCFYLJG008", "GetCFYLJG008")
 
-	var res ResultCFYLJG008
-	var respJSON2 map[string]interface{}
-	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	userJSONBytes2, _ := json.Marshal(respJSON2)
-	if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	if res.Infcode == -1 {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"failed_code": -10,
-			"msg":         res.ErrMsg,
-		})
-		return
+	if miConfig.MdtrtareaAdmvs == "340699" {
+		result, request := service.GetAHCFYLJG008(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG008)
+		saveLog(result, request, "GetAHCFYLJG008", "GetAHCFYLJG008")
+
 	} else {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"info": res.Output,
-		})
-		return
+		result, request := service.GetCFYLJG008(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG008)
+		saveLog(result, request, "GetCFYLJG008", "GetCFYLJG008")
+
+		var res ResultCFYLJG008
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		userJSONBytes2, _ := json.Marshal(respJSON2)
+		if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == -1 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.ErrMsg,
+			})
+			return
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"info": res.Output,
+			})
+			return
+		}
 	}
 
 }

service/ah_dianzichufang.go

@@ -11,139 +11,146 @@ import (
 	"time"
 )
 
-func GetAHCFYLJG001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG001 models.CFYLJG001, isu string) (string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
+func GetAHCFYLJG001(org_name string, opera string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG001 models.CFYLJG001, isu string, cainfo string) (string, string) {
+	// 生成签名
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	//input := make(map[string]interface{})
-	inputData := make(map[string]interface{}, 0)
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
-	inputMessage["infno"] = "CFYLJG001"
-
-	inputData["mdtrt_cert_type"] = cFYLJG001.MdtrtCertType
-	inputData["mdtrt_cert_no"] = cFYLJG001.MdtrtCertNo
-	inputData["card_sn"] = cFYLJG001.CardSn
-	inputData["ec_token"] = cFYLJG001.EcToken
-	inputData["auth_no"] = cFYLJG001.AuthNo
-	inputData["biz_type_code"] = cFYLJG001.BizTypeCode
-	inputData["insu_admdvs"] = cFYLJG001.InsuAdmdvs
-	inputData["hosp_rxno"] = cFYLJG001.HospRxno
-	inputData["init_rxno"] = cFYLJG001.InitRxno
-	inputData["rx_type_code"] = cFYLJG001.RxTypeCode
-	inputData["prsc_time"] = cFYLJG001.PrscTime
-	inputData["rx_drug_cnt"] = cFYLJG001.RxDrugCnt
-	inputData["rx_used_way_codg"] = cFYLJG001.RxUsedWayCodg
-	inputData["rx_used_way_name"] = cFYLJG001.RxUsedWayName
-	inputData["rx_frqu_codg"] = cFYLJG001.RxFrquCodg
-	inputData["rx_frqu_name"] = cFYLJG001.RxFrquName
-	inputData["rx_dosunt"] = cFYLJG001.RxDosunt
-	inputData["rx_doscnt"] = cFYLJG001.RxDoscnt
-	inputData["rx_drord_dscr"] = cFYLJG001.RxDrordDscr
-	inputData["vali_days"] = cFYLJG001.ValiDays
-	inputData["vali_end_time"] = cFYLJG001.ValiEndTime
-	inputData["rept_flag"] = cFYLJG001.ReptFlag
-	inputData["max_rept_cnt"] = cFYLJG001.MaxReptCnt
-	inputData["reptd_cnt"] = cFYLJG001.ReptdCnt
-	inputData["min_inrv_days"] = cFYLJG001.MinInrvDays
-	inputData["rx_cotn_flag"] = cFYLJG001.RxCotnFlag
-	inputData["long_rx_flag"] = cFYLJG001.LongRxFlag
-	inputData["mdtrtareaNo"] = cFYLJG001.MdtrtareaNo
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	inputData := make(map[string]interface{}, 0)
+	inputData["mdtrtCertType"] = cFYLJG001.MdtrtCertType
+	inputData["mdtrtCertNo"] = cFYLJG001.MdtrtCertNo
+	inputData["cardSn"] = cFYLJG001.CardSn
+	inputData["bizTypeCode"] = cFYLJG001.BizTypeCode
+	inputData["rxExraAttrCode"] = ""
+	inputData["ecToken"] = cFYLJG001.EcToken
+	inputData["authNo"] = cFYLJG001.AuthNo
+	inputData["insuPlcNo"] = ""
+	inputData["mdtrtareaNo"] = ""
+	inputData["hospRxno"] = cFYLJG001.HospRxno
+	inputData["initRxno"] = cFYLJG001.InitRxno
+	inputData["rxTypeCode"] = cFYLJG001.RxTypeCode
+	inputData["prscTime"] = cFYLJG001.PrscTime
+	inputData["rxDrugCnt"] = cFYLJG001.RxDrugCnt
+	inputData["rxUsedWayCodg"] = cFYLJG001.RxUsedWayCodg
+	inputData["rxUsedWayName"] = cFYLJG001.RxUsedWayName
+	inputData["rxFrquCodg"] = cFYLJG001.RxFrquCodg
+	inputData["rxFrquName"] = cFYLJG001.RxFrquName
+	inputData["rxDosunt"] = cFYLJG001.RxDosunt
+	inputData["rxDoscnt"] = cFYLJG001.RxDoscnt
+	inputData["rxDrordDscr"] = cFYLJG001.RxDrordDscr
+	inputData["valiDays"] = cFYLJG001.ValiDays
+	inputData["valiEndTime"] = cFYLJG001.ValiEndTime
+	inputData["reptFlag"] = cFYLJG001.ReptFlag
+
+	inputData["maxReptCnt"] = cFYLJG001.MaxReptCnt
+	inputData["minInrvDays"] = cFYLJG001.MinInrvDays
+	inputData["rxCotnFlag"] = cFYLJG001.RxCotnFlag
+	inputData["longRxFlag"] = cFYLJG001.LongRxFlag
+
+	//inputData["reptd_cnt"] = cFYLJG001.ReptdCnt
+	//inputData["mdtrtareaNo"] = cFYLJG001.MdtrtareaNo
 
 	rxdrugdetail := make([]map[string]interface{}, 0)
 
 	rxdrug := make(map[string]interface{})
 	for _, item := range cFYLJG001.List {
-		rxdrug["med_list_codg"] = item.MedListCodg
-		rxdrug["medins_list_codg"] = item.MedinsListCodg
-		rxdrug["hosp_prep_flag"] = item.HospPrepFlag
-		rxdrug["rx_item_type_code"] = item.RxItemTypeCode
-		rxdrug["rx_item_type_name"] = item.RxItemTypeName
-		rxdrug["tcmdrug_type_name"] = item.TcmdrugTypeName
-		rxdrug["tcmdrug_type_code"] = item.TcmdrugTypeCode
-		rxdrug["tcmherb_foote"] = item.TcmherbFoote
-		rxdrug["medn_type_code"] = item.MednTypeCode
-		rxdrug["medn_type_name"] = item.MednTypeName
-		rxdrug["main_medc_flag"] = item.MainMedcFlag
-		rxdrug["urgt_flag"] = item.UrgtFlag
-		rxdrug["bas_medn_flag"] = item.BasMednFlag
-		rxdrug["imp_drug_flag"] = item.ImpDrugFlag
-		rxdrug["drug_prodname"] = item.DrugProdname
-		rxdrug["genname_codg"] = item.GennameCodg
-		rxdrug["drug_genname"] = item.DrugGenname
-		rxdrug["drug_dosform"] = item.DrugDosform
-		rxdrug["drug_spec"] = item.DrugSpec
-		rxdrug["prdr_name"] = item.PrdrName
-		rxdrug["medc_way_codg"] = item.MedcWayCodg
-		rxdrug["medc_way_dscr"] = item.MedcWayDscr
-		rxdrug["medc_begntime"] = item.MedcBegntime
-		rxdrug["medc_endtime"] = item.MedcEndtime
-		rxdrug["medc_days"] = item.MedcDays
-		rxdrug["drug_pric"] = item.DrugPric
-		rxdrug["drug_sumamt"] = item.DrugSumamt
-		rxdrug["drug_cnt"] = item.DrugCnt
-		rxdrug["drug_dosunt"] = item.DrugDosunt
-		rxdrug["sin_doscnt"] = item.SinDoscnt
-		rxdrug["sin_dosunt"] = item.SinDosunt
-		rxdrug["used_frqu_codg"] = item.UsedFrquCodg
-		rxdrug["used_frqu_name"] = item.UsedFrquName
-		rxdrug["drug_totlcnt"] = item.DrugTotlcnt
-
-		rxdrug["drug_totlcnt_emp"] = item.DrugTotlcntEmp
-		rxdrug["hosp_appr_flag"] = item.HospApprFlag
-		//rxdrug["extras"] = ""
+		rxdrug["medListCodg"] = item.MedListCodg
+		rxdrug["fixmedinsHilistId"] = item.MedinsListCodg
+		rxdrug["hospPrepFlag"] = item.HospPrepFlag
+		rxdrug["rxItemTypeCode"] = item.RxItemTypeCode
+		rxdrug["rxItemTypeName"] = item.RxItemTypeName
+		rxdrug["tcmdrugTypeName"] = item.TcmdrugTypeName
+		rxdrug["tcmdrugTypeCode"] = item.TcmdrugTypeCode
+		rxdrug["tcmherbFoote"] = item.TcmherbFoote
+
+		rxdrug["mednTypeCode"] = item.MednTypeCode
+		rxdrug["mednTypeName"] = item.MednTypeName
+		rxdrug["mainMedcFlag"] = item.MainMedcFlag
+
+		rxdrug["urgtFlag"] = item.UrgtFlag
+		rxdrug["basMednFlag"] = item.BasMednFlag
+		rxdrug["impDrugFlag"] = item.ImpDrugFlag
+		rxdrug["otcFlag"] = ""
+		rxdrug["drugGenname"] = item.DrugGenname
+		rxdrug["drugDosform"] = item.DrugDosform
+		rxdrug["drugSpec"] = item.DrugSpec
+		rxdrug["drugProdname"] = item.DrugProdname
+		rxdrug["prdrName"] = item.PrdrName
+		rxdrug["medcWayCodg"] = item.MedcWayCodg
+		rxdrug["medcWayDscr"] = item.MedcWayDscr
+		rxdrug["medcBegntime"] = item.MedcBegntime
+		rxdrug["medcEndtime"] = item.MedcEndtime
+		rxdrug["medcDays"] = item.MedcDays
+		rxdrug["sinDosunt"] = item.SinDosunt
+		rxdrug["sinDoscnt"] = item.SinDoscnt
+		rxdrug["usedFrquCodg"] = item.UsedFrquCodg
+		rxdrug["usedFrquName"] = item.UsedFrquName
+		rxdrug["drugDosunt"] = item.DrugDosunt
+		rxdrug["drugCnt"] = item.DrugCnt
+		rxdrug["drugPric"] = item.DrugPric
+		rxdrug["drugSumamt"] = item.DrugSumamt
+		rxdrug["hospApprFlag"] = item.HospApprFlag
+
+		rxdrug["selfPayRea"] = ""
+		rxdrug["realDscr"] = ""
+
+		//rxdrug["genname_codg"] = item.GennameCodg
+		//rxdrug["drug_totlcnt"] = item.DrugTotlcnt
+		//rxdrug["drug_totlcnt_emp"] = item.DrugTotlcntEmp
+		rxdrug["extras"] = ""
 		rxdrugdetail = append(rxdrugdetail, rxdrug)
 	}
 	inputData["rxdrugdetail"] = rxdrugdetail
 
 	mdtrtinfo := make(map[string]interface{})
-	mdtrtinfo["fixmedins_code"] = cFYLJG001.Mdtrtinfo.FixmedinsCode
-	mdtrtinfo["fixmedins_name"] = cFYLJG001.Mdtrtinfo.FixmedinsName
-	mdtrtinfo["mdtrt_id"] = cFYLJG001.Mdtrtinfo.MdtrtID
-	mdtrtinfo["med_type"] = cFYLJG001.Mdtrtinfo.MedType
-	mdtrtinfo["ipt_otp_no"] = cFYLJG001.Mdtrtinfo.IptOtpNo
-	mdtrtinfo["otp_ipt_flag"] = cFYLJG001.Mdtrtinfo.OtpIptFlag
-	mdtrtinfo["psn_no"] = cFYLJG001.Mdtrtinfo.PsnNo
-	mdtrtinfo["patn_name"] = cFYLJG001.Mdtrtinfo.PatnName
-	mdtrtinfo["psn_cert_type"] = cFYLJG001.Mdtrtinfo.PsnCertType
+	mdtrtinfo["fixmedinsCode"] = cFYLJG001.Mdtrtinfo.FixmedinsCode
+	mdtrtinfo["fixmedinsName"] = cFYLJG001.Mdtrtinfo.FixmedinsName
+	mdtrtinfo["mdtrtId"] = cFYLJG001.Mdtrtinfo.MdtrtID
+	mdtrtinfo["medType"] = cFYLJG001.Mdtrtinfo.MedType
+	mdtrtinfo["iptOtpNo"] = cFYLJG001.Mdtrtinfo.IptOtpNo
+	mdtrtinfo["otpIptFlag"] = cFYLJG001.Mdtrtinfo.OtpIptFlag
+	mdtrtinfo["psnNo"] = cFYLJG001.Mdtrtinfo.PsnNo
+	mdtrtinfo["patnName"] = cFYLJG001.Mdtrtinfo.PatnName
+	mdtrtinfo["psnCertType"] = cFYLJG001.Mdtrtinfo.PsnCertType
 	mdtrtinfo["certno"] = cFYLJG001.Mdtrtinfo.Certno
-	mdtrtinfo["patn_age"] = cFYLJG001.Mdtrtinfo.PatnAge
-	mdtrtinfo["patn_hgt"] = cFYLJG001.Mdtrtinfo.PatnHgt
-	mdtrtinfo["patn_wt"] = cFYLJG001.Mdtrtinfo.PatnWt
+	mdtrtinfo["patnAge"] = cFYLJG001.Mdtrtinfo.PatnAge
+	mdtrtinfo["patnHgt"] = cFYLJG001.Mdtrtinfo.PatnHgt
+	mdtrtinfo["patnWt"] = cFYLJG001.Mdtrtinfo.PatnWt
 	mdtrtinfo["gend"] = cFYLJG001.Mdtrtinfo.Gend
 	mdtrtinfo["birctrlType"] = cFYLJG001.Mdtrtinfo.BirctrlType
 	mdtrtinfo["birctrlMatnDate"] = cFYLJG001.Mdtrtinfo.BirctrlMatnDate
 	mdtrtinfo["matnType"] = cFYLJG001.Mdtrtinfo.MatnType
-	mdtrtinfo["geso_val"] = cFYLJG001.Mdtrtinfo.GesoVal
-	mdtrtinfo["nwb_flag"] = cFYLJG001.Mdtrtinfo.NwbFlag
-	mdtrtinfo["nwb_age"] = cFYLJG001.Mdtrtinfo.NwbAge
-	mdtrtinfo["suck_prd_flag"] = cFYLJG001.Mdtrtinfo.SuckPrdFlag
-	mdtrtinfo["algs_his"] = cFYLJG001.Mdtrtinfo.AlgsHis
-	mdtrtinfo["prsc_dept_name"] = cFYLJG001.Mdtrtinfo.PrscDeptName
-	mdtrtinfo["prsc_dept_code"] = cFYLJG001.Mdtrtinfo.PrscDeptCode
-	mdtrtinfo["dr_code"] = cFYLJG001.Mdtrtinfo.DrCode
-	mdtrtinfo["prsc_dr_name"] = cFYLJG001.Mdtrtinfo.PrscDrName
-	mdtrtinfo["prsc_dr_cert_type"] = cFYLJG001.Mdtrtinfo.PrscDrCertType
-	mdtrtinfo["prsc_dr_certno"] = cFYLJG001.Mdtrtinfo.PrscDrCertno
-	mdtrtinfo["dr_profttl_codg"] = cFYLJG001.Mdtrtinfo.DrProfttlCodg
-	mdtrtinfo["dr_profttl_name"] = cFYLJG001.Mdtrtinfo.DrProfttlName
-	mdtrtinfo["dr_dept_code"] = cFYLJG001.Mdtrtinfo.DrDeptCode
-	mdtrtinfo["dr_dept_name"] = cFYLJG001.Mdtrtinfo.DrDeptName
+	mdtrtinfo["gesoVal"] = cFYLJG001.Mdtrtinfo.GesoVal
+	mdtrtinfo["nwbFlag"] = cFYLJG001.Mdtrtinfo.NwbFlag
+	mdtrtinfo["nwbAge"] = cFYLJG001.Mdtrtinfo.NwbAge
+	mdtrtinfo["suckPrdFlag"] = cFYLJG001.Mdtrtinfo.SuckPrdFlag
+	mdtrtinfo["algsHis"] = cFYLJG001.Mdtrtinfo.AlgsHis
+	mdtrtinfo["prscDeptName"] = cFYLJG001.Mdtrtinfo.PrscDeptName
+	mdtrtinfo["prscDeptCode"] = cFYLJG001.Mdtrtinfo.PrscDeptCode
+	mdtrtinfo["drCode"] = cFYLJG001.Mdtrtinfo.DrCode
+	mdtrtinfo["prscDrName"] = cFYLJG001.Mdtrtinfo.PrscDrName
+	mdtrtinfo["prscDrCertType"] = cFYLJG001.Mdtrtinfo.PrscDrCertType
+	mdtrtinfo["prscDrCertno"] = cFYLJG001.Mdtrtinfo.PrscDrCertno
+	mdtrtinfo["drProfttlCodg"] = cFYLJG001.Mdtrtinfo.DrProfttlCodg
+	mdtrtinfo["drProfttlName"] = cFYLJG001.Mdtrtinfo.DrProfttlName
+	mdtrtinfo["drDeptCode"] = cFYLJG001.Mdtrtinfo.DrDeptCode
+	mdtrtinfo["drDeptName"] = cFYLJG001.Mdtrtinfo.DrDeptName
 	mdtrtinfo["caty"] = cFYLJG001.Mdtrtinfo.Caty
-	mdtrtinfo["mdtrt_time"] = cFYLJG001.Mdtrtinfo.MdtrtTime
-	mdtrtinfo["dise_codg"] = cFYLJG001.Mdtrtinfo.DiseCodg
-	mdtrtinfo["dise_name"] = cFYLJG001.Mdtrtinfo.DiseName
-	mdtrtinfo["sp_dise_flag"] = cFYLJG001.Mdtrtinfo.SpDiseFlag
-	mdtrtinfo["maindiag_code"] = cFYLJG001.Mdtrtinfo.MaindiagCode
-	mdtrtinfo["maindiag_name"] = cFYLJG001.Mdtrtinfo.MaindiagName
-	mdtrtinfo["dise_cond_dscr"] = cFYLJG001.Mdtrtinfo.DiseCondDscr
-	mdtrtinfo["hi_feesetl_flag"] = cFYLJG001.Mdtrtinfo.HiFeesetlFlag
-	mdtrtinfo["hi_feesetl_name"] = cFYLJG001.Mdtrtinfo.HiFeesetlName
-	mdtrtinfo["rgst_fee"] = cFYLJG001.Mdtrtinfo.RgstFee
-	mdtrtinfo["medfee_sumamt"] = cFYLJG001.Mdtrtinfo.MedfeeSumamt
-	mdtrtinfo["fstdiag_flag"] = cFYLJG001.Mdtrtinfo.FstdiagFlag
+	mdtrtinfo["mdtrtTime"] = cFYLJG001.Mdtrtinfo.MdtrtTime
+	mdtrtinfo["diseCodg"] = cFYLJG001.Mdtrtinfo.DiseCodg
+	mdtrtinfo["diseName"] = cFYLJG001.Mdtrtinfo.DiseName
+	mdtrtinfo["spDiseFlag"] = cFYLJG001.Mdtrtinfo.SpDiseFlag
+	mdtrtinfo["maindiagCode"] = cFYLJG001.Mdtrtinfo.MaindiagCode
+	mdtrtinfo["maindiagName"] = cFYLJG001.Mdtrtinfo.MaindiagName
+	mdtrtinfo["diseCondDscr"] = cFYLJG001.Mdtrtinfo.DiseCondDscr
+	mdtrtinfo["hiFeesetlType"] = cFYLJG001.Mdtrtinfo.HiFeesetlFlag
+	mdtrtinfo["hiFeesetlName"] = cFYLJG001.Mdtrtinfo.HiFeesetlName
+	mdtrtinfo["rgstFee"] = cFYLJG001.Mdtrtinfo.RgstFee
+	mdtrtinfo["medfeeSumamt"] = cFYLJG001.Mdtrtinfo.MedfeeSumamt
+	mdtrtinfo["fstdiagFlag"] = cFYLJG001.Mdtrtinfo.FstdiagFlag
 	type MyData struct {
 		Insutype string `json:"insutype"`
 	}
@@ -158,27 +165,31 @@ func GetAHCFYLJG001(org_name string, doctor string, fixmedins_code string, insup
 
 	for _, item := range cFYLJG001.Diseinfo {
 		diseinfo := make(map[string]interface{})
-		diseinfo["diag_type"] = item.DiagType
-		diseinfo["maindiag_flag"] = item.MaindiagFlag
-		diseinfo["diag_srt_no"] = item.DiagSrtNo
-		diseinfo["diag_code"] = item.DiagCode
-		diseinfo["diag_name"] = item.DiagName
-		diseinfo["diag_dept"] = item.DiagDept
-		diseinfo["diag_dr_no"] = item.DiagDrNo
-		diseinfo["diag_dr_name"] = item.DiagDrName
-		diseinfo["diag_time"] = item.DiagTime
-		diseinfo["tcm_dise_code"] = item.TcmDiseCode
-		diseinfo["tcm_dise_name"] = item.TcmDiseName
-		diseinfo["tcmsymp_code"] = item.TcmsympCode
+		diseinfo["diagType"] = item.DiagType
+		diseinfo["maindiagFlag"] = item.MaindiagFlag
+		diseinfo["diagSrtNo"] = item.DiagSrtNo
+		diseinfo["diagCode"] = item.DiagCode
+		diseinfo["diagName"] = item.DiagName
+		diseinfo["diagDept"] = item.DiagDept
+		diseinfo["diagDeptCode"] = ""
+
+		diseinfo["diagDrNo"] = item.DiagDrNo
+		diseinfo["diagDrName"] = item.DiagDrName
+		diseinfo["diagTime"] = item.DiagTime
+		diseinfo["tcmDiseCode"] = item.TcmDiseCode
+		diseinfo["tcmDiseName"] = item.TcmDiseName
+		diseinfo["tcmsympCode"] = item.TcmsympCode
 		diseinfo["tcmsymp"] = item.Tcmsymp
 		diseinfos = append(diseinfos, diseinfo)
 	}
 	inputData["diseinfo"] = diseinfos
 
 	inputMessage["input"] = inputData
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
 
 	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
+	bytesData, err := json.Marshal(argInputMessage)
 	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -186,17 +197,8 @@ func GetAHCFYLJG001(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG001"
-	}
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	url = url + "7101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -204,10 +206,6 @@ func GetAHCFYLJG001(org_name string, doctor string, fixmedins_code string, insup
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
 
 	client := http.Client{}
 	resp, err := client.Do(request)
@@ -226,26 +224,26 @@ func GetAHCFYLJG001(org_name string, doctor string, fixmedins_code string, insup
 
 }
 
-func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, original_value string, original_rx_file string, extras string) (string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
+func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, original_value string, original_rx_file string, extras string, cainfo string) (string, string) {
+	// 生成签名
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
 	inputData := make(map[string]interface{})
 	inputDatas := make(map[string]interface{})
 
-	inputMessage["infno"] = "CFYLJG002"
-	inputData["fixmedins_code"] = fixmedins_code
-	inputData["original_value"] = original_value
-	inputData["original_rx_file"] = original_rx_file
+	inputMessage["infno"] = "7102"
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["originalValue"] = original_value
+	inputData["originalRxFile"] = original_rx_file
 	inputData["extras"] = extras
-	inputDatas["rx_sign_info"] = inputData
+	inputDatas["data"] = inputData
 	inputMessage["input"] = inputDatas
-
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
 	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
+	bytesData, err := json.Marshal(argInputMessage)
 	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -253,28 +251,14 @@ func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG002"
-	}
-
+	url = url + "7102"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
 
 	client := http.Client{}
 	resp, err := client.Do(request)
@@ -293,43 +277,43 @@ func GetAHCFYLJG002(org_name string, doctor string, fixmedins_code string, insup
 
 }
 
-func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG003 models.CFYLJG003) (string, string) {
+func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG003 models.CFYLJG003, cainfo string) (string, string) {
 	//生成签名
-	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	//input := make(map[string]interface{})
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
 	inputData := make(map[string]interface{})
 	inputData2 := make(map[string]interface{})
 
-	inputMessage["infno"] = "CFYLJG003"
+	inputMessage["infno"] = "7103"
 
-	inputData["rx_trace_code"] = cFYLJG003.RxTraceCode
-	inputData["hi_rxno"] = cFYLJG003.HiRxno
-	inputData["mdtrt_id"] = cFYLJG003.MdtrtID
-	inputData["patn_name"] = cFYLJG003.PatnName
-	inputData["psn_cert_type"] = cFYLJG003.PsnCertType
+	inputData["rxTraceCode"] = cFYLJG003.RxTraceCode
+	inputData["hiRxno"] = cFYLJG003.HiRxno
+	inputData["mdtrtId"] = cFYLJG003.MdtrtID
+	inputData["patnName"] = cFYLJG003.PatnName
+	inputData["psnCertType"] = cFYLJG003.PsnCertType
 	inputData["certno"] = cFYLJG003.Certno
-	inputData["fixmedins_name"] = cFYLJG003.FixmedinsName
-	inputData["fixmedins_code"] = cFYLJG003.FixmedinsCode
-	inputData["dr_code"] = cFYLJG003.DrCode
-	inputData["prsc_dr_name"] = cFYLJG003.PrscDrName
-	inputData["phar_dept_name"] = cFYLJG003.PharDeptName
-	inputData["phar_dept_code"] = cFYLJG003.PharDeptCode
-	inputData["phar_profttl_codg"] = cFYLJG003.PharProfttlCodg
-	inputData["phar_profttl_name"] = cFYLJG003.PharProfttlName
-	inputData["phar_code"] = cFYLJG003.PharCode
-	inputData["rx_frqu_name"] = cFYLJG003.RxFrquName
-	inputData["phar_cert_type"] = cFYLJG003.PsnCertType
-	inputData["phar_certno"] = cFYLJG003.PharCertno
-	inputData["phar_name"] = cFYLJG003.PharName
-	inputData["phar_prac_cert_no"] = cFYLJG003.PharPracCertNo
-	inputData["phar_chk_time"] = cFYLJG003.PharChkTime
-	inputData["rx_file"] = cFYLJG003.RxFile
-	inputData["sign_digest"] = cFYLJG003.SignDigest
-	inputData2["rx_upload_info"] = inputData
+	inputData["fixmedinsName"] = cFYLJG003.FixmedinsName
+	inputData["fixmedinsCode"] = cFYLJG003.FixmedinsCode
+	inputData["drCode"] = cFYLJG003.DrCode
+	inputData["prscDrName"] = cFYLJG003.PrscDrName
+	inputData["pharDeptName"] = cFYLJG003.PharDeptName
+	inputData["pharDeptCode"] = cFYLJG003.PharDeptCode
+	inputData["pharProfttlCodg"] = cFYLJG003.PharProfttlCodg
+	inputData["pharProfttlName"] = cFYLJG003.PharProfttlName
+	inputData["pharCode"] = cFYLJG003.PharCode
+	inputData["pharCertType"] = cFYLJG003.PsnCertType
+	inputData["pharCertno"] = cFYLJG003.PharCertno
+	inputData["pharName"] = cFYLJG003.PharName
+	inputData["pharPracCertNo"] = cFYLJG003.PharPracCertNo
+	inputData["pharChkTime"] = cFYLJG003.PharChkTime
+	inputData["rxFile"] = cFYLJG003.RxFile
+	inputData["signDigest"] = cFYLJG003.SignDigest
+	inputData["extras"] = ""
+
+	//inputData["rx_frqu_name"] = cFYLJG003.RxFrquName
+	inputData2["data"] = inputData
 	inputMessage["input"] = inputData2
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
@@ -340,16 +324,7 @@ func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG003"
-	}
-
+	url = url + "7102"
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
@@ -358,11 +333,6 @@ func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insup
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -380,28 +350,28 @@ func GetAHCFYLJG003(org_name string, doctor string, fixmedins_code string, insup
 
 }
 
-func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG004 models.CFYLJG004) (string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
+func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, cFYLJG004 models.CFYLJG004, cainfo string) (string, string) {
+	// 生成签名
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	// 生成输入报文
+	inputMessage := SetAHInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
 	inputData := make(map[string]interface{})
 	inputData1 := make(map[string]interface{})
-
 	//inputDatas := make([]map[string]interface{}, 0)
-	inputMessage["infno"] = "CFYLJG004"
-	inputData["hi_rxno"] = cFYLJG004.HiRxno
-	inputData["undo_dr_code"] = cFYLJG004.UndoDrCode
-	inputData["undo_dr_name"] = cFYLJG004.UndoDrName
-	inputData["undo_dr_cert_type"] = cFYLJG004.UndoDrCertType
-	inputData["undo_dr_certno"] = cFYLJG004.UndoDrCertno
-	inputData["undo_rea"] = cFYLJG004.UndoRea
-	inputData["undo_time"] = cFYLJG004.UndoTime
-	inputData["fixmedins_code"] = cFYLJG004.FixmedinsCode
-	inputData1["rx_cancel_info"] = inputData
+	inputMessage["infno"] = "7104"
+	inputData["hiRxno"] = cFYLJG004.HiRxno
+	inputData["fixmedinsCode"] = cFYLJG004.FixmedinsCode
+	inputData["drCode"] = cFYLJG004.UndoDrCode
+	inputData["undoDrName"] = cFYLJG004.UndoDrName
+	inputData["undoDrCertType"] = cFYLJG004.UndoDrCertType
+	inputData["undoDrCertno"] = cFYLJG004.UndoDrCertno
+	inputData["undoRea"] = cFYLJG004.UndoRea
+	inputData["undoTime"] = cFYLJG004.UndoTime
+	inputData1["data"] = inputData
 	inputMessage["input"] = inputData1
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -411,15 +381,8 @@ func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG004"
-	}
+	url = url + "CFYLJG004"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
@@ -451,7 +414,7 @@ func GetAHCFYLJG004(org_name string, doctor string, fixmedins_code string, insup
 
 }
 
-func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG005 models.CFYLJG005) (string, string) {
+func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG005 models.CFYLJG005, cainfo string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -463,19 +426,17 @@ func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insup
 
 	inputData2 := make(map[string]interface{})
 	//inputDatas := make([]map[string]interface{}, 0)
-
-	inputMessage["infno"] = "CFYLJG005"
-
-	inputData["fixmedins_code"] = fixmedins_code
-
-	inputData["hi_rxno"] = cFYLJG005.HiRxno
-	inputData["mdtrt_id"] = cFYLJG005.MdtrtID
-	inputData["ec_token"] = cFYLJG005.EcToken
-	inputData["psn_name"] = cFYLJG005.PsnName
-	inputData["psn_cert_type"] = cFYLJG005.PsnCertType
+	inputMessage["infno"] = "7105"
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["hiRxno"] = cFYLJG005.HiRxno
+	inputData["mdtrtId"] = cFYLJG005.MdtrtID
+	inputData["psnName"] = cFYLJG005.PsnName
+	inputData["psnCertType"] = cFYLJG005.PsnCertType
 	inputData["certno"] = cFYLJG005.Certno
-	inputData2["rx_detl_query"] = inputData
+	inputData2["data"] = inputData
 	inputMessage["input"] = inputData2
+	argInputMessage := make(map[string]interface{})
+	argInputMessage["arg0"] = inputMessage
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
 	inputLog = string(bytesData)
@@ -485,15 +446,10 @@ func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insup
 		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
 	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG005"
-	}
+
+	url = url + "7105"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
@@ -503,11 +459,6 @@ func GetAHCFYLJG005(org_name string, doctor string, fixmedins_code string, insup
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -536,14 +487,13 @@ func GetAHCFYLJG006(org_name string, doctor string, fixmedins_code string, insup
 	inputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "CFYLJG006"
-
-	inputData["fixmedins_code"] = fixmedins_code
-	inputData["hi_rxno"] = cFYLJG006.HiRxno
-	inputData["mdtrt_id"] = cFYLJG006.MdtrtID
-	inputData["psn_cert_type"] = cFYLJG006.PsnCertType
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["hiRxno"] = cFYLJG006.HiRxno
+	inputData["mdtrtId"] = cFYLJG006.MdtrtID
+	inputData["psnName"] = cFYLJG006.PsnName
+	inputData["psnCertType"] = cFYLJG006.PsnCertType
 	inputData["certno"] = cFYLJG006.Certno
-	inputData["psn_name"] = cFYLJG006.PsnName
-	inputData2["rx_chk_info"] = inputData
+	inputData2["data"] = inputData
 	inputMessage["input"] = inputData2
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
@@ -607,15 +557,14 @@ func GetAHCFYLJG007(org_name string, doctor string, fixmedins_code string, insup
 
 	inputMessage["infno"] = "CFYLJG007"
 
-	inputData["fixmedins_code"] = fixmedins_code
-	inputData["hi_rxno"] = cFYLJG007.HiRxno
-	inputData["mdtrt_id"] = cFYLJG007.MdtrtID
-	inputData["psn_no"] = cFYLJG007.PsnNo
-	inputData["psn_cert_type"] = cFYLJG007.PsnCertType
+	inputData["fixmedinsCode"] = fixmedins_code
+	inputData["hiRxno"] = cFYLJG007.HiRxno
+	inputData["mdtrtId"] = cFYLJG007.MdtrtID
+	inputData["psnCertType"] = cFYLJG007.PsnCertType
 	inputData["certno"] = cFYLJG007.Certno
-	inputData["psn_name"] = cFYLJG007.PsnName
+	inputData["psnName"] = cFYLJG007.PsnName
 
-	inputData2["rx_setl_query"] = inputData
+	inputData2["data"] = inputData
 
 	inputMessage["input"] = inputData2
 	var inputLog string
@@ -666,85 +615,76 @@ func GetAHCFYLJG007(org_name string, doctor string, fixmedins_code string, insup
 	return str, inputLog
 
 }
-func GetAHCFYLJG008(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG008 models.CFYLJG008) (string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	inputData := make(map[string]interface{})
-	//inputData2 := make(map[string]interface{})
-
-	//inputDatas := make([]map[string]interface{}, 0)
-
-	inputMessage["infno"] = "CFYLJG008"
-
-	inputData["pageNum"] = cFYLJG008.PageNum
-	inputData["pageSize"] = cFYLJG008.PageSize
-	inputData["orderType"] = cFYLJG008.OrderType
-	inputData["poolareaNo"] = cFYLJG008.PoolareaNo
-	inputData["fixmedinsName"] = cFYLJG008.FixmedinsName
-	inputData["lng"] = cFYLJG008.Lng
-	inputData["lat"] = cFYLJG008.Lat
-	inputData["medinsProdInvChgDDTOList"] = cFYLJG008.MedList
-
-	inputMessage["input"] = inputData
-	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
-	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "CFYLJG007"
-	}
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-	request, err := http.NewRequest("POST", url, reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	fmt.Println(string(respBytes))
-	str := string(respBytes)
-	return str, inputLog
-
-}
-
-func Getflow(id int64) (flow models.HisPrescriptionFlow, err error) {
-	err = readDb.Model(&models.HisPrescriptionFlow{}).Where("id = ?", id).First(&flow).Error
-	return
-}
 
-func Getflowtwo(m_id string) (flow models.HisPrescriptionFlow, err error) {
-	err = readDb.Model(&models.HisPrescriptionFlow{}).Where("m_id = ?", m_id).First(&flow).Error
-	return
-}
+//func GetAHCFYLJG008(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, cFYLJG008 models.CFYLJG008) (string, string) {
+//	//生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce, secret_key)
+//	//生成输入报文
+//	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+//	inputData := make(map[string]interface{})
+//	//inputData2 := make(map[string]interface{})
+//
+//	//inputDatas := make([]map[string]interface{}, 0)
+//
+//	inputMessage["infno"] = "CFYLJG008"
+//
+//	inputData["pageNum"] = cFYLJG008.PageNum
+//	inputData["pageSize"] = cFYLJG008.PageSize
+//	inputData["orderType"] = cFYLJG008.OrderType
+//	inputData["poolareaNo"] = cFYLJG008.PoolareaNo
+//	inputData["fixmedinsName"] = cFYLJG008.FixmedinsName
+//	inputData["lng"] = cFYLJG008.Lng
+//	inputData["lat"] = cFYLJG008.Lat
+//	inputData["medinsProdInvChgDDTOList"] = cFYLJG008.MedList
+//
+//	inputMessage["input"] = inputData
+//	var inputLog string
+//	bytesData, err := json.Marshal(inputMessage)
+//	inputLog = string(bytesData)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	gdyb_url := beego.AppConfig.String("gdyb_url")
+//	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+//
+//	var url string
+//	if fixmedins_code == "H15049901371" {
+//		url = gdyb_url
+//	} else {
+//		url = gdyb_url + "CFYLJG007"
+//	}
+//
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//	request.Header.Set("x-tif-paasid", gdyb_paasid)
+//	request.Header.Set("x-tif-signature", signature)
+//	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//	request.Header.Set("x-tif-nonce", nonce)
+//
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//	fmt.Println(string(respBytes))
+//	str := string(respBytes)
+//	return str, inputLog
+//
+//}