main.go

@@ -58,13 +58,13 @@ type ResultEmpty10265 struct {
 func init() {
 	//service.ConnectNMMSDB()
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	////CreateLog(miConfig)
-	////UploadLog(miConfig)31
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)31
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 }
 func main() {
 	//service.AutoCreateStock()

models/his_models.go

@@ -528,6 +528,9 @@ type HisPrescriptionProject struct {
 	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"`
+	IsUpload  int64  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	UploadDate  string      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 
 	HisProject       HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	GoodInfo         GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`

models/models_3501.go

@@ -828,11 +828,8 @@ Certno         string
 PsnName        string
 Memo           string
 TrdnFlag       string
-UpdtTime       string
 OpterName      string
 Rid            string
-CrteTime       string
-OptTime        string
 OpterId        string
 CrterName      string
 CrterId        string

models/new_stock_models.go

@@ -140,6 +140,8 @@ type NewWarehouseOutInfo struct {
 	OverCount               int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	Manufacturers           Manufacturer    `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
 	Dealers                 Dealers         `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+
+
 }
 
 func (NewWarehouseOutInfo) TableName() string {

service/ahyb_service.go

@@ -1265,7 +1265,7 @@ func AHyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = 0 //
@@ -3552,9 +3552,8 @@ func AHyb3506(struct3506 models.Struct3506, secret_key string, request_url strin
 	inputMessage["infno"] = "3506"                                  // 交易编码
 	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3506.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
-
 	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
 	inputData["psn_no"] = struct3506.PsnNo                         // 人员编号 （来自1101接口返回）
 	inputData["psn_cert_type"] = struct3506.PsnCertType            // 人员编号 （来自1101接口返回）
@@ -3571,6 +3570,8 @@ func AHyb3506(struct3506 models.Struct3506, secret_key string, request_url strin
 	inputData["sel_retn_opter_name"] = struct3506.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = ""                                         // 人员编号 （来自1101接口返回）
 	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_sn"] = struct3506.MdtrtSn                                         // 人员编号 （来自1101接口返回）
+
 
 	feedetail := make([]map[string]interface{}, 0)
 

service/fj_service.go

@@ -748,7 +748,7 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype               // 险种类型
 	inputData["invono"] = ""                       // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
@@ -780,7 +780,7 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	return output, requestLog, err_msg
 }
 
-func FJyb2207ForToken(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 FJyb2207ForToken(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()
@@ -828,6 +828,8 @@ func FJyb2207ForToken(psnNo string, mdtrtId string, chrgBchno string, certNo str
 	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
+	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
@@ -1029,13 +1031,11 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 
 	inputData["insutype"] = businessParams.Insutype // 险种
 	fmt.Println(businessParams.ClrType)
-	if len(businessParams.ClrType) > 0 {
-		inputData["clr_type"] = "9903"
-	} else {
 
-		inputData["clr_type"] = "11"
 
-	}
+	inputData["clr_type"] = businessParams.ClrType
+
+
 	// 就诊 ID（来自2201接口返回）
 	inputData["setl_optins"] = "350581"                               // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间

service/gdyb_service.go

@@ -1755,7 +1755,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
@@ -7108,6 +7108,8 @@ func Gdyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
+
+
 	reader := bytes.NewReader(bytesData)
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
 	gdyb_url := beego.AppConfig.String("gdyb_url")

service/gxyb_service.go

@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"bytes"
+	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 
@@ -183,7 +184,7 @@ func Gxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype               // 险种类型
 	inputData["invono"] = ""                       // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //

service/hb_service.go

@@ -1271,7 +1271,7 @@ func HeBeiyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 	inputData["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype               // 险种类型
 	inputData["invono"] = ""                       // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //

service/hbyb_service.go

@@ -8,7 +8,6 @@ import (
 	"gdyb/models"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
-	"github.com/go-ole/go-ole/oleutil"
 	"io/ioutil"
 	"net/http"
 	"os/exec"
@@ -16,6 +15,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/go-ole/go-ole/oleutil"
+	"github.com/go-ole/go-ole"
+
+
 )
 
 type Charset string
@@ -638,7 +642,7 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype               // 险种类型
 	inputData["invono"] = ""                       // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
@@ -646,7 +650,7 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
 
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	input["data"] = inputData

service/his_service.go

@@ -364,6 +364,72 @@ func (VMDrugCancelStockInfo) TableName() string {
 	return "xt_drug_cancel_stock_info"
 }
 
+type GoodInfo111 struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
+	Code               string    `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases  int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord           int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus         string    `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount       int64     `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign               int64     `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault          int64     `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse        int64     `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict    int64     `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork   int64     `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort               int64     `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse        int64     `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent              string    `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber         string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
+
+	IsUser             int64     `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	PackingUnit        string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Number             string    `gorm:"column:number" json:"number" form:"number"`
+	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"`
+
+	IsZeroFlag           int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+
+
+
+
+}
+
+func (GoodInfo111) TableName() string {
+	return "xt_good_information"
+}
+
 type BaseDrugLib struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
@@ -447,6 +513,11 @@ func GetDrugLibById(id int64) (list BaseDrugLib, err error) {
 		Where("id = ?  AND status = 1", id).First(&list).Error
 	return
 }
+func GetGoodLibById(id int64) (list GoodInfo111, err error) {
+	err = readDb.Model(&GoodInfo111{}).
+		Where("id = ?  AND status = 1", id).First(&list).Error
+	return
+}
 
 
 func CreateAddtionalCharge(charge *models.HisAdditionalCharge) (err error) {
@@ -643,6 +714,7 @@ type HisOrder struct {
 	SetlDetail              string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
 	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"`
+	MdtrtId            string `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -1577,24 +1649,24 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-04-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 
 func GetAllHisOrder9504() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 9504  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 9504  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-04-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 
 func GetAllHisOrder10028() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10028  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-02-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10028  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-04-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 func GetAllHisOrder10610() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2025-04-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1605,7 +1677,7 @@ func GetOrderError10138() (order []*models.HisOrderError, err error) {
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
 
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2025-03-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2025-04-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1792,6 +1864,11 @@ func GetNewDrugFlowInfoByPatient( drug_id int64, time int64, org_id int64) (flow
 	return
 }
 
+func GetNewGoodFlowInfoByPatient( drug_id int64, time int64, org_id int64) (flows models.NewWarehouseOutInfo, err error) {
+	err = readDb.Model(&models.NewWarehouseOutInfo{}).Where("org_id = ? and status = 1   and good_id = ? and sys_record_time = ?", org_id, drug_id, time).Last(&flows).Error
+	return
+}
+
 func GetNewUploadDrugFlowInfoByPatientTwo(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1  and patient_id = ? and drug_id = ? and system_time = ? and is_sale = 1", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
@@ -1892,7 +1969,10 @@ func GetSaleDate(id string) (flow models.DrugFlow) {
 	 readDb.Model(&models.DrugFlow{}).Where("id = ?",id).First(&flow)
 	return
 }
-
+func GetSaleDatetwo(id string) (flow models.HisDoctorAdviceInfo) {
+	readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?",id).First(&flow)
+	return
+}
 func GetBbx01ByTeamID(team_id int64) (team models.XtHisProjectTeam) {
 	err = readDb.Model(&models.XtHisProjectTeam{}).Where("id = ?", team_id).First(&team).Error
 	return
@@ -2172,6 +2252,8 @@ type HisPrescriptionProject struct {
 	Checker        int64 `gorm:"column:checker" json:"checker" form:"checker"`
 	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
 	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	IsUpload  int64  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 
 	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
@@ -2230,6 +2312,15 @@ func SaveDoctoradviceStatus(id int64,upload_date string) {
 
 }
 
+func SaveDoctoradviceStatus2(id int64) {
+	writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 0,"upload_date":""})
+
+}
+func SavePStatus(id int64,upload_date string) {
+	writeDb.Model(&models.HisPrescriptionProject{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 1,"upload_date":upload_date})
+
+}
+
 func SaveDoctoradviceStatusTwo(id int64) {
 	writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"is_upload": 0})
 
@@ -2240,6 +2331,16 @@ func FindHisAdviceDocAdvice(id int64) (advice []*models.HisDoctorAdviceInfo, err
 	err = db.Find(&advice).Error
 	return advice, err
 }
+func FindHisAdviceDocAdvice2(id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+	db := XTReadDB().Model(&advice).Where("status= 1 and id = ? and is_upload = 1", id)
+	err = db.Find(&advice).Error
+	return advice, err
+}
+func FindHisPAdvice(id int64) (advice []*models.HisPrescriptionProject, err error) {
+	db := XTReadDB().Model(&advice).Where("status= 1 and id = ? and is_upload <> 1", id)
+	err = db.Find(&advice).Error
+	return advice, err
+}
 
 
 func FinddelHisAdviceDocAdvice(id int64) (advice []*models.HisDoctorAdviceInfo, err error) {

service/hn_service.go

@@ -822,7 +822,7 @@ func Hnyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = acct_used_flag   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype               // 险种类型
 	inputData["invono"] = ""                       // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //

service/jsyb_service.go

@@ -972,7 +972,7 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["insutype"] = insutype             // 险种类型
 	inputData["invono"] = ""                     // 发票号
 
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //

service/jx_service.go

@@ -940,7 +940,7 @@ func Jxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["certno"] = certno                   // 发票号
 	inputData["psn_type"] = psn_type               // 发票号
 	inputData["psn_name"] = psn_name               // 发票号
-	inputData["minpacunt_drug_trac_cn"] = pack_num // 发票号
+	inputData["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData2 := make(map[string]interface{})

service/nm_service.go

@@ -795,7 +795,7 @@ 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["minpacunt_drug_trac_cnt"] = pack_num // 发票号
 	inputData["mcs_trac_cnt"] = good_pack_num      // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //