11月8日库存管理

service/patient_service.go

@@ -413,7 +413,7 @@ func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHis
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":his_advices_list_all"
 	his_advices_all, _ := redis.Get(key).Result()
-	fmt.Println("hish233232222332232323232323", len(his_advices_all))
+
 	if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
 		if err != nil {
@@ -523,6 +523,10 @@ func FindPatientByIdTwo(orgID int64, id int64) (patient models.XtPatientsNew, er
 	return
 }
 
+//func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
+// err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
+// return
+//}
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -2607,3 +2611,11 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 		return prescriptions, nil
 	}
 }
+
+func GetAllHisProjectPrescription(orgid int64, recorddate int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and record_date = ? and status = 1", orgid, recorddate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("GoodsType", "status = 1").Where("status = 1 ")
+	}).Find(&project).Error
+	return project, err
+}