医保对接

models/his_models.go

@@ -2107,3 +2107,64 @@ type VmHisOrder struct {
 func (VmHisOrder) TableName() string {
 	return "his_order"
 }
+
+type NewHisOrderTwo 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"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	PsnName            string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnType            string `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	Certno             string `gorm:"column:certno" json:"certno" form:"certno"`
+
+	NewHisChargeOrderInfo     []*NewHisChargeOrderInfo  `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	NewHisHospitalCheckRecord NewHisHospitalCheckRecord `gorm:"ForeignKey:Number;AssociationForeignKey:Number" json:"his"`
+}
+
+func (NewHisOrderTwo) TableName() string {
+	return "his_order"
+}
+
+type NewHisChargeOrderInfo struct {
+	ID                           int64                        `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber                  string                       `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	AdviceId                     int64                        `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt             float64                      `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                          float64                      `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                         float64                      `gorm:"column:pric" json:"pric" form:"pric"`
+	MedChrgitmType               string                       `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	ChldMedcFlag                 string                       `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv                    string                       `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	HisChargeDoctorAdviceInfo    HisChargeDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
+	PatientId                    int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	InscpScpAmt                  float64                      `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	UploadDate                   int64                        `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+}
+
+func (NewHisChargeOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+type NewHisHospitalCheckRecord struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	Number          string `gorm:"column:number" json:"number" form:"number"`
+	MdtrtCertType   string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime  string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+}
+
+func (NewHisHospitalCheckRecord) TableName() string {
+	return "his_hospital_check_record"
+}

service/his_hospital_service.go

@@ -338,6 +338,9 @@ func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, batch_numb
 func GetHisHospitalUnUploadPrescriptionDetailPatientList(org_id int64, record_date int64, sch_type int64) (patients []*models.HisHospitalCheckRecord, err error) {
 	db := readDb.Model(&models.HisHospitalCheckRecord{})
 	db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.status = 1 AND pre.order_status <> 4 AND pre.order_status <> 2", record_date, org_id)
+	//db = db.Joins("inner join his_prescription pre On pre.patient_id = his_hospital_check_record.patient_id and pre.record_date = ? AND pre.p_type = 1 AND pre.user_org_id = ? AND pre.status = 1 AND pre.order_status <> 4 AND pre.order_status <> 2", record_date, org_id)
+	db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ?", org_id, record_date)
+
 	if sch_type > 0 {
 		db = db.Joins("join xt_schedule as sch ON sch.patient_id = his_hospital_check_record.patient_id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
 	}