更新

controllers/ah/ahyb_controller.go

@@ -44,16 +44,15 @@ type Response struct {
 	State     struct{} `json:"state"`
 }
 
-
 type Body3513 struct {
-	ErrMsg      string                 `json:"err_msg"`
-	InfRefMsgID string                 `json:"inf_refmsgid"`
-	InfCode     int                    `json:"infcode"`
+	ErrMsg      string                   `json:"err_msg"`
+	InfRefMsgID string                   `json:"inf_refmsgid"`
+	InfCode     int                      `json:"infcode"`
 	Output      []map[string]interface{} `json:"output"`
 }
 
 type Response1513 struct {
-	Body3513      Body3513     `json:"body"`
+	Body3513  Body3513 `json:"body"`
 	Code      int      `json:"code"`
 	CSBCode   int      `json:"csbCode"`
 	Message   string   `json:"message"`
@@ -98,20 +97,13 @@ func AHybRegistRouters() {
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 	beego.Router("/ahyb/2406", &AHybController{}, "post:Get2406")
 
-
-
 	beego.Router("/ahyb/5101", &AHybController{}, "get:Get5101")
 	beego.Router("/ahyb/5102", &AHybController{}, "get:Get5102")
 
-
-
-
 	beego.Router("/ahyb/02", &AHybController{}, "post:Get02")
 
 	beego.Router("/ahyb/03", &AHybController{}, "post:Get03")
 
-
-
 }
 func (c *AHybController) Get02() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -120,8 +112,8 @@ func (c *AHybController) Get02() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
-	result, request := service.GetAHCFYLJG012(respJSON["code"].(string), respJSON["url"].(string),respJSON["encoded"].(string),respJSON["rx_encoded"].(string),"")
-	saveJsLog(result, request, "GetCFYLJG002", "GetCFYLJG002","1111")
+	result, request := service.GetAHCFYLJG012(respJSON["code"].(string), respJSON["url"].(string), respJSON["encoded"].(string), respJSON["rx_encoded"].(string), "")
+	saveJsLog(result, request, "GetCFYLJG002", "GetCFYLJG002", "1111")
 
 }
 
@@ -138,12 +130,11 @@ func (c *AHybController) Get03() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result, request := service.GetAHCFYLJG013(respJSON["url"].(string),struct3501)
-	saveJsLog(result, request, "GetCFYLJG013", "GetCFYLJG013","1111")
+	result, request := service.GetAHCFYLJG013(respJSON["url"].(string), struct3501)
+	saveJsLog(result, request, "GetCFYLJG013", "GetCFYLJG013", "1111")
 
 }
 
-
 func (c *AHybController) Get3501() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -614,7 +605,6 @@ func (c *AHybController) Get3513() {
 
 	}
 
-
 }
 func (c *AHybController) Readcardcharge() {
 	fixmedins_code := c.GetString("fixmedins_code")
@@ -718,7 +708,6 @@ func (c *AHybController) Get9001() {
 
 }
 
-
 func (c *AHybController) Get5101() {
 	url := c.GetString("url")
 	org_name := c.GetString("org_name")
@@ -731,7 +720,6 @@ func (c *AHybController) Get5101() {
 	fmt.Println("Error decoding JSON:", org_name)
 	fmt.Println("Error decoding JSON:", opera_name)
 
-
 	result, inputLog := service.AHyb5101(org_name, opera_name, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, cainfo)
 	saveJsLog(result, inputLog, "5101", "科室", org_name)
 
@@ -798,8 +786,6 @@ func (c *AHybController) Get5102() {
 
 }
 
-
-
 func (c *AHybController) Get5301() {
 	psn_no := c.GetString("psn_no")
 	org_name := c.GetString("org_name")
@@ -1327,10 +1313,13 @@ func (c *AHybController) PostEight() {
 	cainfo := c.GetString("cainfo")
 	mdtrt_grp_type := c.GetString("mdtrt_grp_type")
 
+	pack_num := c.GetString("pack_num")
+	good_pack_num := c.GetString("good_pack_num")
+
 	var result string
 	var inputLog string
 
-	result, inputLog = service.AHyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, acct_used_flag, url, ak, verify_number, cainfo, mdtrt_grp_type)
+	result, inputLog = service.AHyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, acct_used_flag, url, ak, verify_number, cainfo, mdtrt_grp_type, pack_num, good_pack_num)
 
 	saveJsLog(result, inputLog, "2207", "结算", org_name)
 	var response Response

controllers/gz/new_his_api_controller.go

@@ -5043,7 +5043,7 @@ type Result5301For10265 struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
-//获取个人信息----挂号-----上传就诊信息
+// 获取个人信息----挂号-----上传就诊信息
 func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -5524,7 +5524,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	}
 }
 
-//上传明细----预结算----确认订单
+// 上传明细----预结算----确认订单
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -5548,7 +5548,8 @@ func (c *HisApiController) GetUploadInfo() {
 
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
-
+	pack_num, _ := c.GetInt64("pack_num")
+	good_pack_num, _ := c.GetInt64("good_pack_num")
 	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
@@ -6444,7 +6445,7 @@ func (c *HisApiController) GetUploadInfo() {
 										med_type = "11"
 									}
 								}
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, pack_num, good_pack_num)
 							} else {
 								var med_type string
 								if reg_type == 14 {
@@ -6452,7 +6453,7 @@ func (c *HisApiController) GetUploadInfo() {
 								} else if reg_type == 11 {
 									med_type = "11"
 								}
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, pack_num, good_pack_num)
 							}
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
@@ -7539,7 +7540,7 @@ func (c *HisApiController) GetUploadInfo() {
 //	}
 //}
 
-//上传明细-预结算-
+// 上传明细-预结算-
 func (c *HisApiController) GetPreUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -8745,7 +8746,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 //	}
 //}
 
-//退款
+// 退款
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -9450,7 +9451,7 @@ func (c *HisApiController) RefundDetail() {
 	}
 }
 
-//对账
+// 对账
 func (c *HisApiController) GetCheckAccount() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
@@ -9798,7 +9799,7 @@ func (c *HisApiController) Check390() {
 
 }
 
-//对账明细
+// 对账明细
 func (c *HisApiController) GetCheckDetailAccount() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
@@ -10126,25 +10127,22 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		}
 
-		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId == 9504  { //手术费
-				fmt.Println("------------")
+		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId == 9504 { //手术费
+			fmt.Println("------------")
 
 			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
-
 		}
-		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId != 9504  { //手术费
+		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId != 9504 { //手术费
 			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 		}
 
-
-
-		if item.MedChrgitmType == "08"  || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403"{ //材料费
+		if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //材料费
 			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
@@ -12135,7 +12133,7 @@ func PathExists(path string) (bool, error) {
 	return false, err
 }
 
-//创建文件夹
+// 创建文件夹
 func Mkdir(dir string) {
 	// 创建文件夹
 	exist, err := PathExists(dir)
@@ -12156,7 +12154,7 @@ func Mkdir(dir string) {
 	}
 }
 
-//压缩文件
+// 压缩文件
 func Zip(srcFile string, destZip string) error {
 	zipfile, err := os.Create(destZip)
 	if err != nil {

controllers/hb/hbyb_controller.go

@@ -3,9 +3,8 @@ package hb
 import (
 	"encoding/json"
 	"fmt"
-	"time"
 	"os"
-
+	"time"
 
 	"gdyb/controllers"
 	"gdyb/models"
@@ -13,7 +12,6 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"io/ioutil"
-
 )
 
 type HBybController struct {
@@ -38,14 +36,12 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/3202b", &HBybController{}, "post:Post3202b")
 	//beego.Router("/hbyb/3202c", &HBybController{}, "post:Post3202")
 
-
 	beego.Router("/hbyb/4101", &HBybController{}, "post:Post4101")
 
 	beego.Router("/hbyb/5262", &HBybController{}, "post:Post5262")
 	beego.Router("/hbyb/5267", &HBybController{}, "post:Post5267")
 	beego.Router("/hbyb/5301", &HBybController{}, "get:Post5301")
 
-
 	beego.Router("/hbyb/2401", &HBybController{}, "post:Post2401")
 	beego.Router("/hbyb/2402", &HBybController{}, "post:Post2402")
 	beego.Router("/hbyb/2404", &HBybController{}, "get:Post2404")
@@ -56,18 +52,12 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/2304", &HBybController{}, "get:Post2304")
 	beego.Router("/hbyb/2305", &HBybController{}, "get:Post2305")
 
-
 	beego.Router("/hbyb/3204", &HBybController{}, "post:Post3204")
 	beego.Router("/hbyb/8404", &HBybController{}, "post:Post8404")
 	beego.Router("/hbyb/3204a", &HBybController{}, "post:Post3204a")
 
-
-
-
 }
 
-
-
 func (c *HBybController) Post2401() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -364,7 +354,7 @@ func (c *HBybController) Post2305() {
 	})
 }
 
-func (c *HBybController)Post5301(){
+func (c *HBybController) Post5301() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
@@ -372,7 +362,7 @@ func (c *HBybController)Post5301(){
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	psn_no := c.GetString("psn_no")
-	result := service.Hbyb5301(psn_no,"",org_name, doctor,fixmedins_code,"",insuplc_admdvs,mdtrtarea_admvs,secret_key,"","")
+	result := service.Hbyb5301(psn_no, "", org_name, doctor, fixmedins_code, "", insuplc_admdvs, mdtrtarea_admvs, secret_key, "", "")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -384,7 +374,7 @@ func (c *HBybController)Post5301(){
 	})
 
 }
-func (c *HBybController)Post5262(){
+func (c *HBybController) Post5262() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -407,8 +397,7 @@ func (c *HBybController)Post5262(){
 	page := respJSON["page"].(string)
 	limit := respJSON["limit"].(string)
 
-
-	result := service.Hbyb5262(baseParams, bps,page,limit)
+	result := service.Hbyb5262(baseParams, bps, page, limit)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -419,9 +408,8 @@ func (c *HBybController)Post5262(){
 		"pre": dat,
 	})
 
-
 }
-func (c *HBybController)Post5267(){
+func (c *HBybController) Post5267() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
@@ -444,7 +432,7 @@ func (c *HBybController)Post5267(){
 	page := respJSON["page"].(string)
 	limit := respJSON["limit"].(string)
 
-	result := service.Hbyb5267(baseParams, bps,page,limit)
+	result := service.Hbyb5267(baseParams, bps, page, limit)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -457,7 +445,6 @@ func (c *HBybController)Post5267(){
 
 }
 
-
 func (c *HBybController) Post3202a() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -492,7 +479,6 @@ func (c *HBybController) Post3202a() {
 	})
 }
 
-
 func (c *HBybController) Post3204a() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -527,7 +513,6 @@ func (c *HBybController) Post3204a() {
 	})
 }
 
-
 func (c *HBybController) Post3204() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -553,7 +538,6 @@ func (c *HBybController) Post3204() {
 	})
 }
 
-
 func (c *HBybController) Post8404() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -567,7 +551,7 @@ func (c *HBybController) Post8404() {
 	baseParams.OrgName = respJSON["org_name"].(string)
 	baseParams.Doctor = respJSON["doctor"].(string)
 	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
-	result := service.Hbyb8404(baseParams,respJSON["month"].(string))
+	result := service.Hbyb8404(baseParams, respJSON["month"].(string))
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -579,8 +563,6 @@ func (c *HBybController) Post8404() {
 	})
 }
 
-
-
 func (c *HBybController) Post1608() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -590,14 +572,12 @@ func (c *HBybController) Post1608() {
 		return
 	}
 
-
 	var baseParams models.BaseParams
 	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
 	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
 	baseParams.OrgName = respJSON["org_name"].(string)
 	baseParams.Doctor = respJSON["doctor"].(string)
 
-
 	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
 	cnt := respJSON["cnt"].(string)
 	medfee_sumamt := respJSON["medfee_sumamt"].(string)
@@ -606,7 +586,7 @@ func (c *HBybController) Post1608() {
 	start_time := respJSON["start_time"].(string)
 	end_time := respJSON["end_time"].(string)
 
-	result := service.Hbyb1608(baseParams,cnt,medfee_sumamt,start_time,end_time,func_smamt)
+	result := service.Hbyb1608(baseParams, cnt, medfee_sumamt, start_time, end_time, func_smamt)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -618,9 +598,6 @@ func (c *HBybController) Post1608() {
 	})
 }
 
-
-
-
 func (c *HBybController) Post3202b() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -655,7 +632,6 @@ func (c *HBybController) Post3202b() {
 	})
 }
 
-
 func (c *HBybController) Post4101() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -1019,7 +995,10 @@ func (c *HBybController) PostEight() {
 
 	acct_used_flag, _ := c.GetInt64("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)
+	pack_num := c.GetString("pack_num")
+	good_pack_num := c.GetString("good_pack_num")
+
+	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, pack_num, good_pack_num)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1089,11 +1068,11 @@ func (c *HBybController) PostTen() {
 		SetlId:  setlId,
 	}
 	var result string
-	if mdtrtarea_admvs == "421182" || mdtrtarea_admvs == "420902"{
+	if mdtrtarea_admvs == "421182" || mdtrtarea_admvs == "420902" {
 
-		result = service.Hbyb5203(baseParams, businessParams,med_type)
+		result = service.Hbyb5203(baseParams, businessParams, med_type)
 
-	}else{
+	} else {
 
 		result = service.Hbyb5203aa(baseParams, businessParams)
 
@@ -1110,7 +1089,6 @@ func (c *HBybController) PostTen() {
 	})
 }
 
-
 func saveJsLog(result string, request string, infno string, desc string, org_name string) {
 
 	//org_id, _ := beego.AppConfig.Int64("org_id")
@@ -1152,6 +1130,3 @@ func saveJsLog(result string, request string, infno string, desc string, org_nam
 	}
 
 }
-
-
-

controllers/js/jsyb_controller.go

@@ -1506,7 +1506,7 @@ func (c *JSybController) PostFour() {
 
 	//cainfo := c.GetString("cainfo")
 
-	result, request_log, timeStamp := 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, begin_time, cainfo,new_doctor_name)
+	result, request_log, timeStamp := 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, begin_time, cainfo, new_doctor_name)
 	saveJsLog(result, request_log, "2203", "上传就诊信息", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
@@ -1709,7 +1709,8 @@ func (c *JSybController) PostEight() {
 	verify_number := c.GetString("verify_number")
 	cainfo := c.GetString("cainfo")
 	mdtrt_grp_type := c.GetString("mdtrt_grp_type")
-
+	pack_num := c.GetString("pack_num")
+	good_pack_num := c.GetString("good_pack_num")
 	var result string
 	var request_log string
 	if id_card_type == 4 {
@@ -1722,10 +1723,10 @@ func (c *JSybController) PostEight() {
 		//}
 		//token := ele.Data.EcCardToken
 		//if len(token) > 0 {
-		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, verify_number, cainfo, mdtrt_grp_type)
+		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, verify_number, cainfo, mdtrt_grp_type, pack_num, good_pack_num)
 		//}
 	} else {
-		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, verify_number, cainfo, mdtrt_grp_type)
+		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, verify_number, cainfo, mdtrt_grp_type, pack_num, good_pack_num)
 
 	}
 
@@ -2179,7 +2180,7 @@ func (c *JSybController) Readcardchargeother() {
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 	switch id_card_type {
 	case "1":
-		if mdtrtarea_admvs == "320830"{
+		if mdtrtarea_admvs == "320830" {
 			pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
 			pBusiCardInfo = Remove0000(pBusiCardInfo)
 
@@ -2216,7 +2217,7 @@ func (c *JSybController) Readcardchargeother() {
 
 			}
 
-		}else{
+		} else {
 			pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
 			pBusiCardInfo = Remove0000(pBusiCardInfo)
 			pCardInfo = Remove0000(pCardInfo)
@@ -2253,7 +2254,6 @@ func (c *JSybController) Readcardchargeother() {
 
 			}
 
-
 		}
 
 		break
@@ -2359,7 +2359,7 @@ func (c *JSybController) ReadCard() {
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 	switch id_card_type {
 	case "1":
-		if mdtrtarea_admvs == "320830"{
+		if mdtrtarea_admvs == "320830" {
 			pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
 			pBusiCardInfo = Remove0000(pBusiCardInfo)
 
@@ -2396,8 +2396,7 @@ func (c *JSybController) ReadCard() {
 
 			}
 
-
-		}else{
+		} else {
 			pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
 			pBusiCardInfo = Remove0000(pBusiCardInfo)
 			pCardInfo = Remove0000(pCardInfo)
@@ -2434,7 +2433,6 @@ func (c *JSybController) ReadCard() {
 
 			}
 
-
 		}
 
 		break
@@ -2476,7 +2474,7 @@ func (c *JSybController) ReadCard() {
 	case "4": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		_, pBusiCardInfo :=GetELeCertInfoSettle(fixmedins_code, operator_id, operator)
+		_, pBusiCardInfo := GetELeCertInfoSettle(fixmedins_code, operator_id, operator)
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
 		var ele ELeCertData
@@ -2518,8 +2516,7 @@ func (c *JSybController) ReadCard() {
 	case "5": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		_, pBusiCardInfo := c.GetELeCertInfoByFaceTwoOne(fixmedins_code, operator_id, operator,"01101")
-
+		_, pBusiCardInfo := c.GetELeCertInfoByFaceTwoOne(fixmedins_code, operator_id, operator, "01101")
 
 		//_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator, "01101")
 		fmt.Println(pBusiCardInfo)
@@ -2579,11 +2576,11 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	str := make([]byte, 2048)
 	inputData := make(map[string]interface{})
 
-	if code == "H32083002114"{
+	if code == "H32083002114" {
 		inputData["IP"] = "10.58.73.212"
 		inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 
-	}else{
+	} else {
 		inputData["IP"] = "10.58.65.240"
 		inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 	}
@@ -2836,8 +2833,7 @@ func (c *JSybController) GetELeCertInfoFour2223(code string, operator_id string,
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
-
-func (c *JSybController) GetELeCertInfoByFaceTwoOne(code string, operator_id string, operator_name string,businessType string) (string, string) {
+func (c *JSybController) GetELeCertInfoByFaceTwoOne(code string, operator_id string, operator_name string, businessType string) (string, string) {
 	DllDef := syscall.MustLoadDLL("NationEcCode.dll")
 	readCard := DllDef.MustFindProc("NationEcTrans")
 
@@ -2918,7 +2914,7 @@ func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, o
 
 	return "", string(receivedMessage)
 }
-func (c *JSybController) GetELeCertInfoByFaceTwoTwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string)(string, string) {
+func (c *JSybController) GetELeCertInfoByFaceTwoTwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string) (string, string) {
 	DllDef := syscall.MustLoadDLL("NationEcCode.dll")
 	readCard := DllDef.MustFindProc("NationEcTrans")
 
@@ -2950,8 +2946,6 @@ func (c *JSybController) GetELeCertInfoByFaceTwoTwo(code string, operator_id str
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
-
-
 func GetELeCertInfoByFacetwo(code string, operator_id string, operator_name string, authNo string, outBizNo string, businessType string) (string, string) {
 	//	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"

controllers/nm/nm_controller.go

@@ -88,6 +88,7 @@ func NmybRegistRouters() {
 	//beego.Router("/nmyb/008", &NmController{}, "get:Post008")
 
 }
+
 //func (c *NmController) Post001() {
 //	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 //	var respJSON map[string]interface{}
@@ -1108,10 +1109,13 @@ func (c *NmController) Post2207() {
 	cainfo := c.GetString("cainfo")
 	mdtrt_grp_type := c.GetString("mdtrt_grp_type")
 
+	pack_num := c.GetString("pack_num")
+	good_pack_num := c.GetString("good_pack_num")
+
 	var result string
 	var request_log string
 
-	result, request_log = service.Nmyb2207(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, verify_number, cainfo, mdtrt_grp_type)
+	result, request_log = service.Nmyb2207(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, verify_number, cainfo, mdtrt_grp_type, pack_num, good_pack_num)
 
 	saveJsLog(result, request_log, "2207", "结算", org_name)
 	var dat map[string]interface{}

controllers/sg/gdyb_controller.go

@@ -32,8 +32,6 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/4101", &GdybController{}, "post:Post4101")
 	beego.Router("/gdyb/5301", &GdybController{}, "get:Post5301")
 
-
-
 }
 func (c *GdybController) Post5301() {
 	psnNo := c.GetString("psn_no")
@@ -44,7 +42,7 @@ func (c *GdybController) Post5301() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb5301(psnNo,org_name,doctor,fixmedins_code,insuplc_admdvs,mdtrtarea_admvs,secret_key,0)
+	result := service.Gdyb5301(psnNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 0)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -78,7 +76,7 @@ func (c *GdybController) Post4101() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result, _ := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0,0)
+	result, _ := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0, 0)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -93,7 +91,6 @@ func (c *GdybController) Post4101() {
 	})
 }
 
-
 type Result struct {
 	ErrMsg      interface{} `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
@@ -178,9 +175,9 @@ func (c *GdybController) PostTwo() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	id_card_type, _ := c.GetInt64("id_card_type")
-	record_time  := c.GetString("record_time")
+	record_time := c.GetString("record_time")
 
-	result, inputLog := service.Gdyb2201A(psnNo, insutype, certNo, org_name, operator, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, record_time, verify_number,0)
+	result, inputLog := service.Gdyb2201A(psnNo, insutype, certNo, org_name, operator, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, record_time, verify_number, 0)
 	saveLogq(result, inputLog, "2201", "退号")
 
 	var dat map[string]interface{}
@@ -190,7 +187,6 @@ func (c *GdybController) PostTwo() {
 
 	}
 
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": dat,
 	})
@@ -206,9 +202,9 @@ func (c *GdybController) PostThree() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
-	admin_user_id,_ := c.GetInt64("admin_user_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 
-	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code,admin_user_id)
+	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, admin_user_id)
 	saveLogq(result, requestLog, "2202", "退号")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -255,11 +251,7 @@ func (c *GdybController) PostFour() {
 
 	new_doctor_name := respJSON["new_doctor_name"].(string)
 
-
-
-
-
-	result, request_log := service.Gdyb2203c(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time,new_doctor_name)
+	result, request_log := service.Gdyb2203c(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time, new_doctor_name)
 	saveLogq(result, request_log, "2203", "上传就诊信息")
 
 	var dat map[string]interface{}
@@ -269,8 +261,7 @@ func (c *GdybController) PostFour() {
 
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-
+		"pre": dat,
 	})
 }
 
@@ -339,8 +330,7 @@ func (c *GdybController) PostFive() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":         dat,
-
+		"pre": dat,
 	})
 }
 
@@ -359,8 +349,7 @@ func (c *GdybController) PostSix() {
 	//fixmedins_code := c.Get("fixmedins_code")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
-
-	result, requestlog := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code,admin_user_id)
+	result, requestlog := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, admin_user_id)
 	saveLogq(result, requestlog, "2205", "上传就诊信息")
 
 	var dat map[string]interface{}
@@ -391,7 +380,7 @@ func (c *GdybController) PostSeven() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 
 	certificates, _ := c.GetInt64("certificates")
-	result, log := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates,0,"0")
+	result, log := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, 0, "0")
 	saveLogq(result, log, "2206", "预结算")
 
 	var dat map[string]interface{}
@@ -428,7 +417,10 @@ func (c *GdybController) PostEight() {
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, acct_used_flag, verify_number,0)
+	pack_num, _ := c.GetInt64("pack_num")
+	good_pack_num, _ := c.GetInt64("good_pack_num")
+
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, acct_used_flag, verify_number, 0, pack_num, good_pack_num)
 	saveLogq(result, srcRequest, "2207", "结算")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -438,7 +430,7 @@ func (c *GdybController) PostEight() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":  dat,
+		"pre": dat,
 	})
 }
 
@@ -452,7 +444,7 @@ func (c *GdybController) PostNine() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	result, srcRequest := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, operator, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,0)
+	result, srcRequest := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, operator, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, 0)
 	saveLogq(result, srcRequest, "2208", "退费")
 
 	var dat map[string]interface{}
@@ -463,7 +455,7 @@ func (c *GdybController) PostNine() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre":  dat,
+		"pre": dat,
 	})
 }
 
@@ -486,8 +478,6 @@ func (c *GdybController) PostTen() {
 	//doctor := c.Get("doctor")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
-
-
 	fmt.Println(insutype)
 	fmt.Println(clrType)
 	fmt.Println(setlOptins)
@@ -517,7 +507,7 @@ func (c *GdybController) PostTen() {
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
 
-	result := service.Gdyb3201(baseParams, businessParams,admin_user_id)
+	result := service.Gdyb3201(baseParams, businessParams, admin_user_id)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -34,7 +34,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
 )
 
 type HisApiController struct {
@@ -28918,11 +28917,9 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_ways := c.GetString("pay_ways")
 	oth_desc := c.GetString("oth_desc")
 
-
 	pack_num, _ := c.GetInt64("pack_num")
 	good_pack_num, _ := c.GetInt64("good_pack_num")
 
-
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 
@@ -30271,7 +30268,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30331,7 +30328,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30391,7 +30388,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30451,7 +30448,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30538,7 +30535,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 									} else if miConfig.MdtrtareaAdmvs == "320921" {
 										api = "http://192.168.2.3:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -30546,7 +30543,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 									} else {
 										api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -30554,7 +30551,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType+ "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 									}
 
@@ -30617,7 +30614,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number + "&pack_num=" + strconv.FormatInt(pack_num, 10)+ "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -30659,12 +30656,12 @@ func (c *HisApiController) GetUploadInfo() {
 							if his.IdCardType == 4 {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								cert_no = psn_info.VerifyNumber
-								result2, src_resquest, _ = service.FJyb2207ForToken(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey,tempOrder.PackNum,tempOrder.GoodPackNum)
+								result2, src_resquest, _ = service.FJyb2207ForToken(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 							} else if his.IdCardType == 1 {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								cert_no = strings.Split(psn_info.CardInfo, "|")[0]
-								result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey,tempOrder.PackNum,tempOrder.GoodPackNum)
+								result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, tempOrder.PackNum, tempOrder.GoodPackNum)
 							}
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
@@ -30801,13 +30798,13 @@ func (c *HisApiController) GetUploadInfo() {
 								if res2.Output.MdtrtCertType == "01" {
 									//psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 									token := res2.Output.EcToken
-									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 4, acct_used_flag, token, admin_user_id)
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 4, acct_used_flag, token, admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 								} else if res2.Output.MdtrtCertType == "02" {
-									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 2, acct_used_flag, "", admin_user_id)
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 2, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 								} else {
-									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 1, acct_used_flag, "", admin_user_id)
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 1, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 								}
 
 								var dat2 map[string]interface{}
@@ -30852,13 +30849,13 @@ func (c *HisApiController) GetUploadInfo() {
 										med_type = "11"
 									}
 								}
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 							} else {
 								if his.IdCardType == 4 {
 									psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 									var token string
 									token = psn_info.VerifyNumber
-									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token, admin_user_id)
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token, admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 								} else {
 									if his.IdCardType == 1 {
@@ -30868,7 +30865,7 @@ func (c *HisApiController) GetUploadInfo() {
 										cert_no = basNumber
 
 									}
-									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
+									result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 								}
 
@@ -31325,12 +31322,12 @@ func (c *HisApiController) GetUploadInfo() {
 					if res2.Output.MdtrtCertType == "01" {
 						//psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						token := res2.Output.EcToken
-						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 4, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 4, acct_used_flag, token, admin_user_id)
+						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 4, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 4, acct_used_flag, token, admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 					} else if res2.Output.MdtrtCertType == "02" {
-						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 2, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 2, acct_used_flag, "", admin_user_id)
+						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 2, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 2, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 
 					} else {
-						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 1, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 1, acct_used_flag, res2.Output.CardNo, admin_user_id)
+						result2, src_resquest = service.Gxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), 1, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, 1, acct_used_flag, res2.Output.CardNo, admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 					}
 
 					var dat2 map[string]interface{}
@@ -31363,7 +31360,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -31405,7 +31402,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -31447,7 +31444,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -31489,7 +31486,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -31578,7 +31575,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 
@@ -31589,7 +31586,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 							//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 
@@ -31601,7 +31598,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 						}
 
@@ -31673,7 +31670,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(psn_info.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&verify_number=" + verify_number + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -31762,7 +31759,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 
-				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName)
+				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName, tempOrder.PackNum, tempOrder.GoodPackNum)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -31802,7 +31799,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 
-				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName)
+				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName, tempOrder.PackNum, tempOrder.GoodPackNum)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -31842,7 +31839,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 				}
 
-				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName)
+				result2, src_resquest := service.Jxyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", card_sn, his.PsnCertType, his.Certno, psn_type, his.PsnName, tempOrder.PackNum, tempOrder.GoodPackNum)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -31925,7 +31922,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -32103,7 +32100,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + med_type + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -32226,7 +32223,7 @@ func (c *HisApiController) GetUploadInfo() {
 					cert_no = psn_info.VerifyNumber
 
 				}
-				result2, src_resquest := service.Hnyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "")
+				result2, src_resquest := service.Hnyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdCardType, acct_used_flag, miConfig.Url, miConfig.AccessKey, cert_no, "", tempOrder.PackNum, tempOrder.GoodPackNum)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -32262,7 +32259,7 @@ func (c *HisApiController) GetUploadInfo() {
 					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(psn_info.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&verify_number=" + verify_number
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&verify_number=" + verify_number + "&pack_num=" + strconv.FormatInt(pack_num, 10) + "&good_pack_num=" + strconv.FormatInt(good_pack_num, 10)
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -32313,7 +32310,7 @@ func (c *HisApiController) GetUploadInfo() {
 							med_type = "11"
 						}
 					}
-					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
+					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 				} else {
 					if miConfig.Code == "H44030501364" || miConfig.Code == "H44030903432" || miConfig.Code == "H44030500255" || miConfig.Code == "H44082500483" || miConfig.Code == "H44030702287" || miConfig.Code == "H44030304882" || miConfig.Code == "H44090200998" {
 						result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "7", tempOrder.ID)
@@ -32339,9 +32336,9 @@ func (c *HisApiController) GetUploadInfo() {
 					if his.IdCardType == 4 {
 						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						token := psn_info.VerifyNumber
-						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token, admin_user_id)
+						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, token, admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 					} else {
-						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id)
+						result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, his.Insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, "", admin_user_id, tempOrder.PackNum, tempOrder.GoodPackNum)
 					}
 				}
 
@@ -34420,8 +34417,34 @@ func (c *HisApiController) GetPreUploadInfo() {
 				})
 				return
 			}
-
+			var pack_sum int64
+			var good_pack_sum int64
 			if res.Infcode == 0 {
+				for _, item := range prescriptions {
+					if item.Type == 1 { //药品
+						for _, subitem := range item.HisDoctorAdviceInfo {
+							if subitem.PrescribingNumberUnit != subitem.BaseDrugLib.MinUnit { //非拆零
+								pack_sum = pack_sum + int64(subitem.PrescribingNumber)
+							} else { //拆零
+								quotient := int64(subitem.PrescribingNumber) / subitem.BaseDrugLib.MinNumber
+								if quotient >= 1 {
+									integerValue := int64(quotient)
+									pack_sum = pack_sum + integerValue
+								}
+							}
+						}
+					}
+					if item.Type == 2 {
+						for _, subitem := range item.HisPrescriptionProject {
+							if subitem.Type == 3 { //耗材
+								num, _ := strconv.Atoi(subitem.Count)
+								good_pack_sum = good_pack_sum + int64(num)
+							}
+						}
+					}
+
+				}
+
 				order := &models.HisOrder{
 					UserOrgId:           adminUser.CurrentOrgId,
 					HisPatientId:        his.ID,
@@ -34449,6 +34472,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 					Modify:              roles.AdminUserId,
 					PType:               2,
 					Diagnosis:           diagnosis_id,
+					PackNum:             pack_sum,
+					GoodPackNum:         good_pack_sum,
 				}
 
 				err = service.CreateOrder(order)
@@ -36512,6 +36537,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 				}
 			} else {
 				if miConfig.MdtrtareaAdmvs == "150404" {
+
 					order := &models.HisOrder{
 						UserOrgId:           adminUser.CurrentOrgId,
 						HisPatientId:        his.ID,

service/ahyb_service.go

@@ -1221,7 +1221,7 @@ func AHyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 }
 
 // 门诊结算
-func AHyb2207(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string, mdtrt_grp_type string) (string, string) {
+func AHyb2207(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string, mdtrt_grp_type string, pack_num string, good_pack_num string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -1265,6 +1265,9 @@ func AHyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
+
 	inputData["fulamt_ownpay_amt"] = 0 //
 	inputData["overlmt_selfpay"] = 0   //
 	inputData["preselfpay_amt"] = 0    //
@@ -1276,6 +1279,7 @@ func AHyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData2["otp_er_refl_flag"] = ""
 	inputData2["mdtrt_grp_type"] = ""
 	inputData2["need_ipt_flag"] = ""
+
 	inputData["exp_content"] = inputData2
 
 	input["data"] = inputData

service/fj_service.go

@@ -701,7 +701,7 @@ func FJyb2206ForToken(psnNo string, mdtrtId string, chrgBchno string, certNo str
 }
 
 // 门诊结算
-func FJyb2207(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, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+func FJyb2207(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, url string, app_id string, app_secret string, sign_key string, enc_key string, pack_num int64, good_pack_num int64) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -741,13 +741,15 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} 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["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["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
@@ -3025,7 +3027,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	//druginputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
-	inputMessage["infno"] = "3501"                                  // 交易编码
+	inputMessage["infno"] = "3501"                                      // 交易编码
 	inputData["med_list_codg"] = struct3501.MedListCodg                 // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId     // 定点医药机构目录编号
 	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName // 定点医药机构目录名称
@@ -3036,7 +3038,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno            // 人员编号 （来自1101接口返回）
 	inputData["manu_date"] = struct3501.ManuDate                        // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                          // 人员编号 （来自1101接口返回）
-	inputData["memo"] = ""                              // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                              // 人员编号 （来自1101接口返回）
 
 	feedetail := make([]map[string]interface{}, 0)
 
@@ -3045,7 +3047,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 		if len(item) > 0 {
 
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			druginputData["drug_trac_codg"] = removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}
@@ -3124,11 +3126,11 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	inputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
-	inputMessage["infno"] = "3505"                                  // 交易编码
-	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3505"                                      // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno            // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
 	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
@@ -3167,13 +3169,13 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3505.Memo
-	inputData["mdtrt_setl_type"] = struct3505.MdtrtSetlType                            // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_setl_type"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 	feedetail := make([]map[string]interface{}, 0)
 	codes := strings.Split(struct3505.DrugTracCodg, ",")
 	for _, item := range codes {
 		if len(item) > 0 {
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			druginputData["drug_trac_codg"] = removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}
@@ -3208,11 +3210,11 @@ func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	inputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
-	inputMessage["infno"] = "3506"                                  // 交易编码
-	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3506"                                      // 交易编码
+	inputData["med_list_codg"] = struct3506.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno            // 人员编号 （来自1101接口返回）
 
 	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
 	inputData["psn_no"] = struct3506.PsnNo                         // 人员编号 （来自1101接口返回）
@@ -3237,7 +3239,7 @@ func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	for _, item := range codes {
 		if len(item) > 0 {
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			druginputData["drug_trac_codg"] = removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}

service/gdyb_service.go

@@ -1705,7 +1705,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 // 门诊结算
-func Gdyb2207(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, token string, admin_user_id int64) (string, string) {
+func Gdyb2207(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, token string, admin_user_id int64, pack_num int64, good_pack_num int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1755,6 +1755,9 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
+
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //

service/gxyb_service.go

@@ -7,21 +7,19 @@ import (
 	//"strings"
 	//"gdyb/utils"
 
-
-	"time"
-	"fmt"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
+	"io/ioutil"
 	"net/http"
 	"strconv"
-	"io/ioutil"
+	"time"
 
 	"bytes"
-	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 
-func Gxyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, admin_user_id int64,setlId string,mdtrtId string,psn_no string,medinsSetlId string){
+func Gxyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, admin_user_id int64, setlId string, mdtrtId string, psn_no string, medinsSetlId string) {
 
 	ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
 	defer ole.CoUninitialize()
@@ -46,7 +44,7 @@ func Gxyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	inputMessage := make(map[string]interface{})
-	inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "P0001" // 交易编码
@@ -65,14 +63,12 @@ func Gxyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	//data := fmt.Sprintf(`{"transNo":"%s","transType":"%s","timestamp":"%s","data":{"fixmedinsCode":"%s","psnNo":"%s"}}`, transNo, transType, timestamp, fixmedinsCode, psnNo)
 	result2 := ""
 	// Call COM object's method using the IDispatch interface
-	resulr, err := oleutil.CallMethod(dispatch, "gxyb_call", "P0001", string(jsonData),&result2)
+	resulr, err := oleutil.CallMethod(dispatch, "gxyb_call", "P0001", string(jsonData), &result2)
 	fmt.Println(resulr)
 
-
 }
 
-
-func Gxyb5302(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string,admin_user_id int64) string {
+func Gxyb5302(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	//timestamp := time.Now().Unix()
@@ -80,7 +76,7 @@ func Gxyb5302(psnNo string, org_name string, doctor string, fixmedins_code strin
 
 	signature := setSignature(timestamp, nonce, secret_key)
 
-	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, doctor)
 
 	// 生成输入报文
 	//inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
@@ -132,8 +128,7 @@ func Gxyb5302(psnNo string, org_name string, doctor string, fixmedins_code strin
 	return str
 }
 
-
-func Gxyb2207(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, token string,admin_user_id int64) (string, string) {
+func Gxyb2207(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, token string, admin_user_id int64, pack_num int64, good_pack_num int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -142,9 +137,9 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	// 生成输入报文
 	inputMessage := make(map[string]interface{})
 
-	if  mdtrtarea_admvs == "450721"  ||  mdtrtarea_admvs == "450127"{
+	if mdtrtarea_admvs == "450721" || mdtrtarea_admvs == "450127" {
 
-		inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+		inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, doctor)
 	} else {
 		inputMessage = SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	}
@@ -159,7 +154,7 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} else {
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+			inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
 		} else if id_card_type == 4 {
 			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
@@ -181,13 +176,15 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} 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["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["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
@@ -211,7 +208,7 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	//url := gdyb_url + "2207"
 
 	var url string
-	if fixmedins_code == "H15049901371" || mdtrtarea_admvs == "450127" ||  mdtrtarea_admvs == "450721" {
+	if fixmedins_code == "H15049901371" || mdtrtarea_admvs == "450127" || mdtrtarea_admvs == "450721" {
 		url = gdyb_url
 	} else {
 		url = gdyb_url + "2207"
@@ -222,65 +219,64 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
 
-		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)
 
-		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)
-		mjson, _ := json.Marshal(inputMessage)
-		str2 := string(mjson)
+	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)
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
 
-		return str, str2
+	return str, str2
 
 }
 
-func Gxyb2503( org_name string, doctor string, fixmedins_code string,insuplc_admdvs string, mdtrtarea_admvs string, secret_key string,admin_user_id int64) string {
+func Gxyb2503(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, admin_user_id int64) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, doctor)
 
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2503"                  // 交易编码
-	inputData["psn_no"] = "45000000000008100150404986"                     // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = "390"                // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_code"] = "M03900"         // 险种类型（来自1101接口返回）
-	inputData["opsp_dise_name"] = "高血压（高危组）"         // 险种类型（来自1101接口返回）
-	inputData["insu_optins"] = "450721"       // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_no"] = "H45072101171"   // 险种类型（来自1101接口返回）
-	inputData["ide_fixmedins_name"] = "灵山盛康血液透析中心" // 险种类型（来自1101接口返回）
-	inputData["hosp_ide_date"] = "2024-02-01"         // 险种类型（来自1101接口返回）
-	inputData["diag_dr_codg"] = "D450721000406"           // 开始时间
-	inputData["diag_dr_name"] = "韦秋萍"              // 开始时间
-	inputData["begndate"] = "2024-02-01"              // 医师编码
-	inputData["tel"] = ""                           // 医师编码
-	inputData["addr"] = ""                          // 医师编码
-	inputData["enddate"] = "2026-01-30"                 // 医师编码
+	inputMessage["infno"] = "2503"                     // 交易编码
+	inputData["psn_no"] = "45000000000008100150404986" // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = "390"                      // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = "M03900"             // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = "高血压（高危组）"           // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = "450721"                // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = "H45072101171"     // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = "灵山盛康血液透析中心"     // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = "2024-02-01"          // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = "D450721000406"        // 开始时间
+	inputData["diag_dr_name"] = "韦秋萍"                  // 开始时间
+	inputData["begndate"] = "2024-02-01"               // 医师编码
+	inputData["tel"] = ""                              // 医师编码
+	inputData["addr"] = ""                             // 医师编码
+	inputData["enddate"] = "2026-01-30"                // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/hb_service.go

@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-//机构信息
+// 机构信息
 func HeBeiyb1201(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) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -773,7 +773,7 @@ func HeBeiyb2203A(psnNo string, mdtrtId string, doctor string, department string
 
 }
 
-//  门诊费用明细信息上传
+// 门诊费用明细信息上传
 func HeBeiyb2204(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, new_doctor_id int64, diag_code string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1008,7 +1008,7 @@ func HeBeiyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPres
 	//return &result
 }
 
-//  门诊费用明细信息撤销
+// 门诊费用明细信息撤销
 func HeBeiyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1099,8 +1099,9 @@ func HeBeiyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string
 
 }
 
-//  门诊预结算
-//func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
+//	门诊预结算
+//
+// func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
 func HeBeiyb2206(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) (string, string) {
 
 	// 生成签名
@@ -1222,8 +1223,8 @@ func HeBeiyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 
 }
 
-//  门诊结算
-func HeBeiyb2207(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, token string) (string, string) {
+// 门诊结算
+func HeBeiyb2207(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, token string, pack_num string, good_pack_num string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1263,13 +1264,15 @@ func HeBeiyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 	} 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["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["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
@@ -1477,7 +1480,7 @@ func HeBeiyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 
 }
 
-//  门诊结算撤销
+// 门诊结算撤销
 func HeBeiyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1568,7 +1571,7 @@ func HeBeiyb2208(psnNo string, mdtrtId string, setlId string, org_name string, d
 
 }
 
-//确认订单
+// 确认订单
 func HeBeiyb6201(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, order models.HisOrder) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1657,7 +1660,7 @@ func HeBeiyb6201(org_name string, doctor string, fixmedins_code string, insuplc_
 	return str
 }
 
-//  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+// 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 func HeBeiyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) string {
 	fmt.Println("11222333-----")
 
@@ -1735,7 +1738,7 @@ func HeBeiyb3201(baseParams models.BaseParams, businessParams models.BusinessPar
 	return str
 }
 
-//文件上传
+// 文件上传
 func HeBeiyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 
 	// 生成签名
@@ -2720,7 +2723,6 @@ func HeBeiyb5301Two(psnNo string, org_name string, doctor string, fixmedins_code
 	return str
 }
 
-//
 func HeBeiyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_id int64) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -3008,7 +3010,7 @@ func HeBeiyb2601(psnNo string, omsgid string, oinfno string, org_name string, do
 	return str
 }
 
-//人员信息版本3
+// 人员信息版本3
 func HeBeiyb1101B(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 int64) string {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -3331,7 +3333,7 @@ func HeBeiyb6101(org_name string, doctor string, fixmedins_code string, insuplc_
 
 }
 
-//人员信息版本4
+// 人员信息版本4
 func HeBeiyb1101C(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 int64) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -3573,111 +3575,111 @@ func HeBeiyb3260(org_name string, doctor string, fixmedins_code string, insuplc_
 
 }
 
-//func HeBeiyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string, string) {
-//	//生成签名
-//	nonce := GetRandomString(32)
-//	timestamp := time.Now().Unix()
-//	signature := setSignature(timestamp, nonce, secret_key)
-//
-//	msg_month := time.Unix(1557042972, 0).Format("1")
-//	msg_year := time.Now().Format("2006")
-//	msg_month = time.Now().Format("01")
-//	day := time.Now().Format("02")
+//	func HeBeiyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string, string) {
+//		//生成签名
+//		nonce := GetRandomString(32)
+//		timestamp := time.Now().Unix()
+//		signature := setSignature(timestamp, nonce, secret_key)
 //
-//	hour := time.Now().Format("15")
-//	min := time.Now().Format("04")
-//	sec := time.Now().Format("05")
+//		msg_month := time.Unix(1557042972, 0).Format("1")
+//		msg_year := time.Now().Format("2006")
+//		msg_month = time.Now().Format("01")
+//		day := time.Now().Format("02")
 //
-//	msec := time.Now().Format("000")
+//		hour := time.Now().Format("15")
+//		min := time.Now().Format("04")
+//		sec := time.Now().Format("05")
 //
-//	msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
+//		msec := time.Now().Format("000")
 //
-//	//生成输入报文
-//	inputMessage := SetInputMessageThree(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, msg_id)
-//	input := make(map[string]interface{})
-//	inputData := make(map[string]interface{})
-//	inputMessage["infno"] = "3261"                      // 交易编码
-//	inputData["trt_year"] = year                        // 就诊凭证编号
-//	inputData["trt_month"] = month                      // 开始时间
-//	inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
+//		msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
 //
-//	feedetail := make([]map[string]interface{}, 0)
+//		//生成输入报文
+//		inputMessage := SetInputMessageThree(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, msg_id)
+//		input := make(map[string]interface{})
+//		inputData := make(map[string]interface{})
+//		inputMessage["infno"] = "3261"                      // 交易编码
+//		inputData["trt_year"] = year                        // 就诊凭证编号
+//		inputData["trt_month"] = month                      // 开始时间
+//		inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
 //
-//	for _, item := range result3260.Output.Data {
-//		feedetailInfo := make(map[string]interface{})
-//		feedetailInfo["certno"] = item.Certno
-//		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
-//		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
-//		feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
-//		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
-//		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
-//		feedetail = append(feedetail, feedetailInfo)
-//	}
-//	inputData["detail"] = feedetail // 人员姓名
+//		feedetail := make([]map[string]interface{}, 0)
 //
-//	input["data"] = inputData
-//	inputMessage["input"] = input //交易输入
-//	var inputLog string
-//	bytesData, err := json.Marshal(inputMessage)
-//	inputLog = string(bytesData)
-//	fmt.Println(string(bytesData))
-//	if err != nil {
-//		fmt.Println(err.Error())
-//		return err.Error(), "", ""
-//	}
-//	reader := bytes.NewReader(bytesData)
-//	gdyb_url := beego.AppConfig.String("gdyb_url")
-//	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-//
-//	var url string
-//	if fixmedins_code == "H15049901371" {
-//		url = gdyb_url
-//	} else {
-//		url = gdyb_url + "3261"
-//	}
-//
-//	if insuplc_admdvs == "421300" {
-//		var json2 string
-//		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-//		out, err := cmd.Output()
-//		if err != nil {
-//			fmt.Println("error:", err.Error())
+//		for _, item := range result3260.Output.Data {
+//			feedetailInfo := make(map[string]interface{})
+//			feedetailInfo["certno"] = item.Certno
+//			feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+//			feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+//			feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
+//			feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+//			feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+//			feedetail = append(feedetail, feedetailInfo)
 //		}
-//		fmt.Println(string(out))
-//		return hex.EncodeToString(out), inputLog, ""
-//	} else {
+//		inputData["detail"] = feedetail // 人员姓名
 //
-//		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-//		request, err := http.NewRequest("POST", url, reader)
+//		input["data"] = inputData
+//		inputMessage["input"] = input //交易输入
+//		var inputLog string
+//		bytesData, err := json.Marshal(inputMessage)
+//		inputLog = string(bytesData)
+//		fmt.Println(string(bytesData))
 //		if err != nil {
 //			fmt.Println(err.Error())
 //			return err.Error(), "", ""
 //		}
+//		reader := bytes.NewReader(bytesData)
+//		gdyb_url := beego.AppConfig.String("gdyb_url")
+//		gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 //
-//		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(), "", ""
+//		var url string
+//		if fixmedins_code == "H15049901371" {
+//			url = gdyb_url
+//		} else {
+//			url = gdyb_url + "3261"
 //		}
-//		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, msg_id
 //
-//	}
+//		if insuplc_admdvs == "421300" {
+//			var json2 string
+//			cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+//			out, err := cmd.Output()
+//			if err != nil {
+//				fmt.Println("error:", err.Error())
+//			}
+//			fmt.Println(string(out))
+//			return hex.EncodeToString(out), inputLog, ""
+//		} else {
 //
-//}
+//			//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+//			request, err := http.NewRequest("POST", url, reader)
+//			if err != nil {
+//				fmt.Println(err.Error())
+//				return err.Error(), "", ""
+//			}
+//
+//			request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//			request.Header.Set("x-tif-paasid", gdyb_paasid)
+//			request.Header.Set("x-tif-signature", signature)
+//			request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//			request.Header.Set("x-tif-nonce", nonce)
+//
+//			client := http.Client{}
+//			resp, err := client.Do(request)
+//			if err != nil {
+//				fmt.Println(err.Error())
+//				return err.Error(), "", ""
+//			}
+//			respBytes, err := ioutil.ReadAll(resp.Body)
+//			if err != nil {
+//				fmt.Println(err.Error())
+//				return err.Error(), "", ""
+//			}
+//			fmt.Println(string(respBytes))
+//			str := string(respBytes)
+//			return str, inputLog, msg_id
+//
+//		}
+//
+// }
 func HeBeiyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)

service/hbyb_service.go

@@ -3,21 +3,19 @@ package service
 import (
 	"bytes"
 	"encoding/json"
+	"encoding/xml"
 	"fmt"
 	"gdyb/models"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"github.com/go-ole/go-ole/oleutil"
 	"io/ioutil"
 	"net/http"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
-	"encoding/xml"
-	"github.com/go-ole/go-ole/oleutil"
-	"github.com/go-ole/go-ole"
-	"regexp"
-
 )
 
 type Charset string
@@ -88,8 +86,7 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error(), ""
 	}
 
-
-	out := GetoleInfo("1101",string(bytesData))
+	out := GetoleInfo("1101", string(bytesData))
 	aa := ""
 	// Regular expression to find JSON part
 	re := regexp.MustCompile(`\{.*\}`)
@@ -170,7 +167,7 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	out := GetoleInfo("2201",string(bytesData))
+	out := GetoleInfo("2201", string(bytesData))
 
 	//var json2 string
 	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2201", string(bytesData), json2)
@@ -180,7 +177,6 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	//}
 	fmt.Println(string(out))
 
-
 	return string(out), requestLog
 
 }
@@ -212,7 +208,7 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	out := GetoleInfo("2202",string(bytesData))
+	out := GetoleInfo("2202", string(bytesData))
 
 	//var json2 string
 	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2202", string(bytesData), json2)
@@ -295,13 +291,13 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	//	fmt.Println("error:", err.Error())
 	//}
 	//fmt.Println(string(out))
-	out := GetoleInfo("2203",string(bytesData))
+	out := GetoleInfo("2203", string(bytesData))
 
 	return out, requestLog
 
 }
 
-//  门诊费用明细信息上传
+// 门诊费用明细信息上传
 func Hbyb2204(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, opter string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -474,14 +470,13 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//	fmt.Println("error:", err.Error())
 	//}
 	//fmt.Println(string(out))
-	out := GetoleInfo("2204",string(bytesData))
+	out := GetoleInfo("2204", string(bytesData))
 
 	return out, requestLog
 
-
 }
 
-//  门诊费用明细信息撤销
+// 门诊费用明细信息撤销
 func Hbyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -517,14 +512,15 @@ func Hbyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	//}
 	//fmt.Println(string(out))
 
-	out := GetoleInfo("2205",string(bytesData))
+	out := GetoleInfo("2205", string(bytesData))
 
 	return out, requestLog
 
 }
 
-//  门诊预结算
-//func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
+//	门诊预结算
+//
+// func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
 func Hbyb2206(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) (string, string) {
 
 	// 生成签名
@@ -593,14 +589,14 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	//	fmt.Println("error:", err.Error())
 	//}
 	//fmt.Println(string(out))
-	out := GetoleInfo("2206",string(bytesData))
+	out := GetoleInfo("2206", string(bytesData))
 
 	return out, requestLog
 
 }
 
-//  门诊结算
-func Hbyb2207(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 int64) (string, string) {
+// 门诊结算
+func Hbyb2207(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 int64, pack_num string, good_pack_num string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -635,19 +631,24 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} 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["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["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
 
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -667,14 +668,13 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	mjson, _ := json.Marshal(inputMessage)
 	str2 := string(mjson)
 
-	out := GetoleInfo("2207",string(bytesData))
-
+	out := GetoleInfo("2207", string(bytesData))
 
 	return out, str2
 
 }
 
-//  门诊结算撤销
+// 门诊结算撤销
 func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -709,7 +709,7 @@ func Hbyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	mjson, _ := json.Marshal(inputMessage)
 	str2 := string(mjson)
 	//fmt.Println(string(out))
-	out := GetoleInfo("2208",string(bytesData))
+	out := GetoleInfo("2208", string(bytesData))
 	return out, str2
 
 }
@@ -744,7 +744,7 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	//if err != nil {
 	//	fmt.Println("error:", err.Error())
 	//}
-	out := GetoleInfo("YH03",string(bytesData))
+	out := GetoleInfo("YH03", string(bytesData))
 
 	//mjson, _ := json.Marshal(inputMessage)
 	//str2 := string(mjson)
@@ -787,7 +787,7 @@ func Hbyb5203aa(baseParams models.BaseParams, businessParams models.BusinessPara
 	return ConvertToString(string(out), "gbk", "utf-8")
 }
 
-//确认订单
+// 确认订单
 func Hbyb6201(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, order models.HisOrder) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -876,7 +876,7 @@ func Hbyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	return str
 }
 
-//  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+// 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) string {
 	fmt.Println("11222333-----")
 
@@ -953,9 +953,9 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 type Input struct {
 	MonSetlAppyID   string `xml:"MON_SETL_APPY_ID"`
 	FixmedinsNo     string `xml:"FIXMEDINS_NO"`
-	ClrCnt          string    `xml:"CLR_CNT"`
-	MedfeeSumAmt    string    `xml:"MEDFEE_SUMAMT"`
-	OptinsPaySumAmt string    `xml:"OPTINS_PAY_SUMAMT"`
+	ClrCnt          string `xml:"CLR_CNT"`
+	MedfeeSumAmt    string `xml:"MEDFEE_SUMAMT"`
+	OptinsPaySumAmt string `xml:"OPTINS_PAY_SUMAMT"`
 	Begndate        string `xml:"BEGNDATE"`
 	Enddate         string `xml:"ENDDATE"`
 	OpterName       string `xml:"OPTER_NAME"`
@@ -971,8 +971,7 @@ type Data struct {
 	Inputs  Inputs   `xml:"INPUTS"`
 }
 
-
-func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start_time string,end_time string,func_t string) string {
+func Hbyb1608(baseParams models.BaseParams, cnt string, medfee_sumamt string, start_time string, end_time string, func_t string) string {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -986,7 +985,7 @@ func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start
 	data := Data{
 		Inputs: Inputs{
 			Input: Input{
-				MonSetlAppyID:  strconv.FormatInt(timestamp, 10)  ,
+				MonSetlAppyID:   strconv.FormatInt(timestamp, 10),
 				FixmedinsNo:     baseParams.FixmedinsCode,
 				ClrCnt:          cnt,
 				MedfeeSumAmt:    medfee_sumamt,
@@ -1003,7 +1002,7 @@ func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start
 		fmt.Println("转换为XML失败:", err)
 	}
 
-	inputMessage["infno"] = "1608" // 交易编码
+	inputMessage["infno"] = "1608"          // 交易编码
 	inputMessage["input"] = string(xmlData) //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -1021,7 +1020,6 @@ func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start
 	return ConvertToString(string(out), "gbk", "utf-8")
 }
 
-
 func Hbyb3204(baseParams models.BaseParams, id string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1032,18 +1030,17 @@ func Hbyb3204(baseParams models.BaseParams, id string) string {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 
-	inputMessage["infno"] = "3204" // 交易编码
-	inputData["clr_appy_evt_id"] = id                       // 险种
+	inputMessage["infno"] = "3204"    // 交易编码
+	inputData["clr_appy_evt_id"] = id // 险种
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	out := GetoleInfo("3204",string(bytesData))
+	out := GetoleInfo("3204", string(bytesData))
 	fmt.Println(string(out))
-	return  out
+	return out
 }
 
-
 func Hbyb8404(baseParams models.BaseParams, month string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1064,16 +1061,11 @@ func Hbyb8404(baseParams models.BaseParams, month string) string {
 	inputMessage["input"] = input //交易输入
 	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	out := GetoleInfo("8404",string(bytesData))
+	out := GetoleInfo("8404", string(bytesData))
 	fmt.Println(string(out))
-	return  out
+	return out
 }
 
-
-
-
-
-
 func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -1107,11 +1099,10 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 	//bytesData, err := json.Marshal(inputMessage)
 	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	out := GetoleInfo("3202a",string(bytesData))
-	return  out
+	out := GetoleInfo("3202a", string(bytesData))
+	return out
 }
 
-
 func Hbyb3204a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -1136,7 +1127,7 @@ func Hbyb3204a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
-		inputData["med_type"] = "14"                        //个人账户支付金额
+		inputData["med_type"] = "14"                      //个人账户支付金额
 		inputDatas = append(inputDatas, inputData)
 	}
 	input["clrdata"] = inputDatas
@@ -1144,13 +1135,11 @@ func Hbyb3204a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 
 	//bytesData, err := json.Marshal(inputMessage)
 	bytesData, _ := json.Marshal(inputMessage)
-	out := GetoleInfo("3204a",string(bytesData))
+	out := GetoleInfo("3204a", string(bytesData))
 	fmt.Println(out)
-	return  out
+	return out
 }
 
-
-
 func Hbyb3202b(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -1175,19 +1164,18 @@ func Hbyb3202b(baseParams models.BaseParams, businessParams []*models.BusinessPa
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
-		inputData["med_type"] = "110104"                        //个人账户支付金额
+		inputData["med_type"] = "110104"                  //个人账户支付金额
 		inputDatas = append(inputDatas, inputData)
 	}
 	input["clrdata"] = inputDatas
 	inputMessage["input"] = input //交易输入
 
 	bytesData, _ := json.Marshal(inputMessage)
-	out := GetoleInfo("3202a",string(bytesData))
-	return  out
+	out := GetoleInfo("3202a", string(bytesData))
+	return out
 }
 
-
-func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string , limit string) string {
+func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string, limit string) string {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1205,7 +1193,7 @@ func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["refd_setl_flag"] = businessParams.RefdSetlFlag
 	inputData["q_begntime"] = businessParams.QBegntime
 	inputData["q_endtime"] = businessParams.QEndtime
-	inputData["med_type"] =   businessParams.MedType
+	inputData["med_type"] = businessParams.MedType
 	inputData["page_num"] = page
 	inputData["page_size"] = limit
 	inputData["certno"] = businessParams.Certno
@@ -1215,11 +1203,11 @@ func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams
 
 	//bytesData, err := json.Marshal(inputMessage)
 	bytesData, _ := json.Marshal(inputMessage)
-	out := GetoleInfo("5262",string(bytesData))
-	return  out
+	out := GetoleInfo("5262", string(bytesData))
+	return out
 }
 
-func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string , limit string) string {
+func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string, limit string) string {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1237,7 +1225,7 @@ func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["refd_setl_flag"] = businessParams.RefdSetlFlag
 	inputData["q_begntime"] = businessParams.QBegntime
 	inputData["q_endtime"] = businessParams.QEndtime
-	inputData["med_type"] =   businessParams.MedType
+	inputData["med_type"] = businessParams.MedType
 	inputData["page_num"] = page
 	inputData["page_size"] = limit
 	input["data"] = inputData
@@ -1247,13 +1235,13 @@ func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams
 
 	//bytesData, err := json.Marshal(inputMessage)
 	bytesData, _ := json.Marshal(inputMessage)
-	out := GetoleInfo("5267",string(bytesData))
-	return  out
+	out := GetoleInfo("5267", string(bytesData))
+	return out
 }
 
 //文件上传
 
-//文件上传
+// 文件上传
 func Hbyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 
 	// 生成签名
@@ -1394,7 +1382,7 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3202"                                    // 交易编码
 	inputData["file_qury_no"] = businessParams.FileQuryNo             // 险种
-	inputData["setl_optins"] = ""              // 结算经办机构
+	inputData["setl_optins"] = ""                                     // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
@@ -1410,7 +1398,7 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	//str2 := string(mjson)
 	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	out := GetoleInfo("3202",string(bytesData))
+	out := GetoleInfo("3202", string(bytesData))
 	return out
 }
 
@@ -1958,7 +1946,6 @@ func Hbyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
-
 	bytesData, err := json.Marshal(inputMessage)
 	//inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
@@ -1967,13 +1954,12 @@ func Hbyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error()
 	}
 
-	out := GetoleInfo("5301",string(bytesData))
+	out := GetoleInfo("5301", string(bytesData))
 	return out
 	//return ConvertToString(string(out), "gbk", "utf-8")
 
 }
 
-//
 func Hbyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -2322,7 +2308,7 @@ func Hbyb2601(psnNo string, omsgid string, oinfno string, org_name string, docto
 	return str
 }
 
-//人员信息版本3
+// 人员信息版本3
 func Hbyb1101B(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 int64) string {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -2404,7 +2390,7 @@ func Hbyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-//人员信息版本4
+// 人员信息版本4
 func Hbyb1101C(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 int64) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -2609,7 +2595,6 @@ func Hbyb2001(secret_key string, org_name string, doctor_name string, code strin
 	return string(out), string(bytesData)
 }
 
-
 // 住院登记
 func Hbyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
@@ -2685,7 +2670,7 @@ func Hbyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedi
 		return err.Error(), ""
 	}
 	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2401",  string(bytesData), json2)
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2401", string(bytesData), json2)
 	out, err := cmd.Output()
 
 	//decoder := simplifiedchinese.GBK.NewDecoder()
@@ -2696,11 +2681,10 @@ func Hbyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedi
 		fmt.Println("error:", err.Error())
 	}
 
-	return   ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 }
 
-
-//住院撤销
+// 住院撤销
 func Hbyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -2727,18 +2711,17 @@ func Hbyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 }
 
-//出院撤销
+// 出院撤销
 func Hb2405(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 
-
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
@@ -2760,7 +2743,7 @@ func Hb2405(mdtrt_id string, psn_no string, secret_key string, org_name string,
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 }
@@ -2840,13 +2823,12 @@ func Hb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_admdv
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 }
 
-
-//  住院费用明细信息上传
+// 住院费用明细信息上传
 func Hb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, 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, med_type string, doctor_name string, doctor_number string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -2965,7 +2947,7 @@ func Hb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, c
 		fmt.Println(err.Error())
 		return "", ""
 	}
-	return   ConvertToString(string(respBytes), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(respBytes), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 }
 func Hb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, 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, med_type string, opertor string) (string, string) {
@@ -3056,18 +3038,18 @@ func Hb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom,
 		fmt.Println("error:", err.Error())
 	}
 	fmt.Println(string(out))
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 
 }
-//  住院费用明细信息撤销
+
+// 住院费用明细信息撤销
 func Hb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 
-
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
@@ -3086,7 +3068,7 @@ func Hb2302(psnNo string, mdtrtId string, org_name string, doctor string, insupl
 
 	inputData["mdtrt_id"] = mdtrtId // 就诊 ID
 	inputData["psn_no"] = psnNo     // 人员编号
-	feedetail = append(feedetail,inputData)
+	feedetail = append(feedetail, inputData)
 	input["data"] = feedetail
 	inputMessage["input"] = input //交易输入
 
@@ -3102,7 +3084,7 @@ func Hb2302(psnNo string, mdtrtId string, org_name string, doctor string, insupl
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 }
@@ -3157,7 +3139,8 @@ func Hb2303(psnNo string, mdtrtId string, chrgBchno string, certNo string, insut
 
 	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 }
-//  住院结算
+
+// 住院结算
 func Hb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string, acct_used_flag string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -3211,44 +3194,44 @@ func Hb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, insut
 		fmt.Println("error:", err.Error())
 	}
 	//if id_card_type == 4 {
-			aa := ""
-		// Regular expression to find JSON part
-		re := regexp.MustCompile(`\{.*\}`)
+	aa := ""
+	// Regular expression to find JSON part
+	re := regexp.MustCompile(`\{.*\}`)
 
-		// Find the first match
-		match := re.Find([]byte(ConvertToString(string(out), "gbk", "utf-8")))
+	// Find the first match
+	match := re.Find([]byte(ConvertToString(string(out), "gbk", "utf-8")))
 
-		if match != nil {
-			// Convert bytes to string
-			jsonStr := string(match)
+	if match != nil {
+		// Convert bytes to string
+		jsonStr := string(match)
 
-			// Parse JSON
-			var jsonData interface{}
-			err := json.Unmarshal([]byte(jsonStr), &jsonData)
+		// Parse JSON
+		var jsonData interface{}
+		err := json.Unmarshal([]byte(jsonStr), &jsonData)
+		if err != nil {
+			fmt.Println("Error parsing JSON:", err)
+		} else {
+			// Print formatted JSON
+			jsonBytes, err := json.MarshalIndent(jsonData, "", "    ")
 			if err != nil {
-				fmt.Println("Error parsing JSON:", err)
+				fmt.Println("Error formatting JSON:", err)
 			} else {
-				// Print formatted JSON
-				jsonBytes, err := json.MarshalIndent(jsonData, "", "    ")
-				if err != nil {
-					fmt.Println("Error formatting JSON:", err)
-				} else {
-					aa = string(jsonBytes)
-					//fmt.Println(string(jsonBytes))
-				}
+				aa = string(jsonBytes)
+				//fmt.Println(string(jsonBytes))
 			}
-		} else {
-			fmt.Println("No valid JSON found in the input string.")
 		}
-		return aa, ConvertToString(string(bytesData), "gbk", "utf-8")
+	} else {
+		fmt.Println("No valid JSON found in the input string.")
+	}
+	return aa, ConvertToString(string(bytesData), "gbk", "utf-8")
 	//}else{
 
-		//return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	//return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 	//}
 	//return string(out), string(bytesData)
 }
 
-//  住院结算撤销
+// 住院结算撤销
 func Hb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -3280,13 +3263,12 @@ func Hb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 	//return string(out), string(bytesData)
 }
 
-
-func  GetoleInfo(code string,data string) string {
+func GetoleInfo(code string, data string) string {
 	ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
 	defer ole.CoUninitialize()
 

service/hn_service.go

@@ -779,7 +779,7 @@ func Hnyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 }
 
 // 门诊结算
-func Hnyb2207(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, verify_number string, cainfo string) (string, string) {
+func Hnyb2207(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, verify_number string, cainfo string, pack_num int64, good_pack_num int64) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -815,13 +815,15 @@ func Hnyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} 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["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["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //

service/jsyb_service.go

@@ -13,10 +13,10 @@ import (
 	"gdyb/utils/csbhttp"
 	"io/ioutil"
 	"net"
-	"strings"
-	"regexp"
 	"net/http"
+	"regexp"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -250,9 +250,9 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 		}
 	}
 
-	inputData["mdtrt_cert_no"] = certNo  // 就诊凭证编号
-	inputData["begntime"] = ""                                // 开始时间
-	inputData["psn_name"] = ""                                // 人员姓名
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = ""          // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -274,7 +274,7 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 	// 参数
 	_api_access_key := access_key
 	_api_name := "hssServives"
-	timestampInMilliseconds  := time.Now().Unix()
+	timestampInMilliseconds := time.Now().Unix()
 
 	timestamp = timestampInMilliseconds
 	_api_timestamp := timestamp
@@ -290,7 +290,7 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 		"&_api_version=" + url.QueryEscape(_api_version)
 	secret_key = strings.Replace(secret_key, "+", "%2B", -1)
 	fmt.Println("h8Z+d10iYI4B+kry0wgYSt5bFBs=")
-	secret_key  = "h8Z+d10iYI4B+kry0wgYSt5bFBs="
+	secret_key = "h8Z+d10iYI4B+kry0wgYSt5bFBs="
 	// 生成签名
 	signature, _ := generateSignature(param, secretKey)
 
@@ -302,7 +302,7 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 	request.Header.Set("_api_timestamp", str)
 	request.Header.Set("_api_name", _api_name)
-	request.Header.Set("_api_version",_api_version)
+	request.Header.Set("_api_version", _api_version)
 	request.Header.Set("_api_access_key", _api_access_key)
 	request.Header.Set("_api_signature", signature)
 
@@ -314,7 +314,6 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 		return err.Error(), ""
 	}
 
-
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -330,11 +329,6 @@ func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code s
 	fmt.Println(str2)
 	return str2, string(bytesData)
 
-
-
-
-
-
 	//return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
@@ -421,10 +415,10 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputData["begntime"] = timeFormatOne // 开始时间
 
 	if id_card_type == 1 {
-		if mdtrtarea_admvs == "320830"{
+		if mdtrtarea_admvs == "320830" {
 			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number  // 就诊凭证编号
-		}else{
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		} else {
 			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 
@@ -500,9 +494,8 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	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, begin_time string, cainfo string,doc_name string) (string, string, int64) {
+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, begin_time string, cainfo string, doc_name string) (string, string, int64) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -536,7 +529,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
 		diseinfo_sun["diag_dept"] = department       // 诊断科室
 		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
-		diseinfo_sun["dise_dor_name"] = doc_name       // 诊断医生姓名
+		diseinfo_sun["dise_dor_name"] = doc_name     // 诊断医生姓名
 		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
 		diseinfo_sun["vali_flag"] = "1"              // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)
@@ -827,7 +820,7 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
 
-	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
 	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
 
 	inputData["psn_no"] = psnNo   // 人员编号 （来自1101接口返回）
@@ -923,7 +916,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 // 门诊结算
-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, verify_number string, cainfo string, mdtrt_grp_type string) (string, string) {
+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, verify_number string, cainfo string, mdtrt_grp_type string, pack_num string, good_pack_num string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -938,12 +931,12 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			if mdtrtarea_admvs == "320830"{
+			if mdtrtarea_admvs == "320830" {
 
 				inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-				inputData["mdtrt_cert_no"] =  certNo + "|" + verify_number  // 就诊凭证编号
+				inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 
-			}else{
+			} else {
 				inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 				inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 
@@ -979,6 +972,9 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
+
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //
@@ -1197,11 +1193,11 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	if fixmedins_code == "H32090403023" {
 		inputMessage["opter"] = "葛美琴"      // 经办人
 		inputMessage["opter_name"] = "葛美琴" // 经办人姓名
-	} else if  fixmedins_code == "H32092103007"{
+	} else if fixmedins_code == "H32092103007" {
 		inputMessage["opter"] = "孙欣欣"      // 经办人
 		inputMessage["opter_name"] = "孙欣欣" // 经办人姓名
 	} else {
-		inputMessage["opter"] =   doctor    // 经办人
+		inputMessage["opter"] = doctor      // 经办人
 		inputMessage["opter_name"] = doctor // 经办人姓名
 	}
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
@@ -2075,12 +2071,12 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	inputData["rxno"] = struct3505.Rxno                   // 人员编号 （来自1101接口返回）
 	inputData["rx_circ_flag"] = struct3505.RxCircFlag     // 人员编号 （来自1101接口返回）
 
-	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
-	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
-	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
-	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
+	inputData["rtal_docno"] = struct3505.RtalDocno                 // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo                   // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo                   // 人员编号 （来自1101接口返回）
+	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType        // 人员编号 （来自1101接口返回）
 	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = "---"          // 人员编号 （来自1101接口返回）
+	inputData["drug_trac_codg"] = "---"                            // 人员编号 （来自1101接口返回）
 	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
 	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）

service/jx_service.go

@@ -886,7 +886,7 @@ func Jxyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 }
 
 // 门诊结算
-func Jxyb2207(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, verify_number string, cainfo string, card_sn string, psn_cert_type string, certno string, psn_type string, psn_name string) (string, string) {
+func Jxyb2207(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, verify_number string, cainfo string, card_sn string, psn_cert_type string, certno string, psn_type string, psn_name string, pack_num int64, good_pack_num int64) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -935,11 +935,13 @@ func Jxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
 
-	inputData["card_sn"] = card_sn             // 发票号
-	inputData["psn_cert_type"] = psn_cert_type // 发票号
-	inputData["certno"] = certno               // 发票号
-	inputData["psn_type"] = psn_type           // 发票号
-	inputData["psn_name"] = psn_name           // 发票号
+	inputData["card_sn"] = card_sn                 // 发票号
+	inputData["psn_cert_type"] = psn_cert_type     // 发票号
+	inputData["certno"] = certno                   // 发票号
+	inputData["psn_type"] = psn_type               // 发票号
+	inputData["psn_name"] = psn_name               // 发票号
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData2 := make(map[string]interface{})
 	inputData2["trum_flag"] = ""

service/nm_service.go

@@ -742,7 +742,7 @@ func Nmyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 // 门诊结算
-func Nmyb2207(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, verify_number string, cainfo string, mdtrt_grp_type string) (string, string) {
+func Nmyb2207(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, verify_number string, cainfo string, mdtrt_grp_type string, pack_num string, good_pack_num string) (string, string) {
 	if !strings.Contains(insuplc_admdvs, "150") {
 
 		chrgBchno = "0000"
@@ -795,6 +795,9 @@ func Nmyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = "12345"                // 发票号
 
+	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
+
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //