排班

controllers/schedule_api_controller.go

@@ -91,8 +91,8 @@ func ScheduleApiRegistRouters() {
 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)
+	sch, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_one)
+	sch_two, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_two)
 	order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	if order.ID > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderOne)
@@ -103,8 +103,19 @@ func (c *ScheduleApiController) CoverSch() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
 		return
 	}
+	count, _ := service.GetScheduleCountByDate(c.GetAdminUserInfo().CurrentOrgId, sch_two.ScheduleDate, sch_two.PatientId)
+	if count > 1 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientScheduleRepeat)
+		return
+	}
+
+	count1, _ := service.GetScheduleCountByDate(c.GetAdminUserInfo().CurrentOrgId, sch_two.ScheduleDate, sch.PatientId)
+	if count1 > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientScheduleRepeat)
+		return
+	}
 
-	var new_sch *models.Schedule
+	var new_sch models.Schedule
 	new_sch = sch
 	new_sch.BedId = sch_two.BedId
 	new_sch.ScheduleDate = sch_two.ScheduleDate
@@ -112,14 +123,10 @@ func (c *ScheduleApiController) CoverSch() {
 	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(sch, sch_two)
 	//生成新的排班
-	service.SaveSchTwo(new_sch)
-	//service.UpdateScheduleThree(sch,sch_two)
+	service.SaveSch(new_sch)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "覆盖成功",
 	})
@@ -140,9 +147,20 @@ func (c *ScheduleApiController) ExchangeSch() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientDialysisOrderTwo)
 		return
 	}
+
+	//count1, _ := service.GetScheduleCountByDate(c.GetAdminUserInfo().CurrentOrgId,sch.ScheduleDate,sch.PatientId)
+	//if count1 > 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientScheduleRepeat)
+	//	return
+	//}
+	//count2, _ := service.GetScheduleCountByDate(c.GetAdminUserInfo().CurrentOrgId,sch_two.ScheduleDate,sch_two.PatientId)
+	//if count2 > 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientScheduleRepeat)
+	//	return
+	//}
 	service.UpdateScheduleThree(sch, sch_two)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "替换成功",
+		"msg": "交换成功",
 	})
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {

enums/error_code.go

@@ -271,6 +271,7 @@ const ( // ErrorCode
 
 	ErrorCodePatientDialysisOrderOne = 60000000
 	ErrorCodePatientDialysisOrderTwo = 60000001
+	ErrorCodePatientScheduleRepeat   = 60000002
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -527,6 +528,7 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodePatientDialysisOrderOne: "替换的患者已经上机,无法替换排班",
 	ErrorCodePatientDialysisOrderTwo: "被替换的患者已经上机,无法替换排班",
+	ErrorCodePatientScheduleRepeat:   "一天只能存在一次排班",
 }
 
 type SGJError struct {

models/his_charge_models.go

@@ -104,6 +104,9 @@ type HisChargeOrder struct {
 	FundPaySumamt      float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
 	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	IsUploadDiagnose   int64   `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo  int64   `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess    int64   `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	PsnCashPay          float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	IsMedicineInsurance int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`

models/his_models.go

@@ -502,7 +502,10 @@ type TempHisOrder struct {
 	FaPiaoCode            string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber          string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 
-	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	AdminUser         AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	IsUploadDiagnose  int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64     `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64     `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	SettleType      int64  `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64  `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
@@ -1054,6 +1057,9 @@ type HisOrder struct {
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis               string                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	FaPiaoBatchnumberId     int64                   `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	IsUploadDiagnose        int64                   `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo       int64                   `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess         int64                   `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (HisOrder) TableName() string {
@@ -1604,6 +1610,9 @@ type NewHisOrder struct {
 	PatientId          int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	VMHisOrderInfo     []*VMHisOrderInfo `gorm:"ForeignKey:Number;AssociationForeignKey:OrderNumber" json:"order_info"`
 	HisPatient         HisPatient        `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+	IsUploadDiagnose   int64             `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo  int64             `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess    int64             `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (NewHisOrder) TableName() string {
@@ -1699,6 +1708,9 @@ type VMHisOrderTwo struct {
 	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"his_hospital_patient"`
 
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+	IsUploadDiagnose    int64               `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo   int64               `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess     int64               `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
@@ -1845,6 +1857,9 @@ type NewCustomHisOrder struct {
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsUploadDiagnose      int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo     int64     `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess       int64     `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
@@ -2114,6 +2129,9 @@ type VmHisOrder struct {
 	Diagnosis               string    `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	FaPiaoBatchnumberId     int64     `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
 	Decimal                 float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	IsUploadDiagnose        int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo       int64     `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess         int64     `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (VmHisOrder) TableName() string {
@@ -2135,6 +2153,9 @@ type NewHisOrderTwo struct {
 	PsnName            string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
 	PsnType            string `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
 	Certno             string `gorm:"column:certno" json:"certno" form:"certno"`
+	IsUploadDiagnose   int64  `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo  int64  `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess    int64  `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	NewHisChargeOrderInfo     []*NewHisChargeOrderInfo  `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
 	NewHisHospitalCheckRecord NewHisHospitalCheckRecord `gorm:"ForeignKey:Number;AssociationForeignKey:Number" json:"his"`
@@ -2276,6 +2297,9 @@ type HisOrderTenty struct {
 	HisOrderInfoTwenty           []*HisOrderInfoTwenty        `gorm:"ForeignKey:OrderId;AssociationForeignKey:ID" json:"order_info"`
 	Patients                     Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisHospitalCheckRecordTwenty HisHospitalCheckRecordTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"hisPatient"`
+	IsUploadDiagnose             int64                        `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo            int64                        `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess              int64                        `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 }
 
 func (HisOrderTenty) TableName() string {

service/app_version.go

@@ -1034,7 +1034,10 @@ func SaveSch(sch models.Schedule) (err error) {
 	return
 }
 
-func SaveSchTwo(sch *models.Schedule) (err error) {
-	err = writeDb.Save(&sch).Error
+func SaveSchTwo(sch models.Schedule, sch_two models.Schedule) (err error) {
+	//err = writeDb.Save(&sch).Error
+	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch.ID).Updates(map[string]interface{}{"status": 0}).Error
+	err = writeDb.Model(&Schedule{}).Where("status=1 AND id = ?", sch_two.ID).Updates(map[string]interface{}{"status": 0}).Error
+
 	return
 }

service/schedule_service.go

@@ -1450,3 +1450,10 @@ func GetLastDialysisSolutionType(org_id int64, patient_id int64, mode_id int64)
 	return dialysisprescription, err
 
 }
+
+func GetScheduleTen(orgID, id int64) (models.Schedule, error) {
+	var schedule models.Schedule
+	var err error
+	err = readDb.Model(&models.Schedule{}).Where("id = ? and user_org_id=? and status=1", id, orgID).First(&schedule).Error
+	return schedule, err
+}

service/smart_sch.go

@@ -166,3 +166,8 @@ func GetAllAvaildTemplateDeviceNumbersByZone(orgID int64, weekday int64, schedul
 	}
 	return vms, nil
 }
+
+func GetScheduleCountByDate(org_id int64, schedule_date int64, patient_id int64) (total int64, err error) {
+	err = readDb.Model(&models.SmartSchedule{}).Where(" user_org_id = ? AND schedule_date = ? AND status = 1 AND patient_id = ?", org_id, schedule_date, patient_id).Count(&total).Error
+	return
+}