提交代码

models/new_drug_stock.go

@@ -63,6 +63,7 @@ type NewDrugFlow struct {
 	PCount                    float64
 	SDate                     string
 	PDate                     int64
+	Unit                      string
 }
 
 func (NewDrugFlow) TableName() string {

routers/router.go

@@ -87,5 +87,5 @@ func init() {
 	controllers.SignApiRegistRouters()
 	controllers.ZuobiaoApiRegistRouters()
 	controllers.HisExportDataApiRegistRouters()
-	//controllers.NewStockApiRegistRouters()
+	controllers.NewStockApiRegistRouters()
 }

service/new_stock_medical_insurance_service.go

@@ -45,6 +45,19 @@ func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTi
 
 	//}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Preload("XtDrugWarehouseOutInfo", "status = 1").Find(&drug_flow).Error
-
+	for _, item := range drug_flow {
+		var doc models.HisDoctorAdviceInfo
+		var p models.HisPrescription
+		readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", item.AdviceId).First(&doc)
+		readDb.Model(&models.HisPrescription{}).Where("id = ?", doc.PrescriptionId).First(&p)
+		item.PDate = p.RecordDate
+		item.PCount = doc.PrescribingNumber
+		item.Unit = doc.PrescribingNumberUnit
+		if p.OrderStatus == 2 && len(p.BatchNumber) > 0 {
+			var ho models.HisOrder
+			readDb.Model(&models.HisOrder{}).Where("user_org_id = ? and number = ?", p.UserOrgId, p.BatchNumber).First(&ho)
+			item.SDate = ho.SetlTime
+		}
+	}
 	return drug_flow, total, err
 }