耗材参数

controllers/manage_api_controller.go

@@ -2944,9 +2944,9 @@ func (this *MachineApiController) SaveMode() {
 	if errcode == gorm.ErrRecordNotFound {
 		err = service.SaveMode(&mode)
 	} else if errcode == nil {
-		fmt.Print("设备型号已存在")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
 	} else {
-		fmt.Print("设备型号已存在")
 	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -83,7 +83,6 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	symptom := this.GetString("symptom")
 	dispose := this.GetString("dispose")
 	conductivity, _ := this.GetFloat("conductivity")
-	fmt.Println("4444444444444444", conductivity)
 	displacement_flow_quantity, _ := this.GetFloat("displacement_flow_quantity")
 	blood_oxygen_saturation := this.GetString("blood_oxygen_saturation")
 	result := this.GetString("result")

models/patient_models.go

@@ -348,6 +348,7 @@ type PatientDialysisRecord struct {
 	AssessmentAfterDislysis AssessmentAfterDislysis `json:"assessment_after_dislysis" gorm:"foreignkey:AssessmentDate;AssociationForeignKey:DialysisDate;"`
 	TreatmentSummary        TreatmentSummary        `json:"treatment_summary" gorm:"foreignkey:AssessmentDate;AssociationForeignKey:DialysisDate;"`
 	Device                  DeviceNumber            `json:"device" gorm:"foreignkey:ID;AssociationForeignKey:BedID;"`
+	MonitoringRecord        []MonitoringRecord      `json:"monitoring_record" gorm:"foreignkey:MonitoringDate;AssociationForeignKey:DialysisDate;"`
 }
 
 type DialysisPrescriptionAddtional struct {

service/patientmanage_service.go

@@ -841,6 +841,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 	var orders []*models.PatientDialysisRecord
 
 	db := readDb.Table("xt_dialysis_order as do").
+		Preload("MonitoringRecord", "patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).
 		Preload("DialysisPrescription", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("PredialysisEvaluation", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {