11月9日库存管理

service/his_hospital_service.go

@@ -560,3 +560,8 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ?", patient_id).Last(&psn).Error
 	return
 }
+
+func GetHisPrescriptionProjectByIDTwo(id int64) (projects models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
+	return
+}

service/new_stock_service.go

@@ -80,7 +80,7 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 
-	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1 and x.total_count > 0 and x.org_id =?", orgId)
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =?", orgId)
 
 	if good_type == 2 {
 		db = db.Where(" x.total_count<=x.stock_warn_count")

service/self_drug_service.go

@@ -1819,9 +1819,9 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and is_check = 1", orgId)
 	}
 
-	if len(goodIds) > 0 {
-		db = db.Where("id in(?)", goodIds)
-	}
+	//if len(goodIds) > 0 {
+	//	db = db.Where("id in(?)", goodIds)
+	//}
 
 	if len(keyword) > 0 {
 		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)