更新

controllers/js/jsyb_controller.go

@@ -66,8 +66,8 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/3273", &JSybController{}, "post:Get3273")
 	beego.Router("/jsyb/3274", &JSybController{}, "post:Get3274")
 	beego.Router("/jsyb/3275", &JSybController{}, "post:Get3275")
-	beego.Router("/jsyb/3276", &JSybController{}, "post:Get3276")
-	beego.Router("/jsyb/3277", &JSybController{}, "post:Get3277")
+	//beego.Router("/jsyb/3276", &JSybController{}, "post:Get3276")
+	//beego.Router("/jsyb/3277", &JSybController{}, "post:Get3277")
 
 }
 
@@ -81,6 +81,17 @@ func (c *JSybController) Get3260() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	cainfo := c.GetString("cainfo")
+	fmt.Println(org_name)
+	fmt.Println(doctor)
+
+	fmt.Println(fixmedins_code)
+	fmt.Println(insuplc_admdvs)
+	fmt.Println(mdtrtarea_admvs)
+	fmt.Println(secret_key)
+	fmt.Println(url)
+	fmt.Println(ak)
+	fmt.Println(cainfo)
+
 	result, request := service.Jxyb3260(mdtrtarea_admvs, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3260", "3260", org_name)
 	var dat2 map[string]interface{}
@@ -108,8 +119,8 @@ func (c *JSybController) Get3261() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	cainfo := c.GetString("cainfo")
-	month := c.GetString("month")
-	result, request := service.Jxyb3261(month, mdtrtarea_admvs, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	setl_mon := c.GetString("setl_mon")
+	result, request := service.Jxyb3261(setl_mon, mdtrtarea_admvs, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3261", "3261", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -133,11 +144,12 @@ func (c *JSybController) Get3262() {
 		return
 	}
 	userJSONBytes, _ := json.Marshal(respJSON["datas"])
-	var hp []models.FixMonRecDetailFileIn
+	var hp []models.FixMonRecDetailFileInTwo
 	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
+	fmt.Println(hp)
 
 	userJSONBytes2, _ := json.Marshal(respJSON["fund"])
 	var fund []models.Fund
@@ -160,8 +172,9 @@ func (c *JSybController) Get3262() {
 	fix_fill_psn := respJSON["fix_fill_psn"].(string)
 	fix_fill_date := respJSON["fix_fill_date"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
+	setl_mon := respJSON["setl_mon"].(string)
 
-	result, request := service.Jxyb3262(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, upld_btch, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, hp, fund)
+	result, request := service.Jxyb3262(setl_mon, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, upld_btch, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, hp, fund)
 	saveJsLog(result, request, "3262", "3262", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -184,6 +197,7 @@ func (c *JSybController) Get3263() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+
 	org_name := respJSON["org_name"].(string)
 	doctor := respJSON["doctor"].(string)
 	fixmedins_code := respJSON["fixmedins_code"].(string)
@@ -222,6 +236,14 @@ func (c *JSybController) Get3264() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+
+	userJSONBytes, _ := json.Marshal(respJSON["solidify_id"])
+	var hp []string
+	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
 	org_name := respJSON["org_name"].(string)
 	doctor := respJSON["doctor"].(string)
 	fixmedins_code := respJSON["fixmedins_code"].(string)
@@ -234,7 +256,7 @@ func (c *JSybController) Get3264() {
 	upld_btch := respJSON["upld_btch"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
 	setl_mon := respJSON["setl_mon"].(string)
-	result, request := service.Jxyb3264(setl_mon, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	result, request := service.Jxyb3264(setl_mon, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, hp)
 	saveJsLog(result, request, "3264", "3264", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -258,6 +280,14 @@ func (c *JSybController) Get3265() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+
+	userJSONBytes, _ := json.Marshal(respJSON["solidify_id"])
+	var hp []string
+	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
 	org_name := respJSON["org_name"].(string)
 	doctor := respJSON["doctor"].(string)
 	fixmedins_code := respJSON["fixmedins_code"].(string)
@@ -274,7 +304,7 @@ func (c *JSybController) Get3265() {
 	fix_fill_psn_id := respJSON["fix_fill_psn_id"].(string)
 	fix_fill_psn := respJSON["fix_fill_psn"].(string)
 	fix_fill_date := respJSON["fix_fill_date"].(string)
-	result, request := service.Jxyb3265(setl_mon, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	result, request := service.Jxyb3265(setl_mon, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, hp)
 	saveJsLog(result, request, "3265", "3265", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -309,7 +339,7 @@ func (c *JSybController) Get3266() {
 	cainfo := respJSON["cainfo"].(string)
 	upld_btch := respJSON["upld_btch"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	stmt_mon := respJSON["stmt_mon"].(string)
+	stmt_mon := respJSON["setl_mon"].(string)
 	fix_fill_dept := respJSON["fix_fill_dept"].(string)
 	fix_fill_psn_id := respJSON["fix_fill_psn_id"].(string)
 	fix_fill_psn := respJSON["fix_fill_psn"].(string)
@@ -349,8 +379,8 @@ func (c *JSybController) Get3267() {
 	cainfo := respJSON["cainfo"].(string)
 	upld_btch := respJSON["upld_btch"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	stmt_mon := respJSON["stmt_mon"].(string)
-	result, request := service.Jxyb3267(stmt_mon, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	setl_mon := respJSON["setl_mon"].(string)
+	result, request := service.Jxyb3267(setl_mon, stmt_loc, upld_btch, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3267", "3267", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -376,7 +406,7 @@ func (c *JSybController) Get3268() {
 		return
 	}
 	userJSONBytes, _ := json.Marshal(respJSON["datas"])
-	var hp []models.FixMonRecDetailFileIn
+	var hp []models.FixMonRecDetailFileInTwo
 	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
@@ -403,7 +433,9 @@ func (c *JSybController) Get3268() {
 	fix_fill_psn := respJSON["fix_fill_psn"].(string)
 	fix_fill_date := respJSON["fix_fill_date"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	result, request := service.Jxyb3268(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, upld_btch, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, hp, fund)
+	setl_mon := respJSON["setl_mon"].(string)
+
+	result, request := service.Jxyb3268(setl_mon, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, upld_btch, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, hp, fund)
 	saveJsLog(result, request, "3268", "3268", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -437,9 +469,9 @@ func (c *JSybController) Get3269() {
 	ak := respJSON["ak"].(string)
 	cainfo := respJSON["cainfo"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	stmt_mon := respJSON["setl_mon"].(string)
+	setl_mon := respJSON["setl_mon"].(string)
 
-	result, request := service.Jxyb3269(stmt_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	result, request := service.Jxyb3269(setl_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3269", "3269", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -463,6 +495,12 @@ func (c *JSybController) Get3270() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+	userJSONBytes, _ := json.Marshal(respJSON["solidify_id"])
+	var hp []string
+	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
 	org_name := respJSON["org_name"].(string)
 	doctor := respJSON["doctor"].(string)
 	fixmedins_code := respJSON["fixmedins_code"].(string)
@@ -473,9 +511,10 @@ func (c *JSybController) Get3270() {
 	ak := respJSON["ak"].(string)
 	cainfo := respJSON["cainfo"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	stmt_mon := respJSON["setl_mon"].(string)
+	//stmt_mon := respJSON["setl_mon"].(string)
+	setl_mon := respJSON["setl_mon"].(string)
 
-	result, request := service.Jxyb3270(stmt_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	result, request := service.Jxyb3270(setl_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, hp)
 	saveJsLog(result, request, "3270", "3270", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -499,6 +538,13 @@ func (c *JSybController) Get3271() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
+	userJSONBytes, _ := json.Marshal(respJSON["solidify_id"])
+	var hp []string
+	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
 	org_name := respJSON["org_name"].(string)
 	doctor := respJSON["doctor"].(string)
 	fixmedins_code := respJSON["fixmedins_code"].(string)
@@ -513,7 +559,9 @@ func (c *JSybController) Get3271() {
 	fix_fill_psn_id := respJSON["fix_fill_psn_id"].(string)
 	fix_fill_psn := respJSON["fix_fill_psn"].(string)
 	fix_fill_date := respJSON["fix_fill_date"].(string)
-	result, request := service.Jxyb3271(fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	setl_mon := respJSON["setl_mon"].(string)
+
+	result, request := service.Jxyb3271(setl_mon, fix_fill_dept, fix_fill_psn_id, fix_fill_psn, fix_fill_date, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo, hp)
 	saveJsLog(result, request, "3271", "3271", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
@@ -588,8 +636,10 @@ func (c *JSybController) Get3273() {
 	ak := respJSON["ak"].(string)
 	cainfo := respJSON["cainfo"].(string)
 	stmt_loc := respJSON["stmt_loc"].(string)
-	stmt_mon := respJSON["stmt_mon"].(string)
-	result, request := service.Jxyb3273(stmt_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
+	//stmt_mon := respJSON["stmt_mon"].(string)
+	setl_mon := respJSON["setl_mon"].(string)
+
+	result, request := service.Jxyb3273(setl_mon, stmt_loc, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3273", "3273", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request), &dat2); err == nil {

main.go

@@ -1600,12 +1600,12 @@ func GetblBatchSettleList() {
 
 func GetbrBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	//var orders []*models.HisOrder
-	var orders []*models.HisOrderError
+	var orders []*models.HisOrder
+	//var orders []*models.HisOrderError
 
-	orders, _ = service.GetAllHisOrderErr10278()
+	orders, _ = service.GetAllHisOrder10278()
 	for _, item := range orders {
-		order_id := item.PatientId
+		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		//roles, _ := service.GetDoctorListTwo(org_id)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
@@ -1624,7 +1624,10 @@ func GetbrBatchSettleList() {
 		}
 
 		sickConfig, _ := service.FindSickById(his.SickType)
-		service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, "14", doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, strings.Split(time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"), " ")[0]+" 22:00:00")
+		if order.MedType == "1111" || order.MedType == "1112" {
+			order.MedType = "11"
+		}
+		service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, order.MedType, doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, curRoles.UserName, configTwo, strings.Split(time.Unix(his.RecordDate, 0).Format("2006-01-02 15:04:05"), " ")[0]+" 22:00:00")
 
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		pre, _ := service.GetNewHisPrescriptionByNumber(order.Number)
@@ -2324,7 +2327,7 @@ func GetbrBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10278,
+					Stage:     10278000,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -2340,7 +2343,7 @@ func GetbrBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     10278,
+				Stage:     10278000,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

models/model32xx.go

@@ -3,7 +3,7 @@ package models
 type JSResult3260 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
+	Infcode     string `json:"infcode"`
 	Output      struct {
 		Data struct {
 			FixmedinsCode string `json:"fixmedins_code"`
@@ -21,7 +21,7 @@ type JSResult3260 struct {
 type JSResult3261 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
+	Infcode     string `json:"infcode"`
 	Output      struct {
 		Data struct {
 			FixmedinsCode string `json:"fixmedins_code"`
@@ -37,6 +37,21 @@ type JSResult3261 struct {
 }
 
 type FixMonRecDetailFileIn struct {
+	Insutype      string `json:"insutype"`
+	PsnType       string `json:"psn_type"`
+	MedType       string `json:"med_type"`
+	FixBlngAdmdvs string `json:"fix_blng_admdvs,omitempty"`
+	InsuAdmdvs    string `json:"insu_admdvs,omitempty"`
+	PsnTime       int    `json:"psn_time"`
+	PsnCnt        int    `json:"psn_cnt"`
+	Sumamt        string `json:"sumamt"`
+	Amt           string `json:"amt"`
+	Fund          string `json:"fund"`
+	FundKey       string `json:"fund_key"`
+}
+
+type FixMonRecDetailFileInTwo struct {
+	SetlDate      string  `json:"setl_date"`
 	Insutype      string  `json:"insutype"`
 	PsnType       string  `json:"psn_type"`
 	MedType       string  `json:"med_type"`
@@ -63,26 +78,24 @@ type Fund struct {
 type JSResult3263 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
-	Output      struct {
-		Data []struct {
-			SolidifyID    string  `json:"solidify_id"`
-			FixmedinsCode string  `json:"fixmedins_code"`
-			FixmedinsName string  `json:"fixmedins_name"`
-			FixBlngAdmdvs string  `json:"fix_blng_admdvs"`
-			SetlMon       string  `json:"setl_mon"`
-			Insutype      string  `json:"insutype"`
-			PsnType       string  `json:"psn_type,omitempty"`
-			MedType       string  `json:"med_type"`
-			InsuAdmdvs    string  `json:"insu_admdvs,omitempty"`
-			PsnTime       int     `json:"psn_time"`
-			PsnCnt        int     `json:"psn_cnt"`
-			MedfeeSumAmt  float64 `json:"medfee_sumamt"`
-			InscpAmt      float64 `json:"inscp_amt"`
-			FundCode      string  `json:"fund_code"`
-			FundName      string  `json:"fund_name,omitempty"`
-			FundAmt       float64 `json:"fund_amt"`
-		} `json:"data"`
+	Infcode     string `json:"infcode"`
+	Output      []struct {
+		SolidifyID    string  `json:"solidify_id"`
+		FixmedinsCode string  `json:"fixmedins_code"`
+		FixmedinsName string  `json:"fixmedins_name"`
+		FixBlngAdmdvs string  `json:"fix_blng_admdvs"`
+		SetlMon       string  `json:"setl_mon"`
+		Insutype      string  `json:"insutype"`
+		PsnType       string  `json:"psn_type,omitempty"`
+		MedType       string  `json:"med_type"`
+		InsuAdmdvs    string  `json:"insu_admdvs,omitempty"`
+		PsnTime       int     `json:"psn_time"`
+		PsnCnt        int     `json:"psn_cnt"`
+		MedfeeSumAmt  float64 `json:"medfee_sumamt"`
+		InscpAmt      float64 `json:"inscp_amt"`
+		FundCode      string  `json:"fund_code"`
+		FundName      string  `json:"fund_name,omitempty"`
+		FundAmt       float64 `json:"fund_amt"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
@@ -93,7 +106,7 @@ type JSResult3263 struct {
 type JSResult3264 struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
-	Infcode     int64  `json:"infcode"`
+	Infcode     string `json:"infcode"`
 	Output      struct {
 		Data struct {
 			SolidifyID []string `json:"solidifyIdList,omitempty"`
@@ -195,7 +208,7 @@ type JSResultEmpty struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
-	Infcode     int64       `json:"infcode"`
+	Infcode     string      `json:"infcode"`
 	Output      struct {
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`

service/gdyb_service.go

@@ -686,7 +686,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203"     // 交易编码
+	inputMessage["infno"] = "2203A"    // 交易编码
 	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
 	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
@@ -735,7 +735,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "2203"
+		url = gdyb_url + "2203A"
 	}
 
 	if insuplc_admdvs == "421300" {

service/his_service.go

@@ -1501,7 +1501,7 @@ func GetOrderError10138(org_id int64) (order []*models.HisOrderError, err error)
 }
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("id = 263631 and user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-04-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2023-06-01 00:00:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1592,13 +1592,13 @@ func GetHisPrescriptionForMedType(org_id int64, patient_id int64, record_date in
 	return
 }
 
-func GetOrderByTimeTen(start_time int64, end_time int64, org_id int64) (orders []*models.FixMonRecDetailFileIn, err error) {
-	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') AS fund_key, insutype, `psn_type`, `med_type`, COUNT(DISTINCT `certno`) AS psn_cnt, count(*) as psn_time, sum(medfee_sumamt) as medfee_sumamt, sum(inscp_scp_amt) as inscp_scp_amt, sum(fund_pay_sumamt) as fund_pay_sumamt FROM his_order where user_org_id = ? and status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ? GROUP BY fund_key", org_id, start_time, end_time).Scan(&orders).Error
+func GetOrderByTimeTen(start_time string, end_time string, org_id int64) (orders []models.FixMonRecDetailFileIn, err error) {
+	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') AS fund_key, insutype, '99' as `psn_type` , `med_type`, COUNT(DISTINCT `certno`) AS psn_cnt, count(*) as psn_time, sum(medfee_sumamt) as sumamt, sum(inscp_scp_amt) as amt, sum(fund_pay_sumamt) as fund FROM his_order where user_org_id = ? and status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ? GROUP BY fund_key", org_id, start_time+" 00:00:00", end_time+" 23:00:00").Scan(&orders).Error
 	return
 }
 
-func GetOrderDetailByTimeTen(start_time int64, end_time int64, org_id int64, fund_key string) (fund []models.FundDetail, err error) {
-	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') as fund_key,  `setl_detail`  FROM his_order where user_org_id = 10188 and status = 1 and order_status = 2 and setl_time >= '2023-04-01 00:00:00' and setl_time <= '2023-04-30 23:59:59'  and CONCAT(insutype, '99', med_type, '555555')  = ?", org_id, start_time, end_time, fund_key).Scan(&fund).Error
+func GetOrderDetailByTimeTen(start_time string, end_time string, org_id int64, fund_key string) (fund []models.FundDetail, err error) {
+	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') as fund_key,  `setl_detail`  FROM his_order where user_org_id = ? and status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ?  and CONCAT(insutype, '99', med_type, '555555')  = ?", org_id, start_time+" 00:00:00", end_time+" 23:59:00", fund_key).Scan(&fund).Error
 	return
 }
 

service/hn_service.go

@@ -60,7 +60,9 @@ func Hnyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error(), ""
 	}
 	request_url = request_url + "1101"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "1101"), inputLog
 }
 
 //人员基本信息版本2
@@ -108,7 +110,9 @@ func Hnybyb1101A(certNo string, org_name string, doctor string, fixmedins_code s
 		return err.Error(), ""
 	}
 	request_url = request_url + "1101"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "1101"), inputLog
 }
 
 func Hnyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string, id_card_no string) (string, string) {
@@ -140,7 +144,9 @@ func Hnyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_ad
 		return err.Error(), ""
 	}
 	request_url = request_url + "1101"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "1101"), inputLog
 }
 
 func Hnyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string, id_card_no string, name string) (string, string) {
@@ -171,7 +177,9 @@ func Hnyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 		return err.Error(), ""
 	}
 	request_url = request_url + "1101"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "1101"), inputLog
 }
 
 // 门诊挂号
@@ -231,7 +239,9 @@ func Hnyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	}
 
 	request_url = request_url + "2201"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2201"), requestLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2201"), requestLog
 
 }
 
@@ -264,8 +274,10 @@ func Hnyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 
 	request_url = request_url + "2202"
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
 	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2202"), requestLog
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2202"), requestLog
 }
 
 // 门诊就诊信息上传
@@ -324,8 +336,9 @@ func Hnyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	}
 	request_url = request_url + "2203"
 	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2203"), requestLog, timestamp
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2203"), requestLog, timestamp
 }
 
 // 门诊就诊信息上传
@@ -387,15 +400,16 @@ func Hnyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	}
 	request_url = request_url + "2203"
 	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2203"), requestLog
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2203"), requestLog
 }
 
 //  门诊费用明细信息上传
 func Hnyb2204(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, time_stamp_2203 string, cainfo string) (string, string) {
 	// 生成签名
 	//timestamp := time.Now().Unix()
-	timestamp := time.Now().Unix()
+	//timestamp := time.Now().Unix()
 
 	timestamp2 := time.Now().Unix()
 
@@ -578,8 +592,9 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	request_url = request_url + "2204"
 	//fmt.Println(HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp5 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2204"), requestLog
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp5, string(bytesData), "2204"), requestLog
 }
 
 //  门诊费用明细信息撤销
@@ -612,7 +627,9 @@ func Hnyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error(), ""
 	}
 	request_url = request_url + "2205"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2205"), requestLog
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2205"), requestLog
 }
 
 //  门诊预结算
@@ -679,8 +696,9 @@ func Hnyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 	request_url = request_url + "2206"
 	//fmt.Println(HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2206"), requestLog
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2206"), requestLog
 
 }
 
@@ -749,8 +767,9 @@ func Hnyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 	}
 	request_url = request_url + "2206"
 	//fmt.Println(HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2206"), requestLog
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2206"), requestLog
 
 }
 
@@ -815,7 +834,9 @@ func Hnyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 	request_url = request_url + "2207"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2207"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2207"), string(bytesData)
 
 }
 
@@ -882,7 +903,9 @@ func Hnyb2207Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 		return err.Error(), ""
 	}
 	request_url = request_url + "2207"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2207"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2207"), string(bytesData)
 
 }
 
@@ -944,8 +967,9 @@ func Hnyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string, in
 	}
 	request_url = request_url + "2207A"
 	//fmt.Println(HNHttpRequestHNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2207A"), string(bytesData)
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2207A"), string(bytesData)
 
 }
 
@@ -973,7 +997,9 @@ func Hnyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error(), ""
 	}
 	request_url = request_url + "2208"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2208"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2208"), string(bytesData)
 
 }
 
@@ -997,8 +1023,9 @@ func Hnyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	}
 	baseParams.RequestUrl = baseParams.RequestUrl + "5203"
 	//fmt.Println(HNHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)))
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
 
-	return HNHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData), "5203"), string(bytesData)
+	return HNHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp2, string(bytesData), "5203"), string(bytesData)
 }
 
 //CBS总线
@@ -1113,7 +1140,9 @@ func Hnyb5301(psnNo string, org_name string, doctor string, fixmedins_code strin
 	}
 
 	request_url = request_url + "5301"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "5301"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "5301"), string(bytesData)
 
 }
 
@@ -1148,7 +1177,9 @@ func Hnyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error(), ""
 	}
 	request_url = request_url + "2503"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2503"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "2503"), string(bytesData)
 }
 
 func Hnyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
@@ -1179,7 +1210,9 @@ func Hnyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float6
 		return err.Error(), ""
 	}
 	request_url = request_url + "3201"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3201"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "3201"), string(bytesData)
 }
 
 func Hnyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64, request_url string, cainfo string, access_key string) (string, string) {
@@ -1240,7 +1273,9 @@ func Hnyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	//return str, ""
 
 	request_url = request_url + "9001"
-	return HNHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "9001"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(request_url, access_key, secret_key, timestamp2, string(bytesData), "9001"), string(bytesData)
 
 }
 
@@ -1714,7 +1749,9 @@ func Hnyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	fmt.Println(string(bytesData))
 
 	params.RequestUrl = params.RequestUrl + "4101"
-	return HNHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4101"), string(bytesData)
+	timestamp2 := time.Now().UnixNano() / int64(time.Millisecond)
+
+	return HNHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp2, string(bytesData), "4101"), string(bytesData)
 
 }
 
@@ -1746,6 +1783,7 @@ func Hnyb3501(struct3501 models.Struct3501) (string, string) {
 		return err.Error(), ""
 	}
 	struct3501.RequestUrl = struct3501.RequestUrl + "3501"
+
 	return HNHttpRequest(struct3501.RequestUrl, struct3501.AccessKey, struct3501.SecretKey, timestamp, string(bytesData), "3501"), string(bytesData)
 
 }

service/jsyb_service.go

@@ -2009,15 +2009,15 @@ func Jxyb3260(setl_optins string, org_name string, doctor string, fixmedins_code
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3260"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
 	inputData["fix_blng_admdvs"] = setl_optins   //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2025,7 +2025,7 @@ func Jxyb3260(setl_optins string, org_name string, doctor string, fixmedins_code
 		return err.Error(), ""
 	}
 	request_url = request_url + "3260"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3260"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 
 // 月度对账状态查询
@@ -2034,7 +2034,7 @@ func Jxyb3261(stmt_mon string, setl_optins string, org_name string, doctor strin
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3261"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
@@ -2042,8 +2042,8 @@ func Jxyb3261(stmt_mon string, setl_optins string, org_name string, doctor strin
 	inputData["fix_blng_admdvs"] = setl_optins   //医疗费总额
 	inputData["stmt_mon"] = stmt_mon             //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2051,14 +2051,14 @@ func Jxyb3261(stmt_mon string, setl_optins string, org_name string, doctor strin
 		return err.Error(), ""
 	}
 	request_url = request_url + "3261"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3261"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, upld_btch string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, hp []models.FixMonRecDetailFileIn, funds []models.Fund) (string, string) {
+func Jxyb3262(setl_mon, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, upld_btch string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, hp []models.FixMonRecDetailFileInTwo, funds []models.Fund) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 
 	fixMonRecDetailFileIns := make([]map[string]interface{}, 0)
@@ -2072,14 +2072,15 @@ func Jxyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["fix_fill_date"] = fix_fill_date
 	inputData["stmt_loc"] = stmt_loc
 	inputData["upld_btch"] = upld_btch
+	inputData["setl_mon"] = setl_mon
 
 	for _, item := range hp {
 		fixMonRecDetailFileIn := make(map[string]interface{})
 		fixMonRecDetailFileIn["insutype"] = item.Insutype
 		fixMonRecDetailFileIn["psn_type"] = item.PsnType
 		fixMonRecDetailFileIn["med_type"] = item.MedType
-		fixMonRecDetailFileIn["fix_blng_admdvs"] = item.FixBlngAdmdvs
-		fixMonRecDetailFileIn["insu_admdvs"] = item.InsuAdmdvs
+		fixMonRecDetailFileIn["fix_blng_admdvs"] = mdtrtarea_admvs
+		fixMonRecDetailFileIn["insu_admdvs"] = insuplc_admdvs
 		fixMonRecDetailFileIn["psn_time"] = item.PsnTime
 		fixMonRecDetailFileIn["psn_cnt"] = item.PsnCnt
 		fixMonRecDetailFileIn["medfee_sumamt"] = item.MedfeeSumAmt
@@ -2104,8 +2105,8 @@ func Jxyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 	inputData["fixMonRecDetailFileInList"] = fixMonRecDetailFileIns
 	inputData["fundList"] = fundList
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2113,24 +2114,24 @@ func Jxyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		return err.Error(), ""
 	}
 	request_url = request_url + "3262"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3262"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3263(stmt_mon string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3263"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
 	inputData["upld_btch"] = upld_btch           //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2138,24 +2139,30 @@ func Jxyb3263(stmt_mon string, stmt_loc string, upld_btch string, org_name strin
 		return err.Error(), ""
 	}
 	request_url = request_url + "3263"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3263"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3264(stmt_mon string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+func Jxyb3264(stmt_mon string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, hp []string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3264"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
 	inputData["upld_btch"] = upld_btch           //医疗费总额
+	//inputData["solidifyIdList"] = hp          //医疗费总额
+	if len(hp) == 0 {
+		inputData["solidifyIdList"] = make([]string, 0) //医疗费总额
+	} else {
+		inputData["solidifyIdList"] = hp //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	}
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2163,14 +2170,14 @@ func Jxyb3264(stmt_mon string, stmt_loc string, upld_btch string, org_name strin
 		return err.Error(), ""
 	}
 	request_url = request_url + "3264"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3264"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3265(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+func Jxyb3265(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, hp []string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 
 	//solidifyId := make(map[string]interface{})
@@ -2178,18 +2185,23 @@ func Jxyb3265(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 	inputMessage["infno"] = "3265"                 // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code   // 对帐开始时间
 	inputData["fixmedins_name"] = org_name         //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon               //医疗费总额
+	inputData["setl_mon"] = stmt_mon               //医疗费总额
 	inputData["fix_fill_dept"] = fix_fill_dept     //对帐结束时间
 	inputData["fix_fill_psn_id"] = fix_fill_psn_id //对帐结束时间
 	inputData["fix_fill_psn"] = fix_fill_psn       //对帐结束时间
 	inputData["fix_fill_date"] = fix_fill_date     //对帐结束时间
 	inputData["stmt_loc"] = stmt_loc               //医疗费总额
 	inputData["upld_btch"] = upld_btch             //医疗费总额
+	fmt.Println(hp)
+	if len(hp) == 0 {
+		inputData["solidifyIdList"] = make([]string, 0) //医疗费总额
+	} else {
+		inputData["solidifyIdList"] = hp //医疗费总额
 
-	inputData["solidifyIdList"] = "" //医疗费总额
+	}
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2197,21 +2209,21 @@ func Jxyb3265(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 		return err.Error(), ""
 	}
 	request_url = request_url + "3265"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3265"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3266(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, upld_btch string, fix_blng_admdvs string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3266"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
 
 	inputData["fix_blng_admdvs"] = fix_blng_admdvs //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon               //医疗费总额
+	inputData["setl_mon"] = stmt_mon               //医疗费总额
 	inputData["fix_fill_dept"] = fix_fill_dept     //对帐结束时间
 	inputData["fix_fill_psn_id"] = fix_fill_psn_id //对帐结束时间
 	inputData["fix_fill_psn"] = fix_fill_psn       //对帐结束时间
@@ -2219,8 +2231,8 @@ func Jxyb3266(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 	inputData["stmt_loc"] = stmt_loc               //医疗费总额
 	inputData["upld_btch"] = upld_btch             //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2228,24 +2240,24 @@ func Jxyb3266(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 		return err.Error(), ""
 	}
 	request_url = request_url + "3266"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3266"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3267(stmt_mon string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3267"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
 	inputData["upld_btch"] = upld_btch           //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2253,14 +2265,14 @@ func Jxyb3267(stmt_mon string, stmt_loc string, upld_btch string, org_name strin
 		return err.Error(), ""
 	}
 	request_url = request_url + "3267"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3267"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3268(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, upld_btch string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, hp []models.FixMonRecDetailFileIn, funds []models.Fund) (string, string) {
+func Jxyb3268(setl_mon string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, upld_btch string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, hp []models.FixMonRecDetailFileInTwo, funds []models.Fund) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 
 	fixMonRecDetailFileIns := make([]map[string]interface{}, 0)
@@ -2269,8 +2281,9 @@ func Jxyb3268(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputMessage["infno"] = "3268"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["upld_btch"] = upld_btch
 
-	inputData["setl_mon"] = "" //对帐结束时间
+	inputData["setl_mon"] = setl_mon //对帐结束时间
 	inputData["fix_fill_dept"] = fix_fill_dept
 	inputData["fix_fill_psn_id"] = fix_fill_psn_id
 	inputData["fix_fill_psn"] = fix_fill_psn
@@ -2279,12 +2292,12 @@ func Jxyb3268(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 	for _, item := range hp {
 		fixMonRecDetailFileIn := make(map[string]interface{})
-		fixMonRecDetailFileIn["setl_date"] = ""
+		fixMonRecDetailFileIn["setl_date"] = item.SetlDate
 		fixMonRecDetailFileIn["insutype"] = item.Insutype
 		fixMonRecDetailFileIn["psn_type"] = item.PsnType
 		fixMonRecDetailFileIn["med_type"] = item.MedType
-		fixMonRecDetailFileIn["fix_blng_admdvs"] = item.FixBlngAdmdvs
-		fixMonRecDetailFileIn["insu_admdvs"] = item.InsuAdmdvs
+		fixMonRecDetailFileIn["fix_blng_admdvs"] = mdtrtarea_admvs
+		fixMonRecDetailFileIn["insu_admdvs"] = insuplc_admdvs
 		fixMonRecDetailFileIn["psn_time"] = item.PsnTime
 		fixMonRecDetailFileIn["psn_cnt"] = item.PsnCnt
 		fixMonRecDetailFileIn["medfee_sumamt"] = item.MedfeeSumAmt
@@ -2311,8 +2324,8 @@ func Jxyb3268(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["fixDateRecDetailFileInList"] = fixMonRecDetailFileIns
 	inputData["fundList"] = fundList
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2320,23 +2333,23 @@ func Jxyb3268(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		return err.Error(), ""
 	}
 	request_url = request_url + "3268"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3268"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3269(stmt_mon string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3269"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2344,23 +2357,29 @@ func Jxyb3269(stmt_mon string, stmt_loc string, org_name string, doctor string,
 		return err.Error(), ""
 	}
 	request_url = request_url + "3269"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3269"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3270(stmt_mon string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+func Jxyb3270(setl_mon string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, hp []string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3270"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = setl_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
+	//inputData["solidifyIdList"] = hp          //医疗费总额
+	if len(hp) == 0 {
+		inputData["solidifyIdList"] = make([]string, 0) //医疗费总额
+	} else {
+		inputData["solidifyIdList"] = hp //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	}
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2368,27 +2387,33 @@ func Jxyb3270(stmt_mon string, stmt_loc string, org_name string, doctor string,
 		return err.Error(), ""
 	}
 	request_url = request_url + "3270"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3270"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
-func Jxyb3271(fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+func Jxyb3271(stmt_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string, hp []string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3271"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 
 	inputData["fix_fill_dept"] = fix_fill_dept     //对帐结束时间
 	inputData["fix_fill_psn_id"] = fix_fill_psn_id //对帐结束时间
 	inputData["fix_fill_psn"] = fix_fill_psn       //对帐结束时间
 	inputData["fix_fill_date"] = fix_fill_date     //对帐结束时间
 	inputData["stmt_loc"] = stmt_loc               //医疗费总额
+	if len(hp) == 0 {
+		inputData["solidifyIdList"] = make([]string, 0) //医疗费总额
+	} else {
+		inputData["solidifyIdList"] = hp //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	}
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2396,14 +2421,14 @@ func Jxyb3271(fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string,
 		return err.Error(), ""
 	}
 	request_url = request_url + "3271"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3271"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3272(setl_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3272"                 // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code   // 对帐开始时间
@@ -2416,8 +2441,8 @@ func Jxyb3272(setl_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 	inputData["fix_fill_date"] = fix_fill_date     //对帐结束时间
 	inputData["stmt_loc"] = stmt_loc               //对帐结束时间
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2425,23 +2450,23 @@ func Jxyb3272(setl_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 		return err.Error(), ""
 	}
 	request_url = request_url + "3272"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3272"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3273(stmt_mon string, stmt_loc string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3273"               // 交易编码
 	inputData["fixmedins_code"] = fixmedins_code // 对帐开始时间
 	inputData["fixmedins_name"] = org_name       //对帐结束时间
-	inputData["stmt_mon"] = stmt_mon             //医疗费总额
+	inputData["setl_mon"] = stmt_mon             //医疗费总额
 	inputData["stmt_loc"] = stmt_loc             //医疗费总额
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	//input["data"] = inputData
+	inputMessage["input"] = inputData //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -2449,7 +2474,7 @@ func Jxyb3273(stmt_mon string, stmt_loc string, org_name string, doctor string,
 		return err.Error(), ""
 	}
 	request_url = request_url + "3273"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3273"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3274(setl_mon string, fix_fill_dept string, fix_fill_psn_id string, fix_fill_psn string, fix_fill_date string, stmt_loc string, upld_btch string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名
@@ -2479,7 +2504,7 @@ func Jxyb3274(setl_mon string, fix_fill_dept string, fix_fill_psn_id string, fix
 		return err.Error(), ""
 	}
 	request_url = request_url + "3274"
-	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3274"), string(bytesData)
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
 func Jxyb3275(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
 	// 生成签名

service/jx_service.go

@@ -2226,7 +2226,49 @@ func Jxyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	fmt.Println(string(bytesData))
 
 	params.RequestUrl = params.RequestUrl + "4101"
-	return JXHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4101"), string(bytesData)
+	return JXHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4101A"), string(bytesData)
+
+}
+func Jxyb4102(psn_no string, setl_id string, params models.PublicParams, stas_type string) (string, string) {
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4102" // 交易编码
+
+	inputData["setl_id"] = setl_id     // 结算 ID  必填
+	inputData["psn_no"] = psn_no       // 结算 ID  必填
+	inputData["stas_type"] = stas_type // 结算 ID  必填
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+
+	params.RequestUrl = params.RequestUrl + "4102"
+	return JXHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4102"), string(bytesData)
+
+}
+
+func Jxyb4103(psn_no string, setl_id string, params models.PublicParams) (string, string) {
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4103" // 交易编码
+
+	inputData["setl_id"] = setl_id // 结算 ID  必填
+	inputData["psn_no"] = psn_no   // 结算 ID  必填
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+
+	params.RequestUrl = params.RequestUrl + "4103"
+	return JXHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4103"), string(bytesData)
 
 }