Browse Source

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx 3 years ago
parent
commit
9c51660b4e
2 changed files with 13 additions and 4 deletions
  1. 1 1
      models/his_models.go
  2. 12 3
      service/his_service.go

+ 1 - 1
models/his_models.go View File

@@ -727,7 +727,7 @@ type HisOrderInfo struct {
727 727
 	OverPricPsnPay         float64                `gorm:"column:over_pric_psn_pay" json:"over_pric_psn_pay" form:"over_pric_psn_pay"`
728 728
 	AllowReimburse         float64                `gorm:"column:allow_reimburse" json:"allow_reimburse" form:"allow_reimburse"`
729 729
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
730
-	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
730
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
731 731
 }
732 732
 
733 733
 func (HisOrderInfo) TableName() string {

+ 12 - 3
service/his_service.go View File

@@ -898,12 +898,21 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
898 898
 	return
899 899
 }
900 900
 
901
+func GetProjectDetailTwo(id int64) (models.HisProject, error) {
902
+	project := models.HisProject{}
903
+	err := XTReadDB().Model(&project).Where("id=? and status = 1", id).Find(&project).Error
904
+	return project, err
905
+}
906
+
901 907
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
902 908
 	db := readDb.Model(&models.HisOrderInfo{})
903
-	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
904
-		return db.Preload("HisProject", "status = 1").Where("status = 1")
905
-	})
909
+	db = db.Preload("HisPrescriptionProject", "status = 1")
906 910
 	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
911
+	for _, item := range order {
912
+		project, _ := GetProjectDetailTwo(item.HisPrescriptionProject.ProjectId)
913
+		item.HisPrescriptionProject.HisProject = project
914
+
915
+	}
907 916
 	return
908 917
 }
909 918