医保对接

models/his_models.go

@@ -505,12 +505,12 @@ type HisPrescription struct {
 	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,ScheduleDate" json:"info"`
-	Total                 string                 `gorm:"-" json:"total" form:"total"`
-	PType                 int64                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	MedType               string                 `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	TempHisOrder          TempHisOrder           `gorm:"ForeignKey:Number,MedType;AssociationForeignKey:BatchNumber,MedType" json:"order"`
+	HisAdditionalCharge []*HisAdditionalCharge `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
+	HisPrescriptionInfo HisPrescriptionInfo    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	Total               string                 `gorm:"-" json:"total" form:"total"`
+	PType               int64                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType             string                 `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	TempHisOrder        TempHisOrder           `gorm:"ForeignKey:Number,MedType;AssociationForeignKey:BatchNumber,MedType" json:"order"`
 }
 
 func (HisPrescription) TableName() string {
@@ -1044,6 +1044,7 @@ type VMHisPatient struct {
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 }
 
 func (VMHisPatient) TableName() string {

service/his_project_service.go

@@ -402,7 +402,7 @@ func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []strin
 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
 	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1")
-	}).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
+	}).Preload("HisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("HisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }

service/his_service.go

@@ -856,7 +856,7 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 		Preload("HisHospitalCheckRecord", "status = 1 AND user_org_id = ?", user_org_id)
 	db = db.Preload("HisFundSettleListResult", "status = 1")
 	db = db.Count(&total)
-	err = db.Limit(limit).Offset(offset).Order("setl_time desc,ctime").Find(&order).Error
+	err = db.Limit(limit).Offset(offset).Order("settle_accounts_date desc,ctime").Find(&order).Error
 	return
 }