耗材参数

controllers/dialysis_parameter_api_controller.go

@@ -40,10 +40,22 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 	fmt.Println("scheduletype", schedulType, start_time, partitionType, keywords, theTime.Unix())
 	if len(keywords) > 0 {
 		dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit, theTime.Unix())
+		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords)
+		var vlist []interface{}
+		var elist []interface{}
+		for _, item := range patient {
+			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			vlist = append(vlist, prescription)
+			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			elist = append(elist, dialysis)
+		}
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"schedule": dialysisSchedule,
-				"total":    total,
+				"schedule":     dialysisSchedule,
+				"total":        total,
+				"prescription": vlist,
+				"dialysbefor":  elist,
+				"patient":      patient,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -52,7 +64,7 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 		dialysisSchedule, err, total := service.GetDialysisParameter(adminUserInfo.CurrentOrgId, theTime.Unix(), schedulType, partitionType, page, limit)
 
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit)
+		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords)
 
 		var vlist []interface{}
 		var elist []interface{}
@@ -91,6 +103,7 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 				"total":        total,
 				"prescription": vlist,
 				"dialysbefor":  elist,
+				"patient":      patient,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -208,7 +221,7 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 
 	//查询今日排班的病人
-	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit)
+	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
 	var vlist []interface{}
 	var clist []interface{}
 	for _, item := range patient {
@@ -243,7 +256,7 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 		clist = append(clist, reduece)
 	}
 	//获取透析耗材数据
-	consumables, err := service.GetDialysisConsumables(startime.Unix(), endtime.Unix(), orgId)
+	//consumables, err := service.GetDialysisConsumables(startime.Unix(), endtime.Unix(), orgId)
 
 	//if err == nil {
 	// this.ServeSuccessJSON(map[string]interface{}{
@@ -273,9 +286,9 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 			"good_type":      goodTypes,
 			"total":          total,
 			"schedule":       schedule,
-			"consumables":    consumables,
-			"prescription":   vlist,
-			"reducelist":     clist,
+			//"consumables":    consumables,
+			"prescription": vlist,
+			"reducelist":   clist,
 		})
 		return
 
@@ -298,9 +311,9 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 				"good_type":      goodTypes,
 				"total":          total,
 				"schedule":       schedule,
-				"consumables":    consumables,
-				"prescription":   vlist,
-				"reducelist":     clist,
+				//"consumables":    consumables,
+				"prescription": vlist,
+				"reducelist":   clist,
 			})
 			return
 

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -47,7 +47,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	if len(keywords) > 0 {
 		dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit)
+		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords)
 		var vlist []interface{}
 		var elist []interface{}
 		for _, item := range patient {
@@ -61,6 +61,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 					"total":        total,
 					"prescription": vlist,
 					"dialysbefor":  elist,
+					"patient":      patient,
 				})
 			} else {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -69,31 +70,10 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit)
+		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords)
 		var vlist []interface{}
 		var elist []interface{}
 		for _, item := range patient {
-			//查询当前日期的病人是否存在数据
-			//_, errcode := service.GetToDayDialysisPrescription(item.PatientId, orgid, theTime.Unix())
-			//if errcode == gorm.ErrRecordNotFound {
-			//	//查询每个病人透析处方的最后一次数据
-			//	prescription, _ := service.GetLastDialysisPrescription(item.PatientId, orgid)
-			//	vlist = append(vlist, prescription)
-			//} else if errcode == nil {
-			//	//获取当前日期
-			//	prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
-			//	vlist = append(vlist, prescription)
-			//}
-			//
-			//_, errcodes := service.GetTodayAssessmentBeforDialysis(item.PatientId, orgid, theTime.Unix())
-			//if errcodes == gorm.ErrRecordNotFound {
-			//	//查询每个病人透前评估的最后一次数据
-			//	dialysis, _ := service.GetLastAssessmentBeforDialysis(item.PatientId, orgid)
-			//	elist = append(elist, dialysis)
-			//} else if errcodes == nil {
-			//	dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
-			//	elist = append(elist, dialysis)
-			//}
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
 			vlist = append(vlist, prescription)
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
@@ -105,6 +85,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 				"total":        total,
 				"prescription": vlist,
 				"dialysbefor":  elist,
+				"patient":      patient,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -173,7 +154,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	//获取透析参数数据
 	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 	//查询今日排班的病人
-	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit)
+	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
 	var vlist []interface{}
 	var clist []interface{}
 	for _, item := range patient {
@@ -226,9 +207,8 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 			"good_type":      goodTypes,
 			"total":          total,
 			"schedule":       schedule,
-			//"consumables":    consumables,
-			"prescription": vlist,
-			//"reducelist":     clist,
+			"prescription":   vlist,
+			"patient":        patient,
 		})
 		return
 

models/dialysis_parameter_models.go

@@ -100,3 +100,15 @@ type BloodAutomaticReduceDetail struct {
 func (BloodAutomaticReduceDetail) TableName() string {
 	return "xt_automatic_reduce_detail"
 }
+
+type XtScheduleTwo struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	ModeId    int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (XtScheduleTwo) TableName() string {
+
+	return "xt_schedule"
+}

service/dialysis_parameter_service.go

@@ -69,7 +69,7 @@ func GetDialysisParameter(orgID int64, schedulDate int64, schedulType int64, par
 		db = db.Joins("inner join xt_device_number on xt_device_number.id = xt_schedule.bed_id and xt_device_number.zone_id = ? and xt_device_number.status = 1", partitionType)
 	}
 	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("bed_id desc").Find(&schedule).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&schedule).Error
 	return schedule, err, total
 }
 
@@ -217,9 +217,23 @@ func GetAnticoagulantCount(startime int64, endtime int64, orgid int64) (prescrip
 	return prescriptionCount, err
 }
 
-func GetDialysisTodaySchedulePatient(orgid int64, startime int64, page int64, limit int64) (schedule []*models.XtSchedule, err error) {
+func GetDialysisTodaySchedulePatient(orgid int64, startime int64, page int64, limit int64, keywords string) (schedule []*models.XtScheduleTwo, err error) {
+	//offset := (page - 1) * limit
+	//err = XTReadDB().Model(&schedule).Where("user_org_id = ? and schedule_date = ? and status = 1", orgid, startime).Offset(offset).Limit(limit).Order("id desc").Find(&schedule).Error
+	//return schedule, err
+	keywords = "%" + keywords + "%"
+
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&schedule).Where("user_org_id = ? and schedule_date = ? and status = 1", orgid, startime).Offset(offset).Limit(limit).Find(&schedule).Error
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	if len(keywords) > 0 {
+		err = db.Group("x.id").Select("x.id,x.patient_id,x.mode_id,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.schedule_date = ? and x.status = 1 and s.name like ?", orgid, startime, keywords).Offset(offset).Limit(limit).Order("id desc").Scan(&schedule).Error
+		//db = db.Where("s.name like ?", keywords)
+	} else {
+		err = db.Group("x.id").Select("x.id,x.patient_id,x.mode_id,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.schedule_date = ? and x.status = 1", orgid, startime).Offset(offset).Limit(limit).Order("id desc").Scan(&schedule).Error
+
+	}
 	return schedule, err
 }
 

service/mobile_dialysis_service.go

@@ -1551,7 +1551,7 @@ func GetLastDialysisGoodsTwo(patient_id int64, orgID int64, record_time int64) (
 
 	var Id []*DialysisGoodsDetailDate
 
-	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
+	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
 
 		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
@@ -1561,7 +1561,7 @@ func GetLastDialysisGoodsTwo(patient_id int64, orgID int64, record_time int64) (
 
 func GetLastDialysisBeforePrepareTwo(patient_id int64, orgID int64, record_time int64) (goodUser []*DialysisBeforePrepare, err error) {
 	var Id []*DialysisGoodsDate
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ? AND count > 0", patient_id, orgID, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
 	if len(Id) > 0 {
 		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordDate).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Find(&goodUser).Error
 	}