耗材参数

models/his_models.go

@@ -294,6 +294,7 @@ type HisPrescription struct {
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
+	XtHisAdditionalCharge  []*XtHisAdditionalCharge  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"additionalcharge"`
 }
 
 func (HisPrescription) TableName() string {
@@ -802,3 +803,30 @@ type XtHisTreatmentTemplate struct {
 func (XtHisTreatmentTemplate) TableName() string {
 	return "xt_his_treatment_template"
 }
+
+type XtHisAdditionalCharge struct {
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	AdminUserId        int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_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"`
+	CreatedTime        int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime        int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	ItemName           string  `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ItemId             int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Creator            int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	BatchNumber        string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	OrderStatus        int64   `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PrescriptionNumber string  `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+}
+
+func (XtHisAdditionalCharge) TableName() string {
+	return "his_additional_charge"
+}

service/his_project_service.go

@@ -389,7 +389,7 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1").Preload("HisDoctorAdviceInfo", "status = 1").Preload("HisPrescriptionProject", "status = 1").Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1").Preload("HisDoctorAdviceInfo", "status = 1").Preload("HisPrescriptionProject", "status = 1").Preload("XtHisAdditionalCharge", "status = 1").Find(&prescription).Error
 	//err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ? and prescription_id = ?", his_patient_id, recorddate, prescription_id).Find(&prescription).Error
 	return prescription, err
 }