耗材参数

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1903,7 +1903,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			}
 			//针对监利大垸医院
 			if template.TemplateId == 41 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
 				fmt.Println("hhhh232332322323232332", ultrafiltration_rate)
 			}
 
@@ -2469,7 +2469,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if template.TemplateId == 41 {
-				ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				fmt.Println("hhhhhhhhhh", prescription.TargetUltrafiltration)
+				fmt.Println("jj2332323322323", float64(totalMin))
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
 				fmt.Println("ultrafiltration_rate000304293929329238328328328328238328328", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}

controllers/schedule_api_controller.go

@@ -2383,6 +2383,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
 		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
+		fmt.Println("e23332232323232323322323", err)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

models/patient_models.go

@@ -1197,3 +1197,93 @@ type VmPatients struct {
 func (VmPatients) TableName() string {
 	return "xt_patients"
 }
+
+type XtAssessmentBeforeDislysis struct {
+	ID                             int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AssessmentDate                 int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	DialysisOrderId                int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	Temperature                    float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	PulseFrequency                 float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
+	BreathingRate                  float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	SystolicBloodPressure          float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
+	DiastolicBloodPressure         float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
+	BloodPressureType              int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
+	DryWeight                      float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	WeightAfterLastTransparency    float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency" form:"weight_after_last_transparency"`
+	WeighingWay                    string  `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
+	WeighingBefore                 float64 `gorm:"column:weighing_before" json:"weighing_before" form:"weighing_before"`
+	AdditionalWeight               float64 `gorm:"column:additional_weight" json:"additional_weight" form:"additional_weight"`
+	WeightBefore                   float64 `gorm:"column:weight_before" json:"weight_before" form:"weight_before"`
+	WeightGain                     float64 `gorm:"column:weight_gain" json:"weight_gain" form:"weight_gain"`
+	PreloadedDewatering            float64 `gorm:"column:preloaded_dewatering" json:"preloaded_dewatering" form:"preloaded_dewatering"`
+	UltrafiltrationAmount          float64 `gorm:"column:ultrafiltration_amount" json:"ultrafiltration_amount" form:"ultrafiltration_amount"`
+	DialysisInterphase             string  `gorm:"column:dialysis_interphase" json:"dialysis_interphase" form:"dialysis_interphase"`
+	LastPostDialysis               string  `gorm:"column:last_post_dialysis" json:"last_post_dialysis" form:"last_post_dialysis"`
+	SymptomBeforeDialysis          string  `gorm:"column:symptom_before_dialysis" json:"symptom_before_dialysis" form:"symptom_before_dialysis"`
+	InternalFistula                string  `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
+	InternalFistulaSkin            string  `gorm:"column:internal_fistula_skin" json:"internal_fistula_skin" form:"internal_fistula_skin"`
+	CatheterBend                   int64   `gorm:"column:catheter_bend" json:"catheter_bend" form:"catheter_bend"`
+	Catheter                       string  `gorm:"column:catheter" json:"catheter" form:"catheter"`
+	Complication                   string  `gorm:"column:complication" json:"complication" form:"complication"`
+	Evaluator                      int64   `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
+	Creater                        int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Remark                         string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Status                         int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                    int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                    int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Modifier                       int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	BloodAccessPartId              string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	BloodAccessPartOperaId         int64   `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+	IsHemorrhage                   int64   `gorm:"column:is_hemorrhage" json:"is_hemorrhage" form:"is_hemorrhage"`
+	Hemorrhage                     string  `gorm:"column:hemorrhage" json:"hemorrhage" form:"hemorrhage"`
+	HemorrhageOther                string  `gorm:"column:hemorrhage_other" json:"hemorrhage_other" form:"hemorrhage_other"`
+	PunctureMethod                 string  `gorm:"column:puncture_method" json:"puncture_method" form:"puncture_method"`
+	BloodAccessInternalFistula     string  `gorm:"column:blood_access_internal_fistula" json:"blood_access_internal_fistula" form:"blood_access_internal_fistula"`
+	InternalFistulaOther           string  `gorm:"column:internal_fistula_other" json:"internal_fistula_other" form:"internal_fistula_other"`
+	BloodAccessNoise               int64   `gorm:"column:blood_access_noise" json:"blood_access_noise" form:"blood_access_noise"`
+	PunctureWay                    string  `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
+	VenousCatheterization          int64   `gorm:"column:venous_catheterization" json:"venous_catheterization" form:"venous_catheterization"`
+	VenousCatheterizationPart      int64   `gorm:"column:venous_catheterization_part" json:"venous_catheterization_part" form:"venous_catheterization_part"`
+	VenousCatheterizationPartOther string  `gorm:"column:venous_catheterization_part_other" json:"venous_catheterization_part_other" form:"venous_catheterization_part_other"`
+	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii" form:"ductus_arantii"`
+	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment" form:"emergency_treatment"`
+	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other" form:"emergency_treatment_other"`
+	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
+	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
+	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
+	MachineType                    string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	IsInfect                       int64   `gorm:"column:is_infect" json:"is_infect" form:"is_infect"`
+	Exposed                        float64 `gorm:"column:exposed" json:"exposed" form:"exposed"`
+	Skin                           string  `gorm:"column:skin" json:"skin" form:"skin"`
+	SkinOther                      string  `gorm:"column:skin_other" json:"skin_other" form:"skin_other"`
+	InfectOther                    string  `gorm:"column:infect_other" json:"infect_other" form:"infect_other"`
+	DuctusArantiiOther             string  `gorm:"column:ductus_arantii_other" json:"ductus_arantii_other" form:"ductus_arantii_other"`
+	PunctureNeedle                 string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	DialysisIntakesUnit            int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit" form:"dialysis_intakes_unit"`
+	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom" form:"humor_excessive_symptom"`
+	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other" form:"last_post_dialysis_other"`
+	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other" form:"symptom_before_dialysis_other"`
+	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other" form:"dialysis_interphase_other"`
+	Pinholing                      string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
+	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
+	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
+	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
+	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
+	SpecialTreatment               string  `gorm:"column:special_treatment" json:"special_treatment" form:"special_treatment"`
+	CatheterMaintenance            string  `gorm:"column:catheter_maintenance" json:"catheter_maintenance" form:"catheter_maintenance"`
+	ThrombusAv                     string  `gorm:"column:thrombus_av" json:"thrombus_av" form:"thrombus_av"`
+	ThromubusA                     string  `gorm:"column:thromubus_a" json:"thromubus_a" form:"thromubus_a"`
+	ThromubusV                     string  `gorm:"column:thromubus_v" json:"thromubus_v" form:"thromubus_v"`
+	ThromubusType                  int64   `gorm:"column:thromubus_type" json:"thromubus_type" form:"thromubus_type"`
+	Dehydration                    string  `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	PreDialysisDrugs               string  `gorm:"column:pre_dialysis_drugs" json:"pre_dialysis_drugs" form:"pre_dialysis_drugs"`
+	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
+	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
+	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
+}
+
+func (XtAssessmentBeforeDislysis) TableName() string {
+	return "xt_assessment_before_dislysis"
+}

models/schedule_models.go

@@ -139,7 +139,8 @@ type WeekSchedule struct {
 	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	//DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
-	DialysisSolution DialysisSolution `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }
 
 func (WeekSchedule) TableName() string {
@@ -187,14 +188,15 @@ type VmSchedulesRemind struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	DeviceZone           DeviceZone             `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber         DeviceNumber           `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisOrder        DialysisOrder          `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	XtPatients           XtPatients             `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
-	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisPrescription DialysisPrescription   `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisSolution     DialysisSolution       `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	XtPatients                 XtPatients                 `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {

service/gobal_config_service.go

@@ -659,7 +659,7 @@ func GetDrugCountList(startime int64, endtime int64, orgid int64) (info []*model
 	return info, err
 }
 
-func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
+func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 
 	if startime > 0 {
@@ -671,7 +671,7 @@ func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("sum(x.stock_min_number) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("sum(x.warehousing_count) as warehousing_count,x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/schedule_service.go

@@ -605,7 +605,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
@@ -630,7 +630,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
@@ -807,6 +807,7 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
+		Preload("XtAssessmentBeforeDislysis", "status = 1").
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {