11月9日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode =dev
+runmode =prod
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -2968,7 +2968,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	}
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
 
-		if xttime <= 1640966400 {
+		if xttime <= 1672416000 {
 			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 			patientInfo.TotalDialysis = dialysis_count
 		}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2873,6 +2873,25 @@ func (this *NewDialysisApiController) GetTreateSummary() {
 func (this *NewDialysisApiController) CommitDialysisOrder() {
 
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	fmt.Println("org_id ===23232323232332", org_id)
+
+	//查询所有患者
+
+	list, err := service.GetAllPatientScheduleList(org_id)
+
+	for _, item := range list {
+		//查询所有患者的2022年12月31日以前的上机记录
+		orderList, _ := service.GetAllDialysiOrderList(item.ID, org_id)
+		for _, it := range orderList {
+			dialysOrder, _ := service.GetDialysisTotalCountThree(it.UserOrgId, it.PatientId, it.DialysisDate)
+			service.UpdateDialysisOrderSix(it.PatientId, it.DialysisDate, it.UserOrgId, dialysOrder.Count)
+		}
+	}
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
 
 }

controllers/schedule_api_controller.go

@@ -63,6 +63,7 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule/weekpanelone", &ScheduleApiController{}, "Get:GetWeekPanelsOne")
 	beego.Router("/api/schedule/schedulesone", &ScheduleApiController{}, "Get:GetScheduleOne")
+	beego.Router("/api/schedule/scheduletwo", &ScheduleApiController{}, "Get:GetScheduleTwo")
 	beego.Router("/api/schedule/postscheduletemplate", &ScheduleApiController{}, "Get:SaveScheduleTemplate")
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
@@ -3994,6 +3995,72 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	return
 }
 
+func (c *ScheduleApiController) GetScheduleTwo() {
+
+	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+	patitionIdStr := c.GetString("patitionid")
+
+	ids := strings.Split(patitionIdStr, ",")
+
+	schedule_type, _ := c.GetInt64("schedule_type")
+
+	adminInfo := c.GetAdminUserInfo()
+	weekDateStr := c.GetString("week_date")
+	WeekDayIds := strings.Split(weekDateStr, ",")
+
+	thisTime := time.Now()
+	today := thisTime.Format("2006-01-02")
+	if week < 1 || week > 4 {
+		week = 2
+	}
+	if week == 1 {
+		thisTime = thisTime.AddDate(0, 0, -7)
+	} else if week == 3 {
+		thisTime = thisTime.AddDate(0, 0, 7)
+	} else if week == 4 {
+		thisTime = thisTime.AddDate(0, 0, 14)
+	}
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekStartDay := thisTime.AddDate(0, 0, weekStart)
+	weekEndDay := thisTime.AddDate(0, 0, weekEnd)
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStartPoint := theStarTime.Unix()
+	weekEndPoint := theEndTime.Unix()
+
+	schdules, _ := service.GetWeekScheduleThree(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type, WeekDayIds)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"days":      days,
+		"weekTitle": weekTitle,
+		"schdules":  schdules,
+		"today":     today,
+	})
+	return
+}
+
 func (c *ScheduleApiController) SaveScheduleTemplate() {
 
 	template_id, _ := c.GetInt64("template_id")
@@ -4043,7 +4110,6 @@ func (c *ScheduleApiController) ChangeFuncPrint() {
 	}
 
 	_, errcode := service.GetDataPrintByOrgId(orgId)
-	fmt.Println("errcode222234444555556t66", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		service.CreateDataPrint(&dataPrint)
 		c.ServeSuccessJSON(map[string]interface{}{

service/patientmanage_service.go

@@ -1879,3 +1879,36 @@ func DeleteHospitalSummary(id []string) error {
 	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetAllPatientScheduleList(org_id int64) (patient []*models.PatientsThirty, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", org_id).Find(&patient).Error
+
+	return patient, err
+}
+
+func GetAllDialysiOrderList(patient_id int64, org_id int64) (order []*models.DialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status= 1 and dialysis_date<=1672416000", patient_id, org_id).Find(&order).Error
+
+	return order, err
+}
+
+func GetDialysisTotalCountThree(org_id int64, patient_id int64, dialysis_date int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date<=? and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id, dialysis_date).Scan(&order).Error
+
+	return order, err
+}
+
+func UpdateDialysisOrderSix(patient_id int64, dialysis_date int64, user_org_id int64, dialysis_total int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := XTWriteDB().Model(&order).Where("patient_id = ? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"dialysis_total": dialysis_total}).Error
+
+	return order, err
+}

service/schedule_service.go

@@ -114,7 +114,6 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
 
 	db := readDb.Table("xt_schedule as s")
-	fmt.Println("schIds2222222")
 	if len(schIds) > 0 {
 		db = db.Where("s.partition_id in (?)", schIds)
 	}
@@ -130,6 +129,28 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
+
+	db := readDb.Table("xt_schedule as s")
+
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	if len(WeekDayIds) > 0 {
+		db = db.Where("s.schedule_week in(?)", WeekDayIds)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
+		Order("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
 func GetDaySchedule(orgID, start, end, patientID int64) (schedule models.Schedule, err error) {
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).First(&schedule).Error
 	return