历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2330,7 +2330,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.ID = dialysisPrescription.ID
 
-		err := service.UpDateDialysisPrescription(&prescription)
+		service.UpDateDialysisPrescription(&prescription)
 
 		//记录日志
 		byterequest, _ := json.Marshal(prescription)
@@ -2360,7 +2360,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			PatientId:  id,
 		}
 
-		dialysisFinish, err := service.GetDialysisFinish(adminUserInfo.Org.Id, recordDate.Unix(), 1, id)
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.Org.Id, recordDate.Unix(), 1, id)
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
@@ -2400,21 +2400,20 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
 		redis.Set(keySeven, "", time.Second)
 
-		if err == nil {
-			updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
-			keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
-
-			//清空key 值
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			if updateErr != nil {
-				utils.ErrorLog("%v", updateErr)
-			}
+		updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
+		keyTwoOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 
-			c.ServeSuccessJSON(map[string]interface{}{
-				"prescription": prescription,
-			})
+		//清空key 值
+		redis.Set(keyTwoOne, "", time.Second)
+		defer redis.Close()
+		if updateErr != nil {
+			utils.ErrorLog("%v", updateErr)
 		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"prescription": prescription,
+		})
+
 	}
 
 }
@@ -4462,8 +4461,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10551 {
+			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 {
+
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				fmt.Println("金阿迪发到付阿道夫", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
@@ -4525,7 +4526,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
 	}
 
-	if adminInfo.Org.Id == 10551 {
+	if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 {
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
 		record.UltrafiltrationVolume = ultrafiltration_volume / 1000

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1282,3 +1282,30 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 	}
 }
+
+func (c *StaffScheduleApiController) UpdateMobileSchedule() {
+
+	id_one, _ := c.GetInt64("id_one")
+	id_two, _ := c.GetInt64("id_two")
+	schedule_date := c.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", schedule_date+" 00:00:00", loc)
+
+	mode_id, _ := c.GetInt64("mode_id")
+	bed_id, _ := c.GetInt64("bed_id")
+	zone_id, _ := c.GetInt64("zone_id")
+	schedule_type, _ := c.GetInt64("schedule_type")
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+
+	schedule, _ := service.GetSchedulePatientIdByPatient(id_one, startTime.Unix(), orgId)
+
+	if schedule.ID > 0 {
+		service.UpdateMobileSchedule(id_two, mode_id, bed_id, zone_id, schedule_type, schedule.ID)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -35,4 +35,7 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("m/api/schedule/changescheduletype", &StaffScheduleApiController{}, "Get:ChangeScheduleType")
 
 	beego.Router("m/api/schedule/changeschedulebed", &StaffScheduleApiController{}, "Get:ChangeScheduleBed")
+
+	beego.Router("m/api/schedule/updateschedule", &StaffScheduleApiController{}, "UpdateMobileSchedule")
+
 }

models/new_stock_models.go

@@ -145,32 +145,33 @@ func (NewBaseDrug) TableName() string {
 }
 
 type NewBaseDrugOne struct {
-	ID                  int64                  `gorm:"column:id" json:"id" form:"id"`
-	DrugName            string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec            string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugStockLimit      string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	MaxUnit             string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber           int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit             string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                string                 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit            string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	RetailPrice         float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MinPrice            float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	LastPrice           float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	Number              string                 `gorm:"column:number" json:"number" form:"number"`
-	OrgId               int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugWarehouseInfo   []*VsDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
-	XtDrugStockCount    []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_count"`
-	DrugStockCount      []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_info"`
-	TotalCount          int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
-	IsUser              int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	BatchRetaiPrice     float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
-	DrugStockLimitCount int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
-	SumCount            int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
-	SumInCount          int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
-	IsPharmacy          int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
-	Manufacturer        int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer              int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec               string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugStockLimit         string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	MaxUnit                string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice            float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice               float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice              float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	Number                 string                 `gorm:"column:number" json:"number" form:"number"`
+	OrgId                  int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugWarehouseInfo      []*VsDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	XtDrugStockCount       []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_count"`
+	DrugStockCount         []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_info"`
+	TotalCount             int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	IsUser                 int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice        float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	DrugStockLimitCount    int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	SumCount               int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount             int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	IsPharmacy             int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	Manufacturer           int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (NewBaseDrugOne) TableName() string {

service/schedule_service.go

@@ -1811,3 +1811,19 @@ func UpdateRepeatSchStatus(user_org_id int64, schedule_date int64) {
 	}
 
 }
+
+func GetSchedulePatientIdByPatient(patient_id int64, schedule_date int64, user_org_id int64) (models.Schedule, error) {
+
+	schedule := models.Schedule{}
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status =1", patient_id, schedule_date, user_org_id).Find(&schedule).Error
+	return schedule, err
+}
+
+func UpdateMobileSchedule(id_two int64, mode_id int64, bed_id int64, zone_id int64, schedule_type int64, id int64) error {
+
+	schedule := models.Schedule{}
+
+	err = XTWriteDB().Model(&schedule).Where("id = ? and status=1", id).Updates(map[string]interface{}{"patient_id": id_two, "mode_id": mode_id, "bed_id": bed_id, "partition_id": zone_id, "schedule_type": schedule_type}).Error
+
+	return err
+}