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

conf/app.conf

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

controllers/js/jsyb_controller.go

@@ -26,6 +26,8 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/2207", &JSybController{}, "get:PostEight")
 	beego.Router("/jsyb/2208", &JSybController{}, "get:PostNine")
 	beego.Router("/jsyb/5203", &JSybController{}, "get:PostTen")
+	//beego.Router("/jsyb/readcard", &JSybController{}, "get:ReadCard")
+
 }
 
 func (c *JSybController) PostOne() {
@@ -41,11 +43,8 @@ func (c *JSybController) PostOne() {
 	certificates := c.GetString("certificates")
 	url := c.GetString("url")
 	ak := c.GetString("ak")
-	key := c.GetString("key")
-	time_stamp := c.GetString("time_stamp")
 
-	fmt.Println("url:" + key)
-	result, inputLog := service.Jsyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, url, ak, key, time_stamp)
+	result, inputLog := service.Jsyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, url, ak)
 	fmt.Println(result)
 	fmt.Println(inputLog)
 	var dat map[string]interface{}
@@ -86,17 +85,30 @@ func (c *JSybController) PostTwo() {
 	secret_key := c.GetString("secret_key")
 
 	id_card_type, _ := c.GetInt64("id_card_type")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+	doctor_name := c.GetString("doctor_name")
 
-	result, _ := service.Hbyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type)
-
+	result, request_log := service.Jsyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak)
+	fmt.Println(result)
+	fmt.Println(request_log)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		//fmt.Println(dat["status"])
+
+	} else {
+
+	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+
 	} else {
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostThree() {
@@ -109,15 +121,23 @@ func (c *JSybController) PostThree() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
-	result, requestLog := service.Hbyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+	result, request_log := service.Jsyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, url, ak)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {
 	}
 
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+
+	} else {
+
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre":         dat,
-		"request_log": requestLog,
+		"request_log": dat2,
 	})
 }
 
@@ -154,10 +174,17 @@ func (c *JSybController) PostFour() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
+	url := respJSON["url"].(string)
+	ak := respJSON["ak"].(string)
 
-	result, request_log := service.Hbyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config)
+	result, request_log := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak)
 
-	fmt.Println(request_log)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+
+	} else {
+
+	}
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -166,7 +193,8 @@ func (c *JSybController) PostFour() {
 
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 
@@ -206,24 +234,9 @@ func (c *JSybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	fmt.Println(respJSON["psn_no"].(string))
-	fmt.Println(respJSON["mdtrt_id"].(string))
 
-	fmt.Println(respJSON["chrg_bchno"].(string))
-	fmt.Println(respJSON["org_name"].(string))
-	fmt.Println(respJSON["doctor"].(string))
-	fmt.Println(respJSON["dept"].(string))
-
-	fmt.Println(respJSON["fixmedins_code"].(string))
-	fmt.Println(respJSON["dept_code"].(string))
-	fmt.Println(respJSON["doctor_id"].(string))
-
-	fmt.Println(respJSON["insuplc_admdvs"].(string))
-	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
-	fmt.Println(respJSON["secret_key"].(string))
-
-	result, requestLog := service.Hbyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
-		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string))
+	result, request_log := service.Jsyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
+		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["diag_code"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -233,7 +246,7 @@ func (c *JSybController) PostFive() {
 	}
 
 	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 		fmt.Println(dat2)
 	} else {
 		fmt.Println(err)
@@ -241,7 +254,7 @@ func (c *JSybController) PostFive() {
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre":         dat,
-		"request_log": requestLog,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostSix() {
@@ -256,17 +269,27 @@ func (c *JSybController) PostSix() {
 
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
 
-	result, requestlog := service.Hbyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
-	fmt.Println(requestlog)
+	result, request_log := service.Jsyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, url, ak)
+	fmt.Println(request_log)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
 	} else {
 		fmt.Println(err)
 	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostSeven() {
@@ -286,8 +309,11 @@ func (c *JSybController) PostSeven() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	certificates, _ := c.GetInt64("certificates")
 
-	result, requestlog := service.Hbyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates)
-	fmt.Println(requestlog)
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+
+	result, request_log := service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak)
+	fmt.Println(request_log)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -295,8 +321,16 @@ func (c *JSybController) PostSeven() {
 	} else {
 		fmt.Println(err)
 	}
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostEight() {
@@ -321,9 +355,12 @@ func (c *JSybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	acct_used_flag, _ := c.GetInt64("acct_used_flag")
+	acct_used_flag := c.GetString("acct_used_flag")
 
-	result, srcRequest := service.Hbyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag)
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+
+	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -332,15 +369,15 @@ func (c *JSybController) PostEight() {
 	}
 
 	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(srcRequest), &dat2); err == nil {
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 		fmt.Println(dat2)
 	} else {
 		fmt.Println(err)
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":  dat,
-		"pre2": dat2,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostNine() {
@@ -353,16 +390,26 @@ func (c *JSybController) PostNine() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	result, src_request := service.Hbyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	fmt.Println(src_request)
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+	result, request_log := service.Jsyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak)
+	fmt.Println(request_log)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
 	} else {
 		fmt.Println(err)
 	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
 func (c *JSybController) PostTen() {
@@ -371,12 +418,12 @@ func (c *JSybController) PostTen() {
 	setlId := c.GetString("setl_id")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
-	med_type := c.GetString("med_type")
-
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
 
 	baseParams := models.BaseParams{
 		SecretKey:      secret_key,
@@ -385,6 +432,8 @@ func (c *JSybController) PostTen() {
 		MdtrtareaAdmvs: mdtrtarea_admvs,
 		OrgName:        org_name,
 		Doctor:         doctor,
+		RequestUrl:     url,
+		AccessKey:      ak,
 	}
 
 	businessParams := models.BusinessParams{
@@ -393,14 +442,48 @@ func (c *JSybController) PostTen() {
 		SetlId:  setlId,
 	}
 
-	result := service.Hbyb5203(baseParams, businessParams, med_type)
+	result, request_log := service.Jsyb5203(baseParams, businessParams)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
 	} else {
 		fmt.Println(err)
 	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
+		"pre":         dat,
+		"request_log": dat2,
 	})
 }
+
+//var initFlag int64 = 0
+
+//func (c *JSybController) ReadCard() {
+//	if initFlag == 0 {
+//		c.TestGetBasBaseInit()
+//	}
+//}
+//
+//func (c *JSybController) TestGetBasBaseInit() {
+//	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+//	Iinit := DllDef.MustFindProc("Init")
+//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+//
+//	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_api/prd/api/card/initDll"), StrPtr(miConfig.InsuplcAdmdvs))
+//	if ret != 0 {
+//		fmt.Println("SSCard的报错原因:", err)
+//		fmt.Println("SSCard的运算结果为:", ret)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//		return
+//	}
+//
+//	result := int(ret)
+//	fmt.Println("SSCard的运算结果为1:", result)
+//	initFlag = 1
+//	return
+//}

controllers/sg/his_api_controller.go

@@ -32,52 +32,42 @@ type HisApiController struct {
 }
 
 func HisManagerApiRegistRouters() {
-	fmt.Println("----------")
+	//挂号
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
-	beego.Router("/api/diag/upload", &HisApiController{}, "get:GetUploadDiag")
+	//上传就诊信息-上传明细-结算
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
+	//查询
 	beego.Router("/api/settle/query", &HisApiController{}, "get:GetSettleAccounts")
+	//对总账
 	beego.Router("/api/checkaccount/get", &HisApiController{}, "get:GetCheckAccount")
+	//对明细
 	beego.Router("/api/checkdetailaccount/get", &HisApiController{}, "get:GetCheckDetailAccount")
+	//退费，退明细
 	beego.Router("/api/refund/post", &HisApiController{}, "get:Refund")
-	//beego.Router("/api/sscard", &HisApiController{}, "get:Sscard")
+	//退号
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "get:RefundNumber")
+	//退明细
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "get:RefundDetail")
+
 	beego.Router("/api/treatment/check", &HisApiController{}, "get:CheckTreatment")
-	//beego.Router("/api/record/put", &HisApiController{}, "get:PutRecord")
-	//beego.Router("/api/patient/info", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
-	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
-	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 	beego.Router("/api/presettle/get", &HisApiController{}, "get:GetPreUploadInfo")
-	//beego.Router("/api/settle/get", &HisApiController{}, "get:GetSettleInfo")
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
 	beego.Router("/api/patient/info", &HisApiController{}, "get:GetPatientInfo")
-	//备案撤销相关接口
 	beego.Router("/api/checkcode/get", &HisApiController{}, "get:GetCheckCode")
 	beego.Router("/api/uncheckcode/get", &HisApiController{}, "get:UnCheckCode")
 	beego.Router("/api/psn/putonrecord", &HisApiController{}, "get:PsnPutOnRecord")
 	beego.Router("/api/psn/unputonrecord", &HisApiController{}, "get:PsnUnPutOnRecord")
 	beego.Router("/api/psn/ncds/putonrecord", &HisApiController{}, "get:PsnPutNCDSOnRecord")
 	beego.Router("/api/psn/ncds/unputonrecord", &HisApiController{}, "get:PsnPutUnNCDSOnRecord")
-
 	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
 	beego.Router("/api/reversal/other", &HisApiController{}, "get:ReversalOtherData")
-
-	//beego.Router("/api/reversal/one", &HisApiController{}, "get:ReversalOtherOneData")
-
 	beego.Router("/api/settlelist/get", &HisApiController{}, "get:GetSettleList")
-
 	beego.Router("/api/pwd/check", &HisApiController{}, "get:CheckCardPWD")
-
 	beego.Router("/api/insutype/check", &HisApiController{}, "get:CheckInsutype")
-
-	//beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
-
 	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
-
 	beego.Router("/api/psn/info", &HisApiController{}, "get:GetPsnNcdsInfo")
 
 }
@@ -2852,8 +2842,6 @@ func (c *HisApiController) GetRegisterInfo() {
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
 	med_type := c.GetString("social_type")
-	key := c.GetString("key")
-	time_stamp := c.GetString("time_stamp")
 
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
@@ -2882,9 +2870,6 @@ func (c *HisApiController) GetRegisterInfo() {
 		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
 	}
 
-	//adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
-	//diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
-	//sickConfig, _ := service.FindSickById(sick_type)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
@@ -2942,7 +2927,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			var res ResultTwo
 			api := "http://192.168.3.111:9532/" + "jsyb/1101?cert_no=" + "" +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&key=" + key + "&time_stamp=" + time_stamp
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 			fmt.Println(api)
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
@@ -2973,6 +2958,19 @@ func (c *HisApiController) GetRegisterInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+			PsnNo = res.Output.Baseinfo.PsnNo
+			PsnCertType = res.Output.Baseinfo.PsnCertType
+			Certno = res.Output.Baseinfo.Certno
+			PsnName = res.Output.Baseinfo.PsnName
+			Gend = res.Output.Baseinfo.Gend
+			Naty = res.Output.Baseinfo.Naty
+			Brdy = res.Output.Baseinfo.Brdy
+			Age = res.Output.Baseinfo.Age
+			Iinfos, _ := json.Marshal(res.Output.Iinfo)
+			Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+			infoStr = string(Iinfos)
+			idetinfoStr = string(Idetinfos)
+			infocode = res.Infcode
 
 		} else {
 			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
@@ -3010,14 +3008,10 @@ func (c *HisApiController) GetRegisterInfo() {
 			idetinfoStr = string(Idetinfos)
 			if miConfig.Code == "H15049901371" {
 				infocode, _ = strconv.ParseInt(res10265.Infcode, 10, 64)
-
 			} else {
-
 				infocode = res.Infcode
 			}
-
 		}
-
 		if infocode == 0 {
 			his := models.VMHisPatient{
 				Name:                   name,
@@ -3163,6 +3157,39 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 				infocode = resThree.Infcode
 
+			} else if miConfig.MdtrtareaAdmvs == "320921" {
+				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
+					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+				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)
+
+				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				infocode = resThree.Infcode
+
 			} else {
 
 				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
@@ -3412,8 +3439,57 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "320921" {
+
+			data := make(map[string]interface{})
+			client := &http.Client{}
+			data["psn_no"] = his.PsnNo
+			data["mdtrt_id"] = his.Number
+			data["doctor"] = roles.UserName
+			data["department"] = department.Name
+			data["org_name"] = miConfig.OrgName
+			data["med_type"] = strconv.FormatInt(reg_type, 10)
+			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
+			data["fixmedins_code"] = miConfig.Code
+			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+			data["secret_key"] = miConfig.SecretKey
+			data["sick_code"] = sickConfig.CountryCode
+			data["sick_name"] = sickConfig.ClassName
+			data["url"] = miConfig.Url
+			data["ak"] = miConfig.ChannelNumber
+			data["dept"] = strconv.FormatInt(department.ID, 10)
+			data["config"] = config
+			bytesData, _ := json.Marshal(data)
+			req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2203", 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
+			}
+
+			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, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
-			if miConfig.InsuplcAdmdvs == "440781" { //
+			if miConfig.MdtrtareaAdmvs == "440781" { //
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			} else {
 				if miConfig.Code == "H15049901371" {
@@ -3564,6 +3640,9 @@ func (c *HisApiController) GetUploadInfo() {
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["balance_accounts_type"] = strconv.FormatInt(his.BalanceAccountsType, 10)
+			data["url"] = miConfig.Url
+			data["ak"] = miConfig.ChannelNumber
+			data["new_doctor_name"] = patientPrescription.Doctor
 
 			var ids []int64
 
@@ -3604,6 +3683,34 @@ func (c *HisApiController) GetUploadInfo() {
 						return
 					}
 
+				} else if miConfig.MdtrtareaAdmvs == "320921" {
+					bytesData, _ := json.Marshal(data)
+					req, _ := http.NewRequest("POST", "http://192.168.3.111: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
+					}
+
+					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, &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
 				} else {
 
 					if miConfig.Code == "H15049901371" {
@@ -3913,6 +4020,42 @@ func (c *HisApiController) GetUploadInfo() {
 
 							}
 
+						} else if miConfig.MdtrtareaAdmvs == "320921" {
+							api := "http://192.168.3.111: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=" + miConfig.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.ChannelNumber
+
+							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)
+
+							if err := json.Unmarshal([]byte(result), &res); err != nil {
+								utils.ErrorLog("解析失败：%v", err)
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+								return
+							}
+
 						} else {
 							if miConfig.Code == "H15049901371" {
 								//赤峰地区国家医保医疗类别
@@ -4218,6 +4361,44 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 
+			} else if miConfig.MdtrtareaAdmvs == "320921" {
+				api := "http://192.168.3.111: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=" + miConfig.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.ChannelNumber
+
+				resp, requestErr := http.Get(api)
+				if requestErr != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				body, ioErr := ioutil.ReadAll(resp.Body)
+				if ioErr != nil {
+					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				var respJSON map[string]interface{}
+				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				result, _ := json.Marshal(respJSON)
+				fmt.Println("log")
+				fmt.Println(string(result))
+				if err := json.Unmarshal([]byte(result), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				var src_resquest string
@@ -5150,6 +5331,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
 		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 		data["secret_key"] = miConfig.SecretKey
+		data["url"] = miConfig.Url
+		data["ak"] = miConfig.ChannelNumber
+		data["new_doctor_name"] = patientPrescription.Doctor
+
 		var ids []int64
 
 		for _, item := range prescriptions {
@@ -5188,6 +5373,34 @@ func (c *HisApiController) GetPreUploadInfo() {
 					return
 				}
 
+			} else if miConfig.MdtrtareaAdmvs == "320921" {
+				bytesData, _ := json.Marshal(data)
+				req, _ := http.NewRequest("POST", "http://192.168.3.111: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
+				}
+
+				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, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -5851,26 +6064,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-	//record_time := c.GetString("record_time")
-	//patient_id, _ := c.GetInt64("patient_id")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
-	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	//if err != nil {
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//recordDateTime := theTime.Unix()
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
-	//his, _ := service.GetHisPatientByNumber(order.MdtrtId)
-
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
-		//order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 	}
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 
@@ -5914,6 +6114,36 @@ func (c *HisApiController) Refund() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "320921" {
+			api3 := "http://192.168.3.111:9532/" + "jsyb/2208?psn_no=" + order.PsnNo +
+				"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+			resp3, requestErr3 := http.Get(api3)
+			if requestErr3 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body3, ioErr3 := ioutil.ReadAll(resp3.Body)
+			if ioErr3 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes3, _ := json.Marshal(respJSON3)
+			if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 
 			if miConfig.Code == "H15049901371" {
@@ -5998,6 +6228,39 @@ func (c *HisApiController) Refund() {
 					return
 				}
 
+			} else if miConfig.MdtrtareaAdmvs == "320921" {
+
+				api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
+					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+				resp3, requestErr3 := http.Get(api3)
+				if requestErr3 != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				body3, ioErr3 := ioutil.ReadAll(resp3.Body)
+				if ioErr3 != nil {
+					utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				var respJSON3 map[string]interface{}
+				if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				userJSONBytes3, _ := json.Marshal(respJSON3)
+				fmt.Println("log")
+				fmt.Println(string(userJSONBytes3))
+				if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -6139,6 +6402,40 @@ func (c *HisApiController) RefundNumber() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "320921" {
+
+			api3 := "http://192.168.3.111:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
+				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+			resp3, requestErr3 := http.Get(api3)
+			if requestErr3 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			body3, ioErr3 := ioutil.ReadAll(resp3.Body)
+			if ioErr3 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes3, _ := json.Marshal(respJSON3)
+			fmt.Println("log")
+			fmt.Println(string(userJSONBytes3))
+			if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 			var api3 string
 
@@ -6303,6 +6600,48 @@ func (c *HisApiController) RefundDetail() {
 				return
 			}
 
+			err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "撤销明细成功",
+				})
+				return
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else if miConfig.MdtrtareaAdmvs == "320921" {
+			api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
+				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+			resp3, requestErr3 := http.Get(api3)
+			if requestErr3 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body3, ioErr3 := ioutil.ReadAll(resp3.Body)
+			if ioErr3 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes3, _ := json.Marshal(respJSON3)
+			fmt.Println("log")
+			fmt.Println(string(userJSONBytes3))
+			if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 			err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -7005,7 +7344,43 @@ func (c *HisApiController) GetSettleAccounts() {
 				return
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "320921" {
+
+			api := "http://192.168.3.111:9532/" + "jsyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+			fmt.Println("log")
+			fmt.Println(string(result))
+			if err := json.Unmarshal([]byte(result), &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
+			result2 := service.Gdyb5204(baseParams, businessParams)
+			fmt.Println(result2)
 			result := service.Gdyb5203(baseParams, businessParams)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -7445,90 +7820,90 @@ func (c *HisApiController) CheckTreatment() {
 //
 //}
 
-func (c *HisApiController) GetUploadDiag() {
-	id, _ := c.GetInt64("id")
-	record_time := c.GetString("record_time")
-
-	diagnosis_id, _ := c.GetInt64("diagnosis")
-	sick_type, _ := c.GetInt64("sick_type")
-	reg_type, _ := c.GetInt64("reg_type")
-
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	var patientPrescription models.HisPrescriptionInfo
-	recordDateTime := theTime.Unix()
-	adminInfo := c.GetAdminUserInfo()
-	patientPrescription, _ = service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
-
-	if patientPrescription.ID == 0 {
-		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
-	}
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
-	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
-	his, _ := service.GetVMHisPatientInfo(adminInfo.CurrentOrgId, id, recordDateTime)
-	sickConfig, _ := service.FindSickById(sick_type)
-	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
-
-	api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
-		"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-		"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.ContentCode + "&sick_name=" + sickConfig.ClassName
-	resp2, requestErr2 := http.Get(api2)
-	if requestErr2 != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-	if ioErr2 != nil {
-		utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	var respJSON2 map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
-	userJSONBytes2, _ := json.Marshal(respJSON2)
-
-	var res2 ResultSix
-	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	if res2.Infcode != 0 {
-		adminUser := c.GetAdminUserInfo()
-		errlog := &models.HisOrderError{
-			UserOrgId:  adminUser.CurrentOrgId,
-			Ctime:      time.Now().Unix(),
-			Mtime:      time.Now().Unix(),
-			ErrMsg:     res2.ErrMsg,
-			Status:     1,
-			PatientId:  id,
-			RecordTime: recordDateTime,
-			Stage:      3,
-		}
-		service.CreateErrMsgLog(errlog)
-
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
-		return
-	}
-
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "上传成功",
-	})
-
-}
+//func (c *HisApiController) GetUploadDiag() {
+//	id, _ := c.GetInt64("id")
+//	record_time := c.GetString("record_time")
+//
+//	diagnosis_id, _ := c.GetInt64("diagnosis")
+//	sick_type, _ := c.GetInt64("sick_type")
+//	reg_type, _ := c.GetInt64("reg_type")
+//
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+//	if err != nil {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//
+//	var patientPrescription models.HisPrescriptionInfo
+//	recordDateTime := theTime.Unix()
+//	adminInfo := c.GetAdminUserInfo()
+//	patientPrescription, _ = service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+//
+//	if patientPrescription.ID == 0 {
+//		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+//	}
+//
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
+//	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
+//	his, _ := service.GetVMHisPatientInfo(adminInfo.CurrentOrgId, id, recordDateTime)
+//	sickConfig, _ := service.FindSickById(sick_type)
+//	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+//
+//	api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
+//		"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
+//		"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
+//		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.ContentCode + "&sick_name=" + sickConfig.ClassName
+//	resp2, requestErr2 := http.Get(api2)
+//	if requestErr2 != nil {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+//	if ioErr2 != nil {
+//		utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	var respJSON2 map[string]interface{}
+//	if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+//		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
+//	userJSONBytes2, _ := json.Marshal(respJSON2)
+//
+//	var res2 ResultSix
+//	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	if res2.Infcode != 0 {
+//		adminUser := c.GetAdminUserInfo()
+//		errlog := &models.HisOrderError{
+//			UserOrgId:  adminUser.CurrentOrgId,
+//			Ctime:      time.Now().Unix(),
+//			Mtime:      time.Now().Unix(),
+//			ErrMsg:     res2.ErrMsg,
+//			Status:     1,
+//			PatientId:  id,
+//			RecordTime: recordDateTime,
+//			Stage:      3,
+//		}
+//		service.CreateErrMsgLog(errlog)
+//
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterThreeException)
+//		return
+//	}
+//
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"msg": "上传成功",
+//	})
+//
+//}
 
 type QueryResult struct {
 	ID             int64
@@ -8801,12 +9176,3 @@ func ConvertToString(src string, srcCode string, tagCode string) string {
 	result := string(cdata)
 	return result
 }
-
-//func (c *HisApiController)HandleCheckDetailAccount(){
-//	psn_no, _ := c.GetString("psn_no")
-//	psn_no, _ := c.GetString("psn_no")
-//	psn_no, _ := c.GetString("psn_no")
-//
-//
-//
-//}

models/his_models.go

@@ -998,6 +998,8 @@ type BaseParams struct {
 	MdtrtareaAdmvs string
 	OrgName        string
 	Doctor         string
+	RequestUrl     string
+	AccessKey      string
 }
 
 type BusinessParams struct {

service/gdyb_service.go

@@ -1780,7 +1780,6 @@ type Params struct {
 	FixmedinsCode string `json:"fixmedins_code"` //调用环境生产为1 沙盒2
 }
 
-//文件上传
 //文件上传
 func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 
@@ -2040,6 +2039,70 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
+func Gdyb5204(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5204" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["setl_id"] = businessParams.SetlId
+	inputData["mdtrt_id"] = businessParams.MdtrtId
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	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")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "5203"
+	var url string
+	if baseParams.FixmedinsCode == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "5204"
+	}
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	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()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+
 func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
 	if med_type == "1111" || med_type == "1112" {
 		med_type = "11"

service/jsyb_service.go

@@ -1,24 +1,19 @@
 package service
 
 import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"gdyb/models"
 	"gdyb/utils/csbhttp"
 	"strconv"
 	"time"
 )
 
 // 人员基本信息
-func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, skey string, timestamp_str string) (string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
+func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key 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 := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
@@ -50,55 +45,651 @@ func Jsyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
-	//var inputLog string
+	var inputLog string
 	bytesData, _ := json.Marshal(inputMessage)
-	//inputLog = string(bytesData)
+	inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	//reader := bytes.NewReader(bytesData)
-
-	//request, err := http.NewRequest("POST", "http://10.72.3.87:8086/CSB/1101", reader)
-	//if err != nil {
-	//	fmt.Println(err.Error())
-	//	return err.Error(), ""
-	//}
-	//key := "_api_access_key=" + access_key + "&_api_name=" + "hssServives" + "&_api_timestamp=" + strconv.FormatInt(timestamp, 10) + "&_api_version=" + "1.0.0"
-
-	//fmt.Println(skey)
-	//fmt.Println(timestamp_str)
-	//fmt.Println(access_key)
-	//
-	//request.Header.Set("Content-Type", "application/json")
-	//request.Header.Set("_api_timestamp", timestamp_str)
-	//request.Header.Set("_api_name", "hssServives")
-	//request.Header.Set("_api_version", "1.0.0")
-	//request.Header.Set("_api_access_key", access_key)
-	//request.Header.Set("_api_signature", skey)
-	//
-	//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
-	//request_url = "http://10.72.3.87:8086/CSB/1101"
-	return HttpRequest(request_url, access_key, secret_key, timestamp, bytesData, string(bytesData)), ""
+	request_url = request_url + "1101"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
-func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte []byte, json string) string {
+
+// 门诊挂号
+func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string) (string, string) {
+	fmt.Println(opera)
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2201"        // 交易编码
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
+	inputData["begntime"] = timeFormatOne // 开始时间
+
+	if id_card_type == 1 {
+		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	}
+
+	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
+	inputData["atddr_no"] = doctor_id    // 医师编码
+	inputData["dr_name"] = doctor_name   // 医师姓名
+	inputData["dept_code"] = dept_code   // 科室编码
+	inputData["dept_name"] = dept        // 科室名称
+	inputData["caty"] = "A03.06"         // 科别
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2201"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+
+}
+
+// 门诊挂号撤销
+func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, request_url string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2202"       // 交易编码
+	inputData["psn_no"] = psnNo          // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId      // 就诊 ID（来自2201接口返回）
+	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2202"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+}
+
+// 门诊就诊信息上传
+func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	diseinfo := make([]map[string]interface{}, 0)
+
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
+	inputMessage["infno"] = "2203"        // 交易编码
+	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+	inputData["begntime"] = timeFormatOne // 开始时间
+	//inputData["begntime"] =  // 开始时间
+	inputData["main_cond_dscr"] = ""    // 主要病情描述
+	inputData["dise_codg"] = sick_code  // 病种编码
+	inputData["dise_name"] = sick_name  // 病种名称
+	inputData["birctrl_type"] = ""      // 计划生育手术类别
+	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
+
+	for index, item := range config {
+		diseinfo_sun := make(map[string]interface{})
+		diseinfo_sun["diag_type"] = "1"              // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
+		diseinfo_sun["diag_dept"] = department       // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
+		diseinfo_sun["vali_flag"] = "1"              // 有效标志
+		diseinfo = append(diseinfo, diseinfo_sun)
+	}
+
+	input["diseinfo"] = diseinfo
+	input["mdtrtinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2203"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+}
+
+// 门诊就诊信息上传
+func Jsyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	diseinfo := make([]map[string]interface{}, 0)
+
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
+	inputMessage["infno"] = "2203A"       // 交易编码
+	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+	inputData["begntime"] = timeFormatOne // 开始时间
+
+	inputData["main_cond_dscr"] = ""    // 主要病情描述
+	inputData["dise_codg"] = sick_code  // 病种编码
+	inputData["dise_name"] = sick_name  // 病种名称
+	inputData["birctrl_type"] = ""      // 计划生育手术类别
+	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
+
+	inputData["matn_type"] = "" // 生育类别
+	inputData["geso_val"] = ""  // 孕周数
+
+	for index, item := range config {
+		diseinfo_sun := make(map[string]interface{})
+		diseinfo_sun["diag_type"] = "1"              // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
+		diseinfo_sun["diag_dept"] = department       // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
+		diseinfo_sun["vali_flag"] = "1"              // 有效标志
+		diseinfo = append(diseinfo, diseinfo_sun)
+	}
+
+	input["diseinfo"] = diseinfo
+	input["mdtrtinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2203A"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+}
+
+//  门诊费用明细信息上传
+func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, diag_code string, request_url string, access_key string, new_doctor_name string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//chrgBchno := rand.Intn(100000) + 10000
+	var customs []*Custom
+
+	for _, item := range hisPrescription {
+
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
+					//var randNum int
+					//randNum = rand.Intn(10000) + 1000
+					cus := &Custom{
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.4f", subItem.Price),
+						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
+						HospApprFlag:     subItem.HospApprFlag,
+						DoctorNumber:     doctor_id,
+						DoctorName:       new_doctor_name,
+					}
+
+					customs = append(customs, cus)
+				}
+			}
+		}
+
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				//var randNum int
+				//randNum = rand.Intn(10000) + 1000
+				if subItem.Type == 2 {
+					if len(subItem.HisProject.MedicalCode) > 0 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+						cus := &Custom{
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:              fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:      subItem.HisProject.MedicalCode,
+							DoctorNumber:     doctor_id,
+							DoctorName:       new_doctor_name,
+							HospApprFlag:     -1,
+						}
+						customs = append(customs, cus)
+					}
+
+				} else if subItem.Type == 3 {
+					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+
+						cus := &Custom{
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:              fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+							HospApprFlag:     -1,
+							DoctorNumber:     doctor_id,
+							DoctorName:       new_doctor_name,
+						}
+						customs = append(customs, cus)
+					}
+
+				}
+
+			}
+		}
+
+		for _, subItem := range item.HisAdditionalCharge {
+			if len(subItem.XtHisAddtionConfig.Code) > 0 {
+				cus := &Custom{
+					DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
+					Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+					MedListCodg:      subItem.XtHisAddtionConfig.Code,
+					HospApprFlag:     -1,
+					DoctorNumber:     doctor_id,
+					DoctorName:       new_doctor_name,
+				}
+				customs = append(customs, cus)
+			}
+		}
+	}
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	inputMessage["infno"] = "2204" // 交易编码
+
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	for _, item := range customs {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["feedetl_sn"] = item.FeedetlSn
+		feedetailInfo["mdtrt_id"] = mdtrtId                          // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo                              // 人员编号 （来自1101接口返回）
+		feedetailInfo["chrg_bchno"] = chrg_bchno                     // 收费批次号
+		feedetailInfo["dise_codg"] = diag_code                       // 病种编码
+		feedetailInfo["rxno"] = ""                                   // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
+		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
+		feedetailInfo["cnt"] = item.Cut                              // 数量
+		feedetailInfo["pric"] = item.Price                           // 单价
+		feedetailInfo["sin_dos_dscr"] = ""                           // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""                         // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                              // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
+		feedetailInfo["bilg_dr_codg"] = item.DoctorNumber            // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = item.DoctorName              // 开单医师姓名
+		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
+		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
+		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
+		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
+		if balance_accounts_type == "8" {
+			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+		} else {
+			if item.HospApprFlag != -1 {
+				if item.HospApprFlag == 1 {
+					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+				} else if item.HospApprFlag == 2 {
+					feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+				} else if item.HospApprFlag == 3 {
+					feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+				} else {
+					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+				}
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+
+		}
+
+		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	input["feedetail"] = feedetail
+	inputMessage["input"] = input //交易输入
+	var requestLog string
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println("----------")
+	fmt.Println(string(bytesData))
+	fmt.Println("----------")
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+	request_url = request_url + "2204"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+}
+
+//  门诊费用明细信息撤销
+func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, request_url string, access_key string) (string, string) {
+
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2205" // 交易编码
+
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
+	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+
+	var requestLog string
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2205"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+}
+
+//  门诊预结算
+func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string) (string, string) {
+
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2206" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" || med_type == "1112" || med_type == "1111" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+	}
+
+	inputData["medfee_sumamt"] = total  // 医疗费总额
+	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype    // 险种类型
+	inputData["invono"] = ""            // 发票号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+
+	bytesData, err := json.Marshal(inputMessage)
+
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2206"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
+
+}
+
+//  门诊结算
+func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2207" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+	}
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
+
+	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
+	inputData["overlmt_selfpay"] = overlmt_selfpay     //
+	inputData["preselfpay_amt"] = preselfpay_amt       //
+	inputData["inscp_scp_amt"] = inscp_scp_amt         //
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2207"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+
+}
+
+func Jsyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2207A" // 交易编码
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
+	}
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
+
+	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
+	inputData["overlmt_selfpay"] = overlmt_selfpay     //
+	inputData["preselfpay_amt"] = preselfpay_amt       //
+	inputData["inscp_scp_amt"] = inscp_scp_amt         //
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2207A"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+
+}
+
+//  门诊结算撤销
+func Jsyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2208" // 交易编码
+
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2208"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+
+}
+
+func Jsyb5203(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5203" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["setl_id"] = businessParams.SetlId
+	inputData["mdtrt_id"] = businessParams.MdtrtId
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	baseParams.RequestUrl = baseParams.RequestUrl + "5203"
+	return HttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)), string(bytesData)
+}
+
+//CBS总线
+func HttpRequest(url string, ak string, sk string, timestamp int64, json string) string {
 	fmt.Println(url)
 	//step 1. 设置请求参数
-	csbHP := csbhttp.NewHttpParams("http://10.72.3.87:8086/CSB/1101") //设置请求地址及url参数
+	csbHP := csbhttp.NewHttpParams(url) //设置请求地址及url参数
 	//设置调用方式 get 或者 post
 	csbHP.SetMethod("post")
 	//csbHP.AddParam("input", "")
@@ -134,13 +725,45 @@ func HttpRequest(url string, ak string, sk string, timestamp int64, requestByte
 	}
 	return res
 }
-func hmacsha1(keyStr, value string) string {
 
-	key := []byte(keyStr)
-	mac := hmac.New(sha1.New, key)
-	mac.Write([]byte(value))
-	//进行base64编码
-	res := base64.StdEncoding.EncodeToString(mac.Sum(nil))
+// 生成基础报文
+func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) map[string]interface{} {
+	// 生成签名
+	tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//randNum := rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000)
 
-	return res
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	msec := time.Now().Format("000")
+
+	// 生成输入报文
+	inputMessage := make(map[string]interface{})
+	inputMessage["msgid"] = fixmedins_code + year + month + day + hour + min + sec + msec + "0" // 发送方报文 ID
+	inputMessage["mdtrtarea_admvs"] = mdtrtarea_admvs                                           // 就医地医保区划
+	inputMessage["insuplc_admdvs"] = insuplc_admdvs                                             // 参保地医保区划
+	inputMessage["recer_sys_code"] = "1"                                                        // 接收方系统代码
+	inputMessage["dev_no"] = ""                                                                 // 设备编号
+	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
+	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
+	inputMessage["signtype"] = ""                                                               // 签名类型
+	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
+	inputMessage["opter_type"] = "1"                                                            // 经办人类别
+	inputMessage["opter"] = doctor                                                              // 经办人
+	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
+	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
+	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
+	inputMessage["fixmedins_name"] = org_name
+	inputMessage["fixmedins_soft_fcty"] = "深圳市领透科技有限公司" //定点医药机构名称
+	//定点医药机构名称
+	inputMessage["sign_no"] = "" //交易签到流水号
+	return inputMessage
 }