11月9日库存管理

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -736,6 +736,11 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		if adminUserInfo.Org.Id == 10307 || adminUserInfo.Org.Id == 10445 {
 			afterevaluation.ActualUltrafiltration = weight_loss * 1000 //中能建的计量单位是毫升（ml）
 		}
+		//北方营口
+		if adminUserInfo.Org.Id == 10445 {
+			prescribe, _ := service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			afterevaluation.ActualDisplacement = prescribe.DisplaceLiquiValue
+		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -87,7 +87,9 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+
 	scheduals_json_str, _ := redis.Get(key).Result()
+
 	redis.Set(key, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -786,7 +788,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
 
-	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
+	if adminUserInfo.Org.Id == 10340 {
 
 		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
 		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -967,6 +969,10 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyOne, "", time.Second)
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"receiveTreatmentAsses": receiveTreatmentAsses,
@@ -996,6 +1002,11 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		fmt.Println("--------------------------------", recordDateStr)
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
+		redis.Set(keyOne, "", time.Second)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"receiveTreatmentAsses": receiveTreatmentAsses,
@@ -1617,6 +1628,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		redis.Set(key, "", time.Second)
 
 		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
@@ -1849,6 +1861,7 @@ func (c *DialysisAPIController) Finish() {
 
 		tempassessmentAfterDislysis.ActualTreatmentHour = hour
 		tempassessmentAfterDislysis.ActualTreatmentMinute = minute
+
 	}
 
 	if fmonitorRecords.ID > 0 && endmonitorRecords.ID > 0 {
@@ -1870,7 +1883,14 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 		}
 
-		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
+		//北方营口医院
+		if adminUserInfo.Org.Id == 10445 {
+			//获取最后一条透析处方数据
+			lastprescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+			tempassessmentAfterDislysis.ActualDisplacement = lastprescription.DisplaceLiquiValue
+		} else {
+			tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
+		}
 
 	}
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -300,7 +300,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	}
 
 	// stockType, _ := service.GetStockType(orgid)
-	// zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
+	//zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 	// if err != nil {
 	// 	this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 	// 	return
@@ -308,7 +308,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schedule": list,
 		// "stockType": stockType,
-		// "zonelist":  zonelist,
+		//"zonelist":  zonelist,
 	})
 
 	// id := this.GetMobileAdminUserInfo().Org.Id
@@ -534,11 +534,11 @@ func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
 func (this *StaffScheduleApiController) UpdateBloodSchedule() {
 
 	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println(patient_id)
 	mode_id, _ := this.GetInt64("mode_id")
 	schedule_type, _ := this.GetInt64("schedule_type")
 	start_time, _ := this.GetInt64("start_time")
 	bed_id, _ := this.GetInt64("bed_id")
+	orgid := this.GetMobileAdminUserInfo().Org.Id
 	//更改排班
 	schedule := models.XtSchedule{
 		ScheduleType: schedule_type,
@@ -546,7 +546,7 @@ func (this *StaffScheduleApiController) UpdateBloodSchedule() {
 	}
 
 	//查询该床位该班次是否存在排班
-	_, errschedulecode := service.GetPatientScheduleIsExist(start_time, schedule_type, bed_id)
+	_, errschedulecode := service.GetPatientScheduleIsExist(start_time, schedule_type, bed_id, orgid)
 	if errschedulecode == gorm.ErrRecordNotFound {
 		service.UpdatedSchedule(schedule, patient_id, start_time, schedule_type, bed_id)
 		this.ServeSuccessJSON(map[string]interface{}{

models/schedule_models.go

@@ -610,3 +610,24 @@ type WeekScheduleSeven struct {
 func (WeekScheduleSeven) TableName() string {
 	return "xt_schedule"
 }
+
+type ScheduleNewPatients struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId         int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId           int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate        int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType        int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek        int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId              int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport            int64  `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+}
+
+func (ScheduleNewPatients) TableName() string {
+	return "xt_schedule"
+}

service/doctor_schedule_service.go

@@ -746,10 +746,10 @@ func GetDialyisSolution(patientid int64, recorddate int64) (*models.DialysisPres
 	return &prescription, nil
 }
 
-func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64) (*models.Schedule, error) {
+func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64, user_org_id int64) (*models.ScheduleNewPatients, error) {
 
-	schedule := models.Schedule{}
-	err := XTReadDB().Model(&schedule).Where("schedule_date = ? and schedule_type = ? and bed_id = ? and status = 1", startime, schedule_type, bed_id).Find(&schedule).Error
+	schedule := models.ScheduleNewPatients{}
+	err := XTReadDB().Model(&schedule).Where("schedule_date = ? and schedule_type = ? and bed_id = ? and status = 1 and user_org_id = ?", startime, schedule_type, bed_id, user_org_id).Find(&schedule).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}

service/mobile_dialysis_service.go

@@ -38,7 +38,7 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 	}
 
 	err := db.Preload("DialysisLastOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Order("dialysis_date desc").Where("status = 1 AND user_org_id = ? and dialysis_date < ?", orgID, scheduleDate)
+		return db.Order("dialysis_date desc").Where(" status = 1 AND user_org_id = ? and dialysis_date>=1672502400 && dialysis_date < ?", orgID, scheduleDate)
 	}).Preload("DialysisSolution", "status = 1 and user_org_id = ? and solution_status = 1", orgID).Find(&vms).Error
 	return vms, err
 }