11月8日库存管理

service/gobal_config_service.go

@@ -18,12 +18,12 @@ func CreateDrugAutomaticReduceRecord(config *models.DrugStockConfig) (err error)
 }
 
 func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.GobalConfig) {
-	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).First(&config).Error
 	return
 }
 
 func FindDrugStockAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.DrugStockConfig) {
-	err = readDb.Model(&models.DrugStockConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	err = readDb.Model(&models.DrugStockConfig{}).Where("status = 1 AND org_id = ?", org_id).First(&config).Error
 	return
 }
 func UpdateAutomaticReduceRecord(config *models.GobalConfig) (err error) {

service/mobile_dialysis_service.go

@@ -2823,6 +2823,20 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 	if len(keywords) != 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		if schedule_type != 0 {
+			db = db.Where("schedule_type = ?", schedule_type)
+		}
+		if partition_id != 0 {
+			db = db.Where("partition_id = ?", partition_id)
+		}
+		if good_type == 1 {
+			db = db.Where("patient_id in(?)", ids)
+		}
+		if good_type == 2 {
+			if len(ids) > 0 {
+				db = db.Where("patient_id not in(?)", ids)
+			}
+		}
 	} else {
 		if schedule_type != 0 {
 			db = db.Where("schedule_type = ?", schedule_type)
@@ -2834,7 +2848,9 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 			db = db.Where("patient_id in(?)", ids)
 		}
 		if good_type == 2 {
-			db = db.Where("patient_id not in(?)", ids)
+			if len(ids) > 0 {
+				db = db.Where("patient_id not in(?)", ids)
+			}
 		}
 		db = db.Count(&total)
 		offset := (page - 1) * limit
@@ -3696,11 +3712,13 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 
 func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64, execution_state int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
-
+	fmt.Println("patient_id233232332", patient_id)
+	fmt.Println("execution_state2323323322332", execution_state)
+	fmt.Println("patientType2323323322332", patientType)
 	if patientType == 0 {
 
 		if patient_id > 0 {
-			if execution_state > 0 {
+			if execution_state == 1 {
 				db := readDb.
 					Table("xt_schedule").
 					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3714,13 +3732,33 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).
 					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).Where("status = 1 AND user_org_id = ?", orgID)
 				if scheduleDate != 0 {
 					db = db.Where("schedule_date = ?", scheduleDate)
 				}
 				err = db.Find(&vms).Error
-			} else {
+			} else if execution_state == 2 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else if execution_state == 0 {
 				db := readDb.
 					Table("xt_schedule").
 					Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3744,7 +3782,7 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 
 		} else {
 			if patient_id > 0 {
-				if execution_state > 0 {
+				if execution_state == 1 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
@@ -3758,13 +3796,33 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).
 						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
 					}
 					err = db.Find(&vms).Error
-				} else {
+				} else if execution_state == 2 {
+					db := readDb.
+						Table("xt_schedule").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+						}).
+						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+						Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+						Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				} else if execution_state == 0 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
@@ -3787,7 +3845,7 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 				}
 
 			} else {
-				if execution_state > 0 {
+				if execution_state == 1 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3801,13 +3859,34 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).
 						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 						}).Where("status = 1 AND user_org_id = ?", orgID)
 					if scheduleDate != 0 {
 						db = db.Where("schedule_date = ?", scheduleDate)
 					}
 					err = db.Find(&vms).Error
-				} else {
+				} else if execution_state == 2 {
+					fmt.Println("j氯332n323232n323ℹ️33232323232")
+					db := readDb.
+						Table("xt_schedule").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+						}).
+						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+						Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+						Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0  and execution_state =0 ", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0 and execution_state =0 ", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				} else if execution_state == 0 {
 					db := readDb.
 						Table("xt_schedule").
 						Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
@@ -3835,26 +3914,71 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 	}
 
 	if patientType > 0 {
-		db := readDb.
-			Table("xt_schedule").
-			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
-			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-			}).
-			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
-			}).Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if execution_state == 1 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 1", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else if execution_state == 2 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else if execution_state == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	}
 
 	return vms, err

service/schedule_service.go

@@ -1174,12 +1174,18 @@ func GetInitPrintData(patient_id int64, scheduleDate int64, orgid int64) (list [
 		db = db.Where("x.schedule_date >=? and x.schedule_date<=?", scheduleDate, scheduleDate)
 	}
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id asc")
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1 and patient_id = ?", patient_id)
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisPrescription", "status = 1 and record_date = ? and patient_id = ?", scheduleDate, patient_id).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and patient_id = ?", patient_id).Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ? and patient_id = ?", orgid, scheduleDate, patient_id)
 	}).Find(&list).Error
 
 	return list, err
 }
+
+func GetLastWeightAfter(patient_id int64, scheduleDate int64, orgid int64) (models.AssessmentAfterDislysis, error) {
+	dislysis := models.AssessmentAfterDislysis{}
+	err := XTReadDB().Where("user_org_id = ? and  patient_id = ? and assessment_date < ? and status = 1", orgid, patient_id, scheduleDate).Order("id desc").First(&dislysis).Error
+	return dislysis, err
+}

service/secondary_service.go

@@ -827,7 +827,7 @@ func GetAllStoreHouseListTwo(orgid int64) (list []*models.VmStorehouseNameOne, e
 func GetAllStoreHouseConfig(orgid int64) (models.XtStorehouseConfig, error) {
 
 	config := models.XtStorehouseConfig{}
-	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).First(&config).Error
 	return config, err
 }