耗材参数

controllers/dialysis_record_api_controller.go

@@ -228,7 +228,9 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
+	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
+	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
+
 	if getDialysisSolutionErr != nil {
 		this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

models/dialysis.go

@@ -810,6 +810,7 @@ type XtDialysisOrders struct {
 	Number         int64  `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }
 
 type TreatmentMode struct {

service/mobile_dialysis_service.go

@@ -1336,6 +1336,19 @@ func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (*models.D
 	return &record, nil
 }
 
+func GetDialysisSolutionOne(orgID int64, mode_id int64) (*models.DialysisSolution, error) {
+	var record models.DialysisSolution
+	err := readDb.Model(&models.DialysisSolution{}).Where("user_org_id = ? and status = 1 AND mode_id = ?", orgID, mode_id).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func GetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
@@ -1950,9 +1963,25 @@ func BatchDeleteMonitor(ids []string) (err error) {
 	return
 }
 
-func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64) (order []*models.XtDialysisOrder, err error) {
+func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64) (order []*models.XtDialysisOrders, err error) {
+
+	//err = XTReadDB().Where("patient_id = ? and dialysis_date>=? and dialysis_date<=?  and status = 1", patientid, startime, endtime).Find(&order).Error
+	//return order, err
+
+	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_schedule as s")
+	fmt.Println(table)
+	if patientid > 0 {
+		db = db.Where("x.patient_id")
+	}
+	if startime > 0 {
+		db = db.Where("x.dialysis_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.dialysis_date <= ?", endtime)
+	}
 
-	err = XTReadDB().Where("patient_id = ? and dialysis_date>=? and dialysis_date<=?  and status = 1", patientid, startime, endtime).Find(&order).Error
+	err = db.Select("x.id,x.dialysis_date,x.schedual_type,s.mode_id").Joins("left join x.patient_id = s.patient_id and x.dialysis_date = s.schedule_date ").Scan(&order).Error
 	return order, err
 }