777

controllers/sg/his_api_controller.go

@@ -26,7 +26,7 @@ import (
 	"github.com/shopspring/decimal"
 	"io"
 	"io/ioutil"
-	//"math"
+
 	"math/rand"
 	"net/http"
 	"net/url"
@@ -38,8 +38,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
-
 )
 
 type HisApiController struct {
@@ -2265,6 +2263,7 @@ func (c *HisApiController) DeleteXSandBG() {
 	}
 
 }
+
 //func (c *HisApiController) DeleteXSandBGTwo() {
 //	patient_id, _ := c.GetInt64("patient_id")
 //	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -4616,7 +4615,7 @@ func (c *HisApiController) ChangeDrugTen() {
 	//id_arr := strings.Split(ids, ",")
 	now := time.Now()
 	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
-	flows, _ := service.GetNewDrugFlowInforTen(timestamp,c.GetAdminUserInfo().CurrentOrgId)
+	flows, _ := service.GetNewDrugFlowInforTen(timestamp, c.GetAdminUserInfo().CurrentOrgId)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
@@ -4624,10 +4623,10 @@ func (c *HisApiController) ChangeDrugTen() {
 	for _, item := range flows {
 		var res3 ResultSix
 		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
-			if item.HisDoctorAdviceInfo.PrescriptionId == 0{
+			if item.HisDoctorAdviceInfo.PrescriptionId == 0 {
 				continue
 			}
-			if item.HisDoctorAdviceInfo.PrescriptionId == 0{
+			if item.HisDoctorAdviceInfo.PrescriptionId == 0 {
 				continue
 			}
 			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
@@ -5065,6 +5064,8 @@ func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsu
 	struct3502.FixmedinsCode = miConfig.Code
 	struct3502.Code = miConfig.Code
 
+	struct3502.DrugTracCodg = drug.HisDoctorAdviceInfo.DrugCode
+
 	struct3502.Opter = role.UserName
 	struct3502.RxFlag = "1"
 	struct3502.InvChgTime = time.Now().Format("2006-01-02")
@@ -5095,7 +5096,7 @@ func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsu
 		result1, result2 := service.Gzyb3502(struct3502, struct3502.SecretKey)
 		return result1, result2
 
-	}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440")  {
+	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") {
 		result1, result2 := service.Gdyb3502(struct3502, struct3502.SecretKey)
 		return result1, result2
 	} else {
@@ -5183,7 +5184,6 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.PsnNo = order.PsnNo
 	struct3505.PsnName = order.PsnName
 
-
 	struct3505.Url = miConfig.Url
 	struct3505.AppId = miConfig.Cainfo
 	struct3505.AppSecret = miConfig.AppSecret
@@ -5206,7 +5206,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3505.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 
-	struct3505.DrugTracCodg = drug.DrugCode
+	struct3505.DrugTracCodg = drug.HisDoctorAdviceInfo.DrugCode
 
 	if miConfig.MdtrtareaAdmvs == "350500" {
 		result1, result2, _ := service.FJyb3505(struct3505)
@@ -5214,7 +5214,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	} else if miConfig.MdtrtareaAdmvs == "440100" {
 		result1, result2 := service.Gzyb3505(struct3505, struct3505.SecretKey)
 		return result1, result2
-	}else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440")  {
+	} else if strings.HasPrefix(miConfig.MdtrtareaAdmvs[0:3], "440") {
 		result1, result2 := service.Gdyb3505(struct3505, struct3505.SecretKey)
 		return result1, result2
 	} else {

models/his_models.go

@@ -40,8 +40,7 @@ type XtHisProject struct {
 	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
 	Total                     string  `gorm:"column:total" json:"total" form:"total"`
-	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
-
+	Vaf14                     string  `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
 }
 
 func (XtHisProject) TableName() string {
@@ -62,7 +61,7 @@ type XtHisProjectTeam struct {
 	CreatedTime int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Bbx01	string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	Bbx01       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 }
 
 func (XtHisProjectTeam) TableName() string {
@@ -235,11 +234,11 @@ type HisDoctorAdviceInfo struct {
 	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
 	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
-
-	NewGroupno               string   `gorm:"column:-" json:"new_groupno" form:"new_groupno"`
-	Newfn               string   `gorm:"column:-" json:"newfn" form:"newfn"`
+	DrugWayCount          string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 
+	NewGroupno string `gorm:"column:-" json:"new_groupno" form:"new_groupno"`
+	Newfn      string `gorm:"column:-" json:"newfn" form:"newfn"`
 
 	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
@@ -314,9 +313,6 @@ type HisPrescriptionInfo struct {
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
-
-
-
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -324,35 +320,32 @@ func (HisPrescriptionInfo) TableName() string {
 }
 
 type HisPrescription struct {
-	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
-	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
-	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
-	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
-	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
+	ID                     int64                    `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                    `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                    `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                    `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                    `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                    `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                    `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                   `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                    `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                    `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                    `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                    `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                    `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                   `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                   `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             VMHisPatient             `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProject []HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
-	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"info"`
-	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	Cbm01                string                    `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
-	Cbm07                string                    `gorm:"column:cbm07" json:"cbm07" form:"cbm07"`
-
-
-
+	VMHisPrescriptionInfo  HisPrescriptionInfo      `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"info"`
+	MedType                string                   `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Cbm01                  string                   `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
+	Cbm07                  string                   `gorm:"column:cbm07" json:"cbm07" form:"cbm07"`
 }
 
 func (HisPrescription) TableName() string {
@@ -388,12 +381,10 @@ type HisProject struct {
 	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	ZuobiaoId             string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
-	Bck01b	 string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
-	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
-	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
-
-
+	ZuobiaoId                 string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b                    string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01                     string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Vaf14                     string  `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
 }
 
 func (HisProject) TableName() string {
@@ -515,36 +506,35 @@ func (HisDoctorAdviceTemplate) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID                 int64            `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64            `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64          `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64            `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64            `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64            `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64            `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64            `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64            `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              string           `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string           `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string           `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string           `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string           `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string           `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string           `gorm:"column:day" json:"day" form:"day"`
-	StartTime                int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
-
-
-	HisProject         HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	GoodInfo           GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
-	Type               int64            `gorm:"column:type" json:"type" form:"type"`
-	Remark             string           `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string           `gorm:"column:unit" json:"unit" form:"unit"`
-	TeamId             int64            `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	XtHisProjectTeam   XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
-	IsCheckTeam        int64            `gorm:"-" json:"is_check_team" form:"is_check_team"`
-	ExecutionTime      int64            `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string  `gorm:"column:day" json:"day" form:"day"`
+	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+
+	HisProject       HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo         GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Type             int64            `gorm:"column:type" json:"type" form:"type"`
+	Remark           string           `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit             string           `gorm:"column:unit" json:"unit" form:"unit"`
+	TeamId           int64            `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+	IsCheckTeam      int64            `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionTime    int64            `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -750,12 +740,12 @@ type HisOrder struct {
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
 	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
 
-	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
-	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
-	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
-	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
+	IsUploadDiagnose  int64  `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64  `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64  `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	SickName          string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
-	FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+	FaPiaoSn string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 }
 
 func (HisOrder) TableName() string {
@@ -909,7 +899,7 @@ type MedicalInsuranceOrgConfig struct {
 	MdtrtareaAdmvs string `gorm:"column:mdtrtarea_admvs" json:"mdtrtarea_admvs" form:"mdtrtarea_admvs"`
 	InsuplcAdmdvs  string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	SecretKey      string `gorm:"column:secret_key" json:"secret_key" form:"secret_key"`
-Url            string `gorm:"column:url" json:"url" form:"url"`
+	Url            string `gorm:"column:url" json:"url" form:"url"`
 	AccessKey      string `gorm:"column:access_key" json:"access_key" form:"access_key"`
 	Cainfo         string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
 	AppSecret      string `gorm:"column:app_secret" json:"app_secret" form:"app_secret"`
@@ -1081,7 +1071,6 @@ type BusinessParams struct {
 	MdtrtId          string
 	SetlId           string
 	StasType         string
-
 }
 
 type BusinessParamsTwo struct {
@@ -1102,20 +1091,17 @@ type BusinessParamsTwo struct {
 	SetlId           string
 }
 
-
 type BusinessParams5262 struct {
-	RefdSetlFlag         string
-	QBegntime         	 string
-	QEndtime      		 string
-	MedType   			 string
-	PageNum     		 string
-	PageSize      		 string
-	Certno     			 string
-	Psnno    			 string
-
+	RefdSetlFlag string
+	QBegntime    string
+	QEndtime     string
+	MedType      string
+	PageNum      string
+	PageSize     string
+	Certno       string
+	Psnno        string
 }
 
-
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -1229,8 +1215,7 @@ type MyHisProject struct {
 	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
-
+	Vaf14                       string  `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
 }
 
 func (MyHisProject) TableName() string {
@@ -1399,10 +1384,7 @@ type HisPsn struct {
 	RecordDate    int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	InsuplcAdmdvs string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	IdCardType    int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
-	AuthInfo    string   `gorm:"column:auth_info" json:"auth_info" form:"auth_info"`
-
-
-
+	AuthInfo      string  `gorm:"column:auth_info" json:"auth_info" form:"auth_info"`
 }
 
 func (HisPsn) TableName() string {
@@ -1491,8 +1473,7 @@ type HisDoctorAdviceInfoTen struct {
 	HospApprFlag          int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	BaseDrugLib           BaseDrugLib  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	HisOrderInfo          HisOrderInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"order_info"`
-	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
-
+	DrugWayCount          string       `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {
@@ -1606,7 +1587,7 @@ type HisChargeSettleOrder struct {
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
 	OthDesc             string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
-	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
+	SickName            string  `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
@@ -1719,47 +1700,40 @@ type NewCustomTwo struct {
 	ProjectId        int64
 	ItemId           string
 	StartTime        string
-	Content string
-	Bby01             string
-
+	Content          string
+	Bby01            string
 }
 
 type ChargeList struct {
-	Bby01 			string
-	Vaj25              string
-	Bbx01              string
-	Vaf21              string
-	Vaf22              string
-	Vaf42              string
-
-
+	Bby01 string
+	Vaj25 string
+	Bbx01 string
+	Vaf21 string
+	Vaf22 string
+	Vaf42 string
 }
 
-
 type ChargeListtwo struct {
-	Bby01 			int64  `json:"bby01"`
-	Vaj25              float64 `json:"vaj25"`
-
+	Bby01 int64   `json:"bby01"`
+	Vaj25 float64 `json:"vaj25"`
 }
 type UploadInfo struct {
-	Bce02a   string `json:"bce02a"`
-	Acf01   int64 `json:"acf01"`
-	Bce01   string `json:"bce01"`
-	Bck01   string `json:"bck01"`
+	Bce02a        string           `json:"bce02a"`
+	Acf01         int64            `json:"acf01"`
+	Bce01         string           `json:"bce01"`
+	Bck01         string           `json:"bck01"`
 	ChargeListtwo []*ChargeListtwo `json:"chargeList"`
-	Bce01a   string `json:"bce01a"`
+	Bce01a        string           `json:"bce01a"`
 
-	Bck01c   string `json:"bck01c"`
-	Bck01a   string `json:"bck01a"`
+	Bck01c string `json:"bck01c"`
+	Bck01a string `json:"bck01a"`
 
 	Diag     []*Diag
 	Fasong   string `json:"fasong"`
 	PresInfo []*PresInfo
-	Vaa01    int64 `json:"bby01"`
-	Vaa07    int64 `json:"vaa07"`
+	Vaa01    int64  `json:"bby01"`
+	Vaa07    int64  `json:"vaa07"`
 	Vaa05    string `json:"vaa05"`
-
-
 }
 
 type Diag struct {
@@ -1909,7 +1883,7 @@ type NewHisOrder111 struct {
 	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
 	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
-	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
+	SickName     string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
@@ -1920,23 +1894,20 @@ func (NewHisOrder111) TableName() string {
 	return "his_order"
 }
 
-
 type Root2 struct {
-	XMLName    xml.Name   `xml:"Root"`
-	TradeInfo  TradeInfo  `xml:"tradeinfo"`
-
-	VAF1       VAF10       `xml:"VAF1"`
+	XMLName   xml.Name  `xml:"Root"`
+	TradeInfo TradeInfo `xml:"tradeinfo"`
 
+	VAF1 VAF10 `xml:"VAF1"`
 }
 
-
 type Root struct {
-	XMLName    xml.Name   `xml:"Root"`
-	TradeInfo  TradeInfo  `xml:"tradeinfo"`
-	CBM1       CBM1       `xml:"CBM1"`
-	VAF1       VAF1       `xml:"VAF1"`
-	VAO1       VAO1       `xml:"VAO1"`
-	VBQ1       VBQ1       `xml:"VBQ1"`
+	XMLName   xml.Name  `xml:"Root"`
+	TradeInfo TradeInfo `xml:"tradeinfo"`
+	CBM1      CBM1      `xml:"CBM1"`
+	VAF1      VAF1      `xml:"VAF1"`
+	VAO1      VAO1      `xml:"VAO1"`
+	VBQ1      VBQ1      `xml:"VBQ1"`
 }
 
 type TradeInfo struct {
@@ -1979,102 +1950,93 @@ type IEone struct {
 	BCK01B string `xml:"BCK01B,attr"`
 	BCK01C string `xml:"BCK01C,attr"`
 	CBM19  string `xml:"CBM19,attr"`
-
 }
 type IEtwo struct {
-	CBMID  string `xml:"CBMID,attr"`
-	VAF04  string `xml:"VAF04,attr"`
-	VAA01  string `xml:"VAA01,attr"`
-	VAF06  string `xml:"VAF06,attr"`
-	BCK01A string `xml:"BCK01A,attr"`
-	ROWNR  string `xml:"ROWNR,attr"`
-	VAF10  string `xml:"VAF10,attr"`
-	VAF11  string `xml:"VAF11,attr"`
-	BDA01  string `xml:"BDA01,attr"`
-	BBX01  string `xml:"BBX01,attr"`
-	VAF14  string `xml:"VAF14,attr"`
-	VAF15  string `xml:"VAF15,attr"`
-	BBY01  string `xml:"BBY01,attr"`
-	VAF17  string `xml:"VAF17,attr"`
-	VAF18  string `xml:"VAF18,attr"`
-	VAF19  string `xml:"VAF19,attr"`
-	VAF20  string `xml:"VAF20,attr"`
-	VAF21  string `xml:"VAF21,attr"`
-	VAF22  string `xml:"VAF22,attr"`
-	Crypt  string `xml:"Crypt,attr"`
-	VAF23  string `xml:"VAF23,attr"`
-	BCK01B string `xml:"BCK01B,attr"`
-	VAF26  string `xml:"VAF26,attr"`
-	VAF27  string `xml:"VAF27,attr"`
-	VAF28  string `xml:"VAF28,attr"`
-	VAF29  string `xml:"VAF29,attr"`
-	VAF30  string `xml:"VAF30,attr"`
-	VAF31  string `xml:"VAF31,attr"`
-	VAF32  string `xml:"VAF32,attr"`
-	VAF33  string `xml:"VAF33,attr"`
-	VAF34  string `xml:"VAF34,attr"`
-	VAF35  string `xml:"VAF35,attr"`
-	VAF36  string `xml:"VAF36,attr"`
-	VAF37  string `xml:"VAF37,attr"`
-	BCE02A  string `xml:"BCE02A,attr"`
-	BCE03A  string `xml:"BCE03A,attr"`
-	BCE03B  string `xml:"BCE03B,attr"`
-	VAF53  string `xml:"VAF53,attr"`
-	VAF55  string `xml:"VAF55,attr"`
-	BCK01D  string `xml:"BCK01D,attr"`
-	VAF58  string `xml:"VAF58,attr"`
-	VAF59  string `xml:"VAF59,attr"`
-	VAF60  string `xml:"VAF60,attr"`
-	VAF61  string `xml:"VAF61,attr"`
-	VAF62  string `xml:"VAF62,attr"`
-	LSign  string `xml:"lSign,attr"`
-	BDA01A  string `xml:"BDA01A,attr"`
-	LRoute  string `xml:"lRoute,attr"`
-	BCE01A  string `xml:"BCE01A,attr"`
-	BCE01B  string `xml:"BCE01B,attr"`
-	VAF01B  string `xml:"VAF01B,attr"`
-	VCO01  string `xml:"VCO01,attr"`
-	BCE01H  string `xml:"BCE01H,attr"`
-	BCE03H  string `xml:"BCE03H,attr"`
-	BIW02  string `xml:"BIW02,attr"`
-	RCurrent  string `xml:"rCurrent,attr"`
-	FCheck  string `xml:"FCheck,attr"`
-	UnameA  string `xml:"UnameA,attr"`
-	VEH02  string `xml:"VEH02,attr"`
-	BCK01C  string `xml:"BCK01C,attr"`
-	VAF07  string `xml:"VAF07,attr"`
-
-
-
-
-
-
+	CBMID    string `xml:"CBMID,attr"`
+	VAF04    string `xml:"VAF04,attr"`
+	VAA01    string `xml:"VAA01,attr"`
+	VAF06    string `xml:"VAF06,attr"`
+	BCK01A   string `xml:"BCK01A,attr"`
+	ROWNR    string `xml:"ROWNR,attr"`
+	VAF10    string `xml:"VAF10,attr"`
+	VAF11    string `xml:"VAF11,attr"`
+	BDA01    string `xml:"BDA01,attr"`
+	BBX01    string `xml:"BBX01,attr"`
+	VAF14    string `xml:"VAF14,attr"`
+	VAF15    string `xml:"VAF15,attr"`
+	BBY01    string `xml:"BBY01,attr"`
+	VAF17    string `xml:"VAF17,attr"`
+	VAF18    string `xml:"VAF18,attr"`
+	VAF19    string `xml:"VAF19,attr"`
+	VAF20    string `xml:"VAF20,attr"`
+	VAF21    string `xml:"VAF21,attr"`
+	VAF22    string `xml:"VAF22,attr"`
+	Crypt    string `xml:"Crypt,attr"`
+	VAF23    string `xml:"VAF23,attr"`
+	BCK01B   string `xml:"BCK01B,attr"`
+	VAF26    string `xml:"VAF26,attr"`
+	VAF27    string `xml:"VAF27,attr"`
+	VAF28    string `xml:"VAF28,attr"`
+	VAF29    string `xml:"VAF29,attr"`
+	VAF30    string `xml:"VAF30,attr"`
+	VAF31    string `xml:"VAF31,attr"`
+	VAF32    string `xml:"VAF32,attr"`
+	VAF33    string `xml:"VAF33,attr"`
+	VAF34    string `xml:"VAF34,attr"`
+	VAF35    string `xml:"VAF35,attr"`
+	VAF36    string `xml:"VAF36,attr"`
+	VAF37    string `xml:"VAF37,attr"`
+	BCE02A   string `xml:"BCE02A,attr"`
+	BCE03A   string `xml:"BCE03A,attr"`
+	BCE03B   string `xml:"BCE03B,attr"`
+	VAF53    string `xml:"VAF53,attr"`
+	VAF55    string `xml:"VAF55,attr"`
+	BCK01D   string `xml:"BCK01D,attr"`
+	VAF58    string `xml:"VAF58,attr"`
+	VAF59    string `xml:"VAF59,attr"`
+	VAF60    string `xml:"VAF60,attr"`
+	VAF61    string `xml:"VAF61,attr"`
+	VAF62    string `xml:"VAF62,attr"`
+	LSign    string `xml:"lSign,attr"`
+	BDA01A   string `xml:"BDA01A,attr"`
+	LRoute   string `xml:"lRoute,attr"`
+	BCE01A   string `xml:"BCE01A,attr"`
+	BCE01B   string `xml:"BCE01B,attr"`
+	VAF01B   string `xml:"VAF01B,attr"`
+	VCO01    string `xml:"VCO01,attr"`
+	BCE01H   string `xml:"BCE01H,attr"`
+	BCE03H   string `xml:"BCE03H,attr"`
+	BIW02    string `xml:"BIW02,attr"`
+	RCurrent string `xml:"rCurrent,attr"`
+	FCheck   string `xml:"FCheck,attr"`
+	UnameA   string `xml:"UnameA,attr"`
+	VEH02    string `xml:"VEH02,attr"`
+	BCK01C   string `xml:"BCK01C,attr"`
+	VAF07    string `xml:"VAF07,attr"`
 }
 type IEthree struct {
-	CBMID  string `xml:"CBMID,attr"`
-	VAA01  string `xml:"VAA01,attr"`
-	VAA07  string `xml:"VAA07,attr"`
-	ACF01  string `xml:"ACF01,attr"`
+	CBMID string `xml:"CBMID,attr"`
+	VAA01 string `xml:"VAA01,attr"`
+	VAA07 string `xml:"VAA07,attr"`
+	ACF01 string `xml:"ACF01,attr"`
 
 	VAO06  string `xml:"VAO06,attr"`
 	VAO07  string `xml:"VAO07,attr"`
 	VAO10  string `xml:"VAO10,attr"`
 	VAO11  string `xml:"VAO11,attr"`
-	BAK01A  string `xml:"BAK01A,attr"`
+	BAK01A string `xml:"BAK01A,attr"`
 	CAM01  string `xml:"CAM01,attr"`
 	VAO15  string `xml:"VAO15,attr"`
 	VAO18  string `xml:"VAO18,attr"`
 	VAO22  string `xml:"VAO22,attr"`
 	IAA01  string `xml:"IAA01,attr"`
 	IAD03  string `xml:"IAD03,attr"`
-	BAK01B  string `xml:"BAK01B,attr"`
+	BAK01B string `xml:"BAK01B,attr"`
 	VAO26  string `xml:"VAO26,attr"`
 	IAD04  string `xml:"IAD04,attr"`
 	IAD01  string `xml:"IAD01,attr"`
 	VAO25  string `xml:"VAO25,attr"`
 	VAO35  string `xml:"VAO35,attr"`
-
-
 }
 type IEfour struct {
 	VBQ01  string `xml:"VBQ01,attr"`
@@ -2085,21 +2047,17 @@ type IEfour struct {
 	VBQ07  string `xml:"VBQ07,attr"`
 	BCK01A string `xml:"BCK01A,attr"`
 	BCK01B string `xml:"BCK01B,attr"`
-	BCE03A  string `xml:"BCE03A,attr"`
-	BCE01A  string `xml:"BCE01A,attr"`
+	BCE03A string `xml:"BCE03A,attr"`
+	BCE01A string `xml:"BCE01A,attr"`
 	VBQ27  string `xml:"VBQ27,attr"`
 	VBQ28  string `xml:"VBQ28,attr"`
 	VBQ29  string `xml:"VBQ29,attr"`
 	VBQ30  string `xml:"VBQ30,attr"`
-
-
 }
 type IEfive struct {
-	VAF01  string `xml:"VAF01,attr"`
-
+	VAF01 string `xml:"VAF01,attr"`
 }
 
-
 func main() {
 	data := `YOUR_XML_CONTENT_HERE`
 
@@ -2112,10 +2070,3 @@ func main() {
 
 	fmt.Printf("%+v\n", root)
 }
-
-
-
-
-
-
-

service/gdyb_service.go

@@ -6944,22 +6944,22 @@ func Gdyb3501(struct3501 models.Struct3501, secret_key string) (string, string)
 	inputMessage := SetGdInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3501"                                  // 交易编码
-	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName         // 定点医药机构目录名称
-	inputData["rx_flag"] = struct3501.RxFlag                        //
-	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
-	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
-	inputData["manu_lotnum"] = struct3501.ManuLotnum                // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
-	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
-	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
-	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3501"                                      // 交易编码
+	inputData["med_list_codg"] = struct3501.MedListCodg                 // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["rx_flag"] = struct3501.RxFlag                            //
+	inputData["invdate"] = struct3501.Invdate                           // 人员编号 （来自1101接口返回）
+	inputData["inv_cnt"] = struct3501.InvCnt                            // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3501.ManuLotnum                    // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3501.ManuDate                        // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3501.ExpyEnd                          // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                              // 人员编号 （来自1101接口返回）
 	feedetail := make([]map[string]interface{}, 0)
 	druginputData := make(map[string]interface{})
 	druginputData["drug_trac_codg"] = struct3501.DrugTracCodg
-	feedetail = append(feedetail,druginputData)
+	feedetail = append(feedetail, druginputData)
 	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -7017,12 +7017,12 @@ func Gdyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
-	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
-	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
-	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
-	inputData["rx_flag"] = struct3502.RxFlag                    //
+	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode         // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["pric"] = struct3502.Pric                                 // 人员编号 （来自1101接口返回）
+	inputData["cnt"] = struct3502.Cnt                                   // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3502.RxFlag                            //
 
 	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
 	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
@@ -7030,15 +7030,22 @@ func Gdyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
 
 	input["invinfo"] = inputData
+	//feedetail := make([]map[string]interface{}, 0)
+	//druginputData := make(map[string]interface{})
+	//druginputData["drug_trac_codg"] = struct3502.DrugTracCodg
+	//feedetail = append(feedetail, druginputData)
+	//inputData["drugtracinfo"] = feedetail
 	feedetail := make([]map[string]interface{}, 0)
-	druginputData := make(map[string]interface{})
-	druginputData["drug_trac_codg"] = struct3502.DrugTracCodg
-	feedetail = append(feedetail,druginputData)
+	codes := strings.Split(struct3502.DrugTracCodg, ",")
+	for _, item := range codes {
+		druginputData := make(map[string]interface{})
+		druginputData["drug_trac_codg"] = item
+		feedetail = append(feedetail, druginputData)
+	}
 	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
-
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -7118,7 +7125,6 @@ func Gdyb3503(struct3503 models.Struct3503, secret_key string) (string, string)
 	input["purcinfo"] = feedetailInfo
 	inputMessage["input"] = input //交易输入
 
-
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -7239,11 +7245,11 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	inputMessage := SetGdInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := 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接口返回）
@@ -7285,17 +7291,16 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	//input["selinfo"] = inputData
 	feedetail := make([]map[string]interface{}, 0)
 
-	codes := strings.Split(struct3505.DrugTracCodg,",")
-	for _,item := range codes{
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
 		druginputData := make(map[string]interface{})
 		druginputData["drug_trac_codg"] = item
-		feedetail = append(feedetail,druginputData)
+		feedetail = append(feedetail, druginputData)
 	}
 	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
-
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {
@@ -7345,11 +7350,11 @@ func Gdyb3506(struct3506 models.Struct3506, secret_key string) (string, string)
 	inputMessage := SetGdInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
 	input := make(map[string]interface{})
 	inputData := 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接口返回）
@@ -7368,7 +7373,6 @@ func Gdyb3506(struct3506 models.Struct3506, secret_key string) (string, string)
 	inputData["memo"] = ""                                         // 人员编号 （来自1101接口返回）
 	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
 
-
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -8477,18 +8481,27 @@ func Gzyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
-	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
-	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
-	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
-	inputData["rx_flag"] = struct3502.RxFlag                    //
+	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsHilistId     // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno            // 人员编号 （来自1101接口返回）
+	inputData["pric"] = struct3502.Pric                                 // 人员编号 （来自1101接口返回）
+	inputData["cnt"] = struct3502.Cnt                                   // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3502.RxFlag                            //
 
 	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
 	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
 	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
 
+	feedetail := make([]map[string]interface{}, 0)
+	codes := strings.Split(struct3502.DrugTracCodg, ",")
+	for _, item := range codes {
+		druginputData := make(map[string]interface{})
+		druginputData["drug_trac_codg"] = item
+		feedetail = append(feedetail, druginputData)
+	}
+	inputData["drugtracinfo"] = feedetail
+
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -8697,11 +8710,11 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 
 	input := make(map[string]interface{})
 	inputData := 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接口返回）
@@ -8729,18 +8742,31 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (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["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType                          // 人员编号 （来自1101接口返回）
+	inputData["rtal_docno"] = struct3505.RtalDocno          // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo            // 人员编号 （来自1101接口返回）
+	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 
-	inputData["bchno"] = struct3505.Bchno                          // 人员编号 （来自1101接口返回）
-	inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["bchno"] = struct3505.Bchno // 人员编号 （来自1101接口返回）
+	//inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
 	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
 	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
+
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
+		druginputData := make(map[string]interface{})
+		druginputData["drug_trac_codg"] = item
+		feedetail = append(feedetail, druginputData)
+	}
+	inputData["drugtracinfo"] = feedetail
+	input["selinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -8755,7 +8781,6 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	//gdyb_url := ""
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	//url := "" + "3505"
 	url := "http://hosp-gz.gd.hsip.gov.cn/ebus/gdyb_api/prd/hsa/hgs/" + "3505"