历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3352,10 +3352,14 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || template.TemplateId == 70) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || adminUserInfo.Org.Id == 10599) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
+			if adminUserInfo.Org.Id == 10597 { //adminUserInfo.Org.Id == 9538
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+			}
+
 			//针对医师汇
 			if adminUserInfo.Org.Id == 10121 {
 				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
@@ -4359,12 +4363,17 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || template.TemplateId == 70) && adminInfo.Org.Id != 9538 {
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10599) && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 
 			}
 
+			if adminInfo.Org.Id == 10597 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			if adminInfo.Org.Id == 10510 {
 				record.UltrafiltrationRate = 0
 			}
@@ -4435,6 +4444,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
+			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 {
+				record.UltrafiltrationRate = 0
+			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4452,7 +4464,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || template.TemplateId == 70 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || adminInfo.Org.Id == 10599 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -4460,6 +4472,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
+	if adminInfo.Org.Id == 10597 {
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+		record.UltrafiltrationVolume = ultrafiltration_volume
+	}
+
 	//长沙南雅
 	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
 
@@ -4502,9 +4519,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	if adminInfo.Org.Id == 10510 {
 		record.UltrafiltrationVolume = 0
 	}
+	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"monitor": record,
+		"monitor":               record,
+		"lastMonitorRecordList": lastMonitorRecordList,
 	})
 
 }
@@ -8145,6 +8164,8 @@ func (c *DialysisAPIController) GetPrescriptionList() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	schedule_type, _ := c.GetInt64("schedule_type")
+	partion_id, _ := c.GetInt64("partion_id")
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -8167,7 +8188,7 @@ func (c *DialysisAPIController) GetPrescriptionList() {
 		}
 		endTime = theTime.Unix()
 	}
-	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId)
+	schedulelist, _ := service.GetMobileScheduleListOne(startTime, endTime, orgId, schedule_type, partion_id)
 
 	fmt.Println("schedulelist22222222", schedulelist)
 	c.ServeSuccessJSON(map[string]interface{}{

models/patient_models.go

@@ -487,6 +487,7 @@ type DialysisPrescriptionList struct {
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

service/gobal_config_service.go

@@ -510,7 +510,7 @@ func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, or
 	return
 }
 
-func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (schedulelist []*models.XtScheduleList, err error) {
+func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64, schedule_type int64, partion_id int64) (schedulelist []*models.XtScheduleList, err error) {
 
 	db := XTReadDB().Model(&schedulelist).Where("status =1 and user_org_id =?", org_id)
 	if start_time > 0 {
@@ -519,6 +519,12 @@ func GetMobileScheduleListOne(start_time int64, end_time int64, org_id int64) (s
 	if end_time > 0 {
 		db = db.Where("schedule_date<=?", end_time)
 	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type =?", schedule_type)
+	}
+	if partion_id > 0 {
+		db = db.Where("partition_id = ?", partion_id)
+	}
 	err = db.Preload("DialysisSolution", "status=1 and user_org_id =? and solution_status =1", org_id).Preload("DialysisPrescription", "status=1 and user_org_id =?", org_id).Find(&schedulelist).Error
 
 	return schedulelist, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -308,6 +308,7 @@ type AssessmentBeforeDislysisVM struct {
 	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
 	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
 	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
+	PunctureNeedleDirection        string  `gorm:"column:puncture_needle_direction" json:"puncture_needle_direction" form:"puncture_needle_direction"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {