2024/6/17

controllers/dialysis_api_controller.go

@@ -4863,12 +4863,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1703952000 {
+		if xttime <= 1735574400 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}
 
-		if xttime >= 1704038400 {
+		if xttime >= 1735660800 {
 			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}

controllers/drug_stock_api_contorller.go

@@ -3583,6 +3583,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 				"max_unit":               drup.MaxUnit,
 				"msg":                    2,
 			})
+			tx.Rollback()
 			return
 		}
 	}
@@ -3609,7 +3610,12 @@ func (c *StockDrugApiController) CheckDrugOut() {
 
 	}
 	warehousingOutInfoListThree, _ := service.GetNewDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
+
+	var is_success = 2
 	for _, it := range warehousingOutInfoListThree {
+
+		var his_count = it.Count
+		var his_count_unit = it.CountUnit
 		medical, _ := service.GetNewBaseDrugMedical(it.DrugId, tx)
 		drup, _ := service.FindNewBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 		//出库逻辑
@@ -3637,6 +3643,47 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		}
 		//更新基础库库存
 		service.UpdateNewBaseDrugSumTwo(it.DrugId, sum_count_one, it.OrgId, tx)
+
+		if it.OrgId == 10164 || it.OrgId == 10721 {
+			var now_count int64
+
+			if his_count_unit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				now_count = his_count * medical.MinNumber
+			}
+			if his_count_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				now_count = his_count
+			}
+			if his_count_unit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				now_count = his_count
+			}
+
+			var flow_count int64
+
+			//查询该药品的出库数量
+			drugflowlist, _ := service.GetDrugOutFlowByWarehouseOut(it.DrugId, it.ID, it.OrgId, tx)
+			if len(drugflowlist) > 0 {
+				for _, items := range drugflowlist {
+
+					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+						flow_count = items.Count * medical.MinNumber
+					}
+					if items.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+						flow_count = items.Count
+					}
+					if items.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+						flow_count = items.Count
+					}
+				}
+			}
+
+			if now_count != flow_count {
+				is_success = 1
+				tx.Rollback()
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+				return
+			}
+		}
+
 	}
 
 	out := models.DrugWarehouseOut{
@@ -3645,18 +3692,22 @@ func (c *StockDrugApiController) CheckDrugOut() {
 	//更新审核状态
 	service.UpdateNewCheckDrugOut(out, warehouse_out_id, tx)
 
-	tx.Commit()
+	//查询
+	if is_success != 1 {
+		tx.Commit()
+		c.ServeSuccessJSON(map[string]interface{}{
+			"warehousingOutInfoList": warehousingOutInfoList,
+			"drug_name":              "",
+			"dose":                   "",
+			"dose_unit":              "",
+			"min_number":             "",
+			"min_unit":               "",
+			"max_unit":               "",
+			"msg":                    1,
+		})
+		return
+	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"warehousingOutInfoList": warehousingOutInfoList,
-		"drug_name":              "",
-		"dose":                   "",
-		"dose_unit":              "",
-		"min_number":             "",
-		"min_unit":               "",
-		"max_unit":               "",
-		"msg":                    1,
-	})
 }
 
 func (c *StockDrugApiController) ToReturnCheck() {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3900,10 +3900,14 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || adminUserInfo.Org.Id == 10599 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || adminUserInfo.Org.Id == 10599) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
+			if adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+			}
+
 			if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10679 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 			}
@@ -5182,12 +5186,18 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10745) && adminInfo.Org.Id != 9538 {
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10599) && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 
 			}
 
+			//重庆塘坝卫生院
+			if adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10745 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10679 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate

controllers/pharmacy_controller.go

@@ -50,6 +50,8 @@ func PharmacyApiRegistRouters() {
 
 	beego.Router("/api/pharmacy/changeZeroFlag", &PharmacyController{}, "Get:ChangeZeroFlag")
 
+	beego.Router("/api/pharmacy/getdrugtocalcount", &PharmacyController{}, "Get:GetDrugTocalCount")
+
 }
 
 // 测试
@@ -1446,3 +1448,28 @@ func (this *PharmacyController) ChangeZeroFlag() {
 	})
 
 }
+
+func (this *PharmacyController) GetDrugTocalCount() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	drug_id, _ := this.GetInt64("drug_id")
+	start_time := this.GetString("start_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	adviceList, _ := service.GetDrugTocalCountByDrugId(drug_id, startTime, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+}

controllers/print_data_api_controller.go

@@ -107,14 +107,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
-				if item.ScheduleDate <= 1703952000 {
+				if item.ScheduleDate <= 1735574400 {
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
 					item.Count = listOne.Count
 				}
 
-				if item.ScheduleDate >= 1704038400 {
+				if item.ScheduleDate >= 1735660800 {
 
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 

controllers/stock_in_api_controller.go

@@ -7304,6 +7304,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 
 	////出库逻辑
 	for _, item := range warehousingOutInfo {
+
 		// 查询该耗材是否有库存
 		warehouseOne, _ := service.FindNewWarehousingInfoTen(item.GoodId, item.StorehouseId, tx)
 
@@ -7323,10 +7324,14 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		}
 
 	}
+	var is_scucess = 2
+
 	for _, item := range warehousingOutInfo {
 
 		creater := this.GetAdminUserInfo().AdminUser.Id
 
+		var now_count = item.Count
+
 		//出库
 		err := service.ConsumablesNewDeliveryThirty(orgId, item.SysRecordTime, item, &warehouseOut, item.Count, creater, tx)
 
@@ -7353,12 +7358,31 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		//基础库扣减库存
 		service.UpdateNewGoodInfoReduceSumCount(item.GoodId, total_count, orgId, tx)
 
+		var flow_count int64
+		flowList, _ := service.GetGoodFlowByWarehouseOutId(item.GoodId, item.OrgId, item.ID, tx)
+		if len(flowList) > 0 {
+			for _, items := range flowList {
+				flow_count += items.Count
+			}
+		}
+
+		if now_count != flow_count {
+			is_scucess = 1
+			tx.Rollback()
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFlow)
+			return
+
+		}
+
 	}
 
 	//审核单据
 	err := service.UpdatedNewWarehouseOut(id, tx)
 
-	tx.Commit()
+	if is_scucess != 1 {
+		tx.Commit()
+	}
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":                "2",
@@ -7366,6 +7390,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 			"specification_name": "",
 			"storehose_name":     "",
 		})
+		return
 	}
 
 }
@@ -7492,8 +7517,8 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 				Dealer:                  item.Dealer,
 				Creator:                 Creator,
 				UpdateCreator:           0,
-				Status:                  1,
 				Ctime:                   item.Ctime,
+				Status:                  1,
 				Mtime:                   0,
 				Price:                   item.PackingPrice,
 				WarehousingDetailId:     item.ID,

enums/error_code.go

@@ -287,6 +287,8 @@ const ( // ErrorCode
 	ErrorTimeCodeParamWrong = 600000012
 
 	ErrorCodeAuthWrong = 600000013
+
+	ErrorCodeFlow = 600000014
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -552,6 +554,7 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorTimeCodeParamWrong: "时间跨度不能超过一个月",
 	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
+	ErrorCodeFlow:           "网络错误,数据异常,审核失败",
 }
 
 type SGJError struct {

models/schedule_models.go

@@ -477,6 +477,7 @@ type VmBloodScheduleTwo struct {
 	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
 	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,Mode;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
 	HisPrescriptionProject     []*HisPrescriptionProject  `gorm:"ForeignKey:PatientId,schedule_date;AssociationForeignKey:PatientId,RecordDate" json:"his_prescription_project"`
+	DialysisSolution           DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (VmBloodScheduleTwo) TableName() string {

service/dialysis_solution_service.go

@@ -425,7 +425,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
 					return db.Where("org_id = ? and status = 1", orgID)
 				})
-			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			}).Preload("DialysisSolution", "status =1 and user_org_id = ? and solution_status=1").Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
@@ -443,7 +443,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 				return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
 					return db.Where("org_id = ? and status = 1", orgID)
 				})
-			}).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			}).Preload("DialysisSolution", "status =1 and user_org_id = ? and solution_status=1", orgID).Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)

service/gobal_config_service.go

@@ -665,7 +665,7 @@ func GetAllBaseDrugListTwo(orgid int64) (drug []*models.BaseDrugLibEleven, err e
 	if orgid > 0 {
 		db = db.Where("x.org_id =?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
+	err = db.Select("x.id,x.drug_name,p.manufacturer_name,x.dose,x.dose_unit,x.min_number,x.max_unit,x.min_unit,x.scan_code,x.drug_identification_code").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
 	return drug, err
 }
 

service/mobile_dialysis_service.go

@@ -2889,12 +2889,12 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 }
 
 func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1640966400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 
 func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1704038400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1735660800 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
 

service/patientmanage_service.go

@@ -951,7 +951,7 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan, "patient_type": patients.PatientType}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan, "patient_type": patients.PatientType, "updated_time": time.Now().Unix()}).Error
 
 	return err
 }

service/pharmacy_service.go

@@ -2466,7 +2466,7 @@ func ChangeHisDrugCode(id int64, drug_code string, user_org_id int64) (models.Hi
 
 	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"drug_code": drug_code}).Error
 
-	fmt.Println("eeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
+	fmt.Println("", err)
 	return adviceInfo, err
 }
 
@@ -2560,3 +2560,10 @@ func DispensingMedicineTwo(orgid, patient_id, advice_date, drug_id, creater int6
 
 	return
 }
+
+func GetDrugTocalCountByDrugId(drug_id int64, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and advice_date>=? and user_org_id = ? and status=1 and drug_code!=''", drug_id, advice_date, user_org_id).Find(&advice).Error
+
+	return advice, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -236,13 +236,13 @@ func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDial
 
 func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 
 func GetDialysisOrderCountNight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1704038400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1735660800 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
 	return order, err
 }
 

service/stock_service.go

@@ -1872,6 +1872,20 @@ func GetNewDrugWarehouseOutIsExit(org_id int64, is_sys int, record_time int64, w
 	return drugWarehouseOut, err
 }
 
+func GetNewDrugWarehouseOutIsExitOne(org_id int64, is_sys int, record_time int64, warehousing_out_order string, tx *gorm.DB, id int64) (models.DrugWarehouseOut, error) {
+
+	drugWarehouseOut := models.DrugWarehouseOut{}
+	err := tx.Where("is_sys = ? AND status = 1 AND org_id = ? AND id = ?", is_sys, org_id, id).Find(&drugWarehouseOut).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return drugWarehouseOut, err
+		}
+	}
+
+	return drugWarehouseOut, err
+}
+
 func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 	err := writeDb.Create(&warehouseOut).Error
 	return err
@@ -9108,7 +9122,6 @@ func UpdateNewCheckDrugOut(out models.DrugWarehouseOut, id int64, tx *gorm.DB) e
 		tx.Rollback()
 		return err
 	}
-	tx.Commit()
 	return err
 }
 
@@ -9320,6 +9333,19 @@ func UpdateNewGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64,
 
 }
 
+func GetGoodFlowByWarehouseOutId(good_id int64, user_org_id int64, id int64, tx *gorm.DB) (flow []*models.VmStockFlow, err error) {
+
+	err = tx.Where("good_id = ? and user_org_id = ? and warehouse_out_detail_id = ? and status=1", good_id, user_org_id, id).Find(&flow).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return
+}
+
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64, sum_in_count int64) error {
 
 	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
@@ -10887,3 +10913,16 @@ func GetDrugWarehouseOutInfoByDrugCode(drug_id int64, patient_id int64, advice_d
 
 	return outinfo, err
 }
+
+func GetNewGoodWarehouseOutInfo(good_id int64, user_org_id int64, warehouse_out_id int64, tx *gorm.DB) (info []*models.WarehouseOutInfo, err error) {
+
+	err = tx.Where("good_id = ? and org_id = ? and warehouse_out_id = ? and status= 1", good_id, user_org_id, warehouse_out_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}

service/warhouse_service.go

@@ -6133,6 +6133,18 @@ func UpdateGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64,
 	return err
 }
 
+func GetDrugOutFlowByWarehouseOut(drug_id int64, warehouse_out_detail_id int64, org_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
+
+	err = tx.Where("drug_id = ? and warehouse_out_detail_id = ? and user_org_id = ? and status=1", drug_id, warehouse_out_detail_id, org_id).Find(&flow).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return flow, err
+}
+
 func UpdateNewGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64, tx *gorm.DB) error {
 
 	err := tx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
@@ -10904,14 +10916,6 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		//更新出库数量
 		ModifyNewGoodSumCount(goods.StorehouseId, goods.Count, goods.OrgId, goods.GoodId, tx)
 
-		fmt.Println("warehouse.StockCount----------------", warehouse.StockCount)
-		fmt.Println("warehouse.StockCount----------------", maxNumber)
-		//if warehouse.StockCount < maxNumber {
-		//	tx.Rollback()
-		//	return errors.New("库存数量不足")
-		//
-		//}
-
 		return nil
 	} else {
 		// 出库完成后，要将该批次库存清零
@@ -10978,7 +10982,6 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 
 		goods.Count = deliver_number - stock_number
 
-		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", goods.Count)
 		ConsumablesNewDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator, tx)
 	}
 	return nil