11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -853,7 +853,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {
@@ -899,7 +899,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {
@@ -989,7 +989,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
-				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, adminUserInfo.CurrentOrgId, item.DrugId)
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, adminUserInfo.CurrentOrgId, item.DrugId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, it := range list {

controllers/his_api_controller.go

@@ -1198,6 +1198,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										//}
 
 										good, _ := service.GetGoodInformationByGoodId(project_id)
+										fmt.Println("parsetotal3232323223233232232323233", parsetotal, good.SumCount)
 										if parsetotal > good.SumCount {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -90,6 +90,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	scheduals_json_str, _ := redis.Get(key).Result()
 	redis.Set(key, "", time.Second)
+	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
 
@@ -98,7 +99,7 @@ func (this *DialysisAPIController) Scheduals() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		} else {
 			if len(scheduals) > 0 {
-				patients, _ := service.GetAllPatientListSix(orgID)
+
 				devices, _ := service.GetAllDevicetByListSix(orgID)
 				advices, _ := service.GetAllAdvicestByList(orgID, date.Unix())
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
@@ -4163,7 +4164,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
 							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminUser.Org.Id)
+							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
 							var sum_count int64
 							var sum_in_count int64
 							for _, it := range goodList {
@@ -4314,7 +4315,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
 					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 					var sum_count int64
 					var sum_in_count int64
 					for _, it := range goodList {
@@ -4357,7 +4358,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
 					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 					var sum_count int64
 					var sum_in_count int64
 					for _, it := range goodList {
@@ -4875,6 +4876,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 	//出库逻辑
 	err = service.ConsumablesDeliveryTotal(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4905,14 +4907,14 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 		//查询默认仓库
 		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.ProjectId, adminInfo.Org.Id)
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
 		var sum_count int64
 		var sum_in_count int64
 		for _, it := range goodList {
 			sum_count += it.StockCount
 			sum_in_count += it.WarehousingCount
 		}
-		service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, adminInfo.Org.Id)
+		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 
 	}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3855,7 +3855,6 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
-			fmt.Println("key2332323223323232323232323", key)
 
 			redis.Set(key, "", time.Second)
 
@@ -3870,9 +3869,9 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
 			redis.Set(key, "", time.Second)
-			fmt.Println("key2332323223323232323232323", key)
+
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":advice_list_all"
-			fmt.Println("key2332323223323232323232323", keyTwo)
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -4009,6 +4008,52 @@ func (c *PatientApiController) ExecProject() {
 	adminInfo := c.GetMobileAdminUserInfo()
 
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+
+	if project.Type == 3 {
+		good, _ := service.GetGoodInformationByGoodId(project.ProjectId)
+		if good.IsUser != 1 {
+
+			//查询开关是否开启
+			stockSetting, _ := service.FindStockSettingById(adminInfo.Org.Id)
+
+			//开关已经开启
+			if stockSetting.IsType == 1 {
+				theTime, _ := time.ParseInLocation(timeLayout2, execution_time, loc)
+				scheduleDateStart := theTime.Format("2006-01-02")
+				timeLayout3 := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
+				//查询该耗材是否已经出库
+				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				if auto.ID == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
+					return
+				}
+			}
+		}
+
+		if good.IsUser == 1 && good.IsWarehouse == 1 {
+
+			//查询开关是否开启
+			stockSetting, _ := service.FindStockSettingById(adminInfo.Org.Id)
+
+			//开关已经开启
+			if stockSetting.IsType == 1 {
+				theTime, _ := time.ParseInLocation(timeLayout2, execution_time, loc)
+				scheduleDateStart := theTime.Format("2006-01-02")
+				timeLayout3 := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
+				//查询该耗材是否已经出库
+				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				if auto.ID == 0 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
+					return
+				}
+			}
+		}
+	}
+
 	if project.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 		return

controllers/secondary_order_api_contorller.go

@@ -1488,7 +1488,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			//查询默认仓库
 			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseInfo, orgId, item.ProjectId)
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
 			var sum_count int64
 			var sum_in_count int64
 			for _, it := range list {
@@ -1534,7 +1534,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 
 			//查询默认仓库
 			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.ProjectId, item.UserOrgId)
+			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
 			var sum_count int64
 			var sum_in_count int64
 			for _, it := range goodList {

controllers/stock_good_api_controller.go

@@ -176,7 +176,7 @@ func (c *StockGoodApiController) GetAllGoodType() {
 	goodTypes, err := service.FindAllGoodType(adminUserInfo.CurrentOrgId)
 	houseList, _ := service.GetAllStoreHouseListTwo(adminUserInfo.CurrentOrgId)
 	storehouselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
-	goodInfo, _ := service.FindAllGoodInfo(adminUserInfo.CurrentOrgId)
+	goodInfo, _ := service.FindAllGoodInfoTwo(adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

@@ -783,7 +783,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				//查询该机构默认仓库
 				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, item := range goodList {
@@ -823,7 +823,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				//查询该机构默认仓库
 				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
 				var sum_count int64
 				var sum_in_count int64
 				for _, item := range goodList {

enums/error_code.go

@@ -90,6 +90,7 @@ const ( // ErrorCode
 	ErrorCodeNotSelectLapsetoType           = 1042
 	ErrorCodeNotSelectLapsetoTime           = 1043
 	ErrorCodeEquitNoExist                   = 1045
+	ErrorCodeStockExced                     = 1046
 
 	ErrorCodeInspectionDateExit    = 1201
 	ErrorCodeInspectionAddFail     = 1202
@@ -477,6 +478,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHospitalExistDataException: "该患者已经入院，请选办理出院结算后再进行办理入院操作",
 
 	ErrorCodeRecordFailedException: "记录不存在",
+
+	ErrorCodeStockExced: "请先出库,执行失败",
 }
 
 type SGJError struct {

models/patient_models.go

@@ -22,6 +22,7 @@ type MSchedualPatientList struct {
 	Name               string `gorm:"column:name" json:"name" form:"name"`
 	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 }
 
 func (MSchedualPatientList) TableName() string {

service/secondary_service.go

@@ -980,9 +980,9 @@ func ModifyStoreWarehouse(id int64, orgid int64, good_id int64) error {
 
 	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id in(?) and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id  = ? and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehousing_id in(?) and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehousing_id = ? and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -996,9 +996,9 @@ func GetStoreWarehouseOutById(id int64, orgid int64) (models.WarehouseOut, error
 func ModifyWarehouseOut(id int64, orgid int64, good_id int64) error {
 	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id in(?) and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? and org_id = ? and status =1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_id in(?) and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_id = ? and user_org_id = ? and status = 1 and good_id = ?", id, orgid, good_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -1030,9 +1030,9 @@ func DeleteStoreWarehousingId(id int64, orgid int64, drug_id int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id in(?) and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id  = ? and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_id in(?) and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_id = ? and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -1046,9 +1046,9 @@ func GetStoreDrugWarehouseOutById(id int64, orgid int64) (models.DrugWarehouseOu
 func DeleteStoreWarehouseOut(id int64, orgid int64, drug_id int64) error {
 	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id in(?) and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and org_id = ? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_id in(?) and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_id = ? and user_org_id =? and status = 1 and drug_id = ?", id, orgid, drug_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/stock_service.go

@@ -6329,8 +6329,9 @@ func UpdateGoodByGoodId(good_id int64, sum_count int64, sum_in_count int64, orgi
 
 func GetDrugDetailSummary(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (adviceinfo []*models.BloodHisDoctorAdviceInfo, total int64, err error) {
 
-	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1 and x.execution_state = 1")
-
+	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as x d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.advice_date >= ?", startime)
 	}
@@ -6344,17 +6345,19 @@ func GetDrugDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Group("x.drug_id").Find(&adviceinfo).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Group("x.drug_id").Scan(&adviceinfo).Error
 	return adviceinfo, total, err
 }
 
 func GetDrugDetailSummaryOne(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (adviceinfo []*models.BloodHisDoctorAdviceInfo, total int64, err error) {
 
-	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1 and x.execution_state = 1")
-
+	db := XTReadDB().Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as x d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.advice_date >= ?", startime)
 	}
@@ -6369,10 +6372,11 @@ func GetDrugDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Find(&adviceinfo).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Scan(&adviceinfo).Error
 	return adviceinfo, total, err
 }
 
@@ -6384,8 +6388,9 @@ func GetAllDrugSummary(orgid int64) (drug []*models.BaseDrugLib, err error) {
 
 func GetGoodDetailSummary(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (project []*models.BloodHisPrescriptionProject, total int64, err error) {
 
-	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.execution_state = 1 and x.type = 3")
-
+	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1  and x.type = 3")
+	table := XTReadDB().Table("xt_good_information as d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.record_date >= ?", startime)
 	}
@@ -6399,17 +6404,19 @@ func GetGoodDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_good_information as d on d.id = x.drug_id").Where("d.good_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ?", likeKey)
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.project_id").Find(&project).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.project_id").Scan(&project).Error
 	return project, total, err
 }
 
 func GetGoodDetailSummaryOne(startime int64, endtime int64, keyword string, limit int64, page int64, orgid int64) (project []*models.BloodHisPrescriptionProject, total int64, err error) {
 
-	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.execution_state = 1 and x.type = 3")
-
+	db := XTReadDB().Table("his_prescription_project as x").Where("x.status = 1 and x.type = 3")
+	table := XTReadDB().Table("xt_good_information as d")
+	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.record_date >= ?", startime)
 	}
@@ -6423,10 +6430,11 @@ func GetGoodDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("left join sgj_xt.xt_good_information as d on d.id = x.drug_id").Where("d.good_name like ?", likeKey).Group("d.id")
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ? ", likeKey)
 	}
+
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&project).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.id").Scan(&project).Error
 	return project, total, err
 }
 
@@ -6468,3 +6476,10 @@ func FindStockSettingById(orgid int64) (models.XtStockSetting, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
 	return setting, err
 }
+
+func GetAutoStockOutById(good_id, record_date int64, orgid int64, patient_id int64) (models.BloodAutomaticReduceDetail, error) {
+
+	detail := models.BloodAutomaticReduceDetail{}
+	err := XTReadDB().Where("good_id = ? and record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, orgid, patient_id).Find(&detail).Error
+	return detail, err
+}