111

controllers/schedule_api_controller.go

@@ -84,6 +84,66 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/smartsch/get", &ScheduleApiController{}, "Get:GetSmartSch")
 
+	beego.Router("/api/sch/exchange", &ScheduleApiController{}, "Get:ExchangeSch")
+	beego.Router("/api/sch/coversch", &ScheduleApiController{}, "Get:CoverSch")
+
+}
+func (c *ScheduleApiController) CoverSch() {
+	id_one, _ := c.GetInt64("id_one")
+	id_two, _ := c.GetInt64("id_two")
+	sch, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_one)
+	sch_two, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_two)
+	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	if order.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
+		return
+	}
+	order2, _ := service.GetDialysisOrder(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
+	if order2.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
+		return
+	}
+
+	var new_sch *models.Schedule
+	new_sch = sch
+	new_sch.BedId = sch_two.BedId
+	new_sch.ScheduleDate = sch_two.ScheduleDate
+	new_sch.ScheduleWeek = sch_two.ScheduleWeek
+	new_sch.PartitionId = sch_two.PartitionId
+	new_sch.ScheduleType = sch_two.ScheduleType
+	new_sch.ID = 0
+	sch_two.Status = 0
+	sch.Status = 0
+	//删除原来的排班
+	service.SaveSchTwo(sch_two)
+	service.SaveSchTwo(sch)
+	//生成新的排班
+	service.SaveSchTwo(new_sch)
+	//service.UpdateScheduleThree(sch,sch_two)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "覆盖成功",
+	})
+
+}
+func (c *ScheduleApiController) ExchangeSch() {
+	id_one, _ := c.GetInt64("id_one")
+	id_two, _ := c.GetInt64("id_two")
+	sch, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_one)
+	sch_two, _ := service.GetSchedule(c.GetAdminUserInfo().CurrentOrgId, id_two)
+	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
+	if order.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
+		return
+	}
+	order2, _ := service.GetDialysisOrder(sch_two.ScheduleDate, sch_two.PatientId, sch_two.UserOrgId)
+	if order2.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
+		return
+	}
+	service.UpdateScheduleThree(sch, sch_two)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "替换成功",
+	})
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -576,9 +636,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					schedule.Status = 0
 					service.SaveSch(schedule)
 				}
-
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
-
 			}
 		}
 	}
@@ -911,7 +969,6 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 							daySchedule.BedId = schedule.BedId
 							daySchedule.DialysisMachineName = schedule.DialysisMachineName
 							existSchedule.IsExport = 3002
-
 							service.SaveSch(daySchedule)
 						} else {
 							existSchedule.IsExport = 3003

controllers/schedule_template_api_controller.go

@@ -694,14 +694,14 @@ type ParamModelEditSchedule struct {
 
 func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 	addOrEditSchedulesJSON := this.GetString("edit_schs")
-	//delSchedulesJSON := this.GetString("del_schs")
+	delSchedulesJSON := this.GetString("del_schs")
 
 	fmt.Println(addOrEditSchedulesJSON)
 	var addOrEditSchedules []*ParamModelEditSchedule
-	//var delSchedules []*ParamModelEditSchedule
+	var delSchedules []*ParamModelEditSchedule
 
 	parseErr := json.Unmarshal([]byte(addOrEditSchedulesJSON), &addOrEditSchedules)
-	//parseDelErr := json.Unmarshal([]byte(delSchedulesJSON), &delSchedules)
+	json.Unmarshal([]byte(delSchedulesJSON), &delSchedules)
 
 	fmt.Println(parseErr)
 	if parseErr != nil {
@@ -714,6 +714,12 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	//	return
 	//}
+	for _, item := range delSchedules {
+		src_template, _ := service.GetScheduleTemplateItem(item.ID)
+		src_template.Status = 0
+		service.SaveSchTemplateItem(src_template)
+
+	}
 
 	for _, item := range addOrEditSchedules {
 

enums/error_code.go

@@ -268,6 +268,9 @@ const ( // ErrorCode
 	ErrorCodeSchedule = 50000000
 
 	ErrorCodeParamWrongForSchMode = 40000002
+
+	ErrorCodePatientDialysisOrderOne = 60000000
+	ErrorCodePatientDialysisOrderTwo = 60000001
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -521,6 +524,9 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
 	ErrorCodeSchedule:                 "该班次该床位已有患者",
 	ErrorCodeParamWrongForSchMode:     "透析模式不能为空",
+
+	ErrorCodePatientDialysisOrderOne: "替换的患者已经上机,无法替换排班",
+	ErrorCodePatientDialysisOrderTwo: "被替换的患者已经上机,无法替换排班",
 }
 
 type SGJError struct {

models/his_models.go

@@ -131,6 +131,7 @@ type HisPatient struct {
 	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (HisPatient) TableName() string {

service/app_version.go

@@ -679,7 +679,7 @@ func (HisPrescriptionProjectTen) TableName() string {
 }
 
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-11-01 00:00:00' AND in_hosptial_time <= '2022-11-30 23:59:59'", orgid).Find(&paitent).Error
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-12-01 00:00:00' AND in_hosptial_time <= '2022-12-31 23:59:59'", orgid).Find(&paitent).Error
 	return paitent, err
 }
 
@@ -890,7 +890,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("settle_accounts_date >= 1656604800 AND settle_accounts_date <= 1664553599 AND status = 1 AND order_status =2  AND user_org_id = 10138").Find(&order).Error
+	}).Where("settle_accounts_date >= 1664553600 AND settle_accounts_date <= 1672416000 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
@@ -913,7 +913,7 @@ func SaveOrderInfo(info *VmHisOrderInfo9504) {
 }
 
 func GetHisOrderDetail10106(start_time int64, end_time int64) (order []*HisOrder9504, err error) {
-	err = readDb.Model(&HisOrder9504{}).Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
@@ -923,39 +923,50 @@ func GetHisOrderDetail10106(start_time int64, end_time int64) (order []*HisOrder
 	return
 }
 
+func GetHisOrderDetail10318(start_time int64, end_time int64) (order []*HisOrder9504, err error) {
+	err = readDb.Model(&HisOrder9504{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("VMHisProject").Preload("VMGoodInfo")
+		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("Drug")
+		})
+	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2  AND user_org_id = 10318", start_time, end_time).Find(&order).Order("setl_time").Error
+	return
+}
+
 func GetLongSolution() {
 	records, _ := GetAllSchedules()
 	fmt.Println(records)
 	for _, item := range records {
+		var DialysisMachineName string
 		//1.透析器   2.灌流器     3.透析器/灌流器
 		so, _ := GetDialysisSolutionTwo(item.UserOrgId, item.PatientId, item.ModeId)
 		filedRecordOne, _ := FindFiledBy(item.UserOrgId, "透析器")
 		filedRecordTwo, _ := FindFiledBy(item.UserOrgId, "灌流器")
 		filedRecordThree, _ := FindFiledBy(item.UserOrgId, "透析器/灌流器")
 		if filedRecordOne.IsShow == 1 {
-			item.DialysisMachineName = so.DialysisDialyszers
+			DialysisMachineName = so.DialysisDialyszers
 		}
 		if filedRecordThree.IsShow == 1 {
-			if len(item.DialysisMachineName) > 0 {
-				item.DialysisMachineName = item.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 			} else {
-				item.DialysisMachineName = so.DialyzerPerfusionApparatus
+				DialysisMachineName = so.DialyzerPerfusionApparatus
 
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
-			if len(item.DialysisMachineName) > 0 {
-				item.DialysisMachineName = item.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				item.DialysisMachineName = so.DialysisIrrigation
+				DialysisMachineName = so.DialysisIrrigation
 
 			}
 		}
-
+		item.DialysisMachineName = DialysisMachineName
 		UpdateSch(item)
-
 	}
 }
 
@@ -990,7 +1001,7 @@ func (Schedule) TableName() string {
 func GetAllSchedules() ([]Schedule, error) {
 	var record []Schedule
 
-	err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date > 1670774400").Find(&record).Error
+	err := readDb.Model(&Schedule{}).Where("user_org_id = 10290 AND status = 1 AND schedule_date > 1672934400").Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -1022,3 +1033,8 @@ func SaveSch(sch models.Schedule) (err error) {
 	err = writeDb.Save(&sch).Error
 	return
 }
+
+func SaveSchTwo(sch *models.Schedule) (err error) {
+	err = writeDb.Save(&sch).Error
+	return
+}

service/schedule_service.go

@@ -360,6 +360,66 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 
 }
 
+func UpdateScheduleThree(schone *models.Schedule, schtwo *models.Schedule) {
+	utx := XTWriteDB()
+	//床位
+	var tempBedID int64
+	var tempBedIDTwo int64
+
+	//分區
+	var tempPID int64
+	var tempPIDTwo int64
+
+	//上下午
+	var tempTypeID int64
+	var tempTypeTwo int64
+
+	//日期
+	var sch_date_one int64
+	var sch_date_two int64
+
+	//周数
+	var sch_week_one int64
+	var sch_week_two int64
+
+	tempBedID = schone.BedId
+	tempBedIDTwo = schtwo.BedId
+
+	tempPID = schone.PartitionId
+	tempPIDTwo = schtwo.PartitionId
+
+	tempTypeID = schone.ScheduleType
+	tempTypeTwo = schtwo.ScheduleType
+
+	sch_date_one = schone.ScheduleDate
+	sch_date_two = schtwo.ScheduleDate
+
+	sch_week_one = schone.ScheduleWeek
+	sch_week_two = schtwo.ScheduleWeek
+
+	schone.BedId = tempBedIDTwo
+	schtwo.BedId = tempBedID
+
+	schone.PartitionId = tempPIDTwo
+	schtwo.PartitionId = tempPID
+
+	schone.ScheduleType = tempTypeTwo
+	schtwo.ScheduleType = tempTypeID
+
+	schone.ScheduleDate = sch_date_two
+	schtwo.ScheduleDate = sch_date_one
+
+	schone.ScheduleWeek = sch_week_two
+	schtwo.ScheduleWeek = sch_week_one
+
+	schone.IsExport = 9000
+	schtwo.IsExport = 9000
+
+	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "schedule_date": schone.ScheduleDate, "schedule_week": schone.ScheduleWeek, "is_export": 9000})
+	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "schedule_date": schtwo.ScheduleDate, "schedule_week": schtwo.ScheduleWeek, "is_export": 9000})
+
+}
+
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
 
 	err = readDb.Table("xt_schedule as s").