耗材参数

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -709,6 +709,8 @@ func (this *CommonApiController) GetDialysislist() {
 	prescriptionList, _ := service.GetAllDialysisList(statime, entime, orgId)
 	list, totallist, _ := service.GetDialysisPatientList(statime, entime, page, limit, orgId)
 	fmt.Println("err", err)
+	//获取每个病人每个透析模式的数据
+	modeIdCount, parseDateErr := service.GetModeIdCount(statime, entime, orgId, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -720,6 +722,7 @@ func (this *CommonApiController) GetDialysislist() {
 		"totallist":        totallist,
 		"prescriptionList": prescriptionList,
 		"count":            count,
+		"modeIdCount":      modeIdCount,
 	})
 }
 

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -62,27 +62,30 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		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)
-			}
-
+			//_, 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())
+			elist = append(elist, dialysis)
 		}
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -108,11 +111,14 @@ func (this *DialysisParamerterApiController) GetMobileWareHouseOutList() {
 	fmt.Println(start_time, end_time)
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	wareoutlist, err := service.GetWareHouseOutList(startime.Unix(), endtime.Unix(), orgId)
+	count, err := service.GetAnticoagulantCount(startime.Unix(), endtime.Unix(), orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"wareoutlist": wareoutlist,
+			"count":       count,
 		})
 	}
+
 }
 
 func (this *DialysisParamerterApiController) GetAllMobileMaterial() {

models/common_models.go

@@ -574,3 +574,9 @@ type XtPatientsInspection struct {
 	RangeType    int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
 	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
 }
+
+type BloodDialysisModeIdCount struct {
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ModeId    int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Count     int64
+}

service/common_service.go

@@ -3317,3 +3317,22 @@ func TotalSysNoStandCount(orgid int64, startime int64, endtime int64, sysmin int
 	err = db.Select("x.id,x.user_org_id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.status = 1 and(x.systolic_blood_pressure<=? or x.systolic_blood_pressure>=?) or (x.diastolic_blood_pressure<=? or x.diastolic_blood_pressure>=?)", sysmin, syslarge, diamin, dialarge).Group("x.monitoring_date,x.patient_id").Offset(offset).Limit(limit).Order("x.monitoring_date desc").Scan(&record).Error
 	return record, err
 }
+
+func GetModeIdCount(startime int64, endtime int64, orgid int64, page int64, limit int64) (order []*models.BloodDialysisModeIdCount, err error) {
+
+	table := XTReadDB().Table("xt_schedule as s")
+	fmt.Println("table", table)
+	db := XTReadDB().Table("xt_dialysis_order as o")
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("o.dialysis_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.dialysis_date<=?", endtime)
+	}
+	offset := (page - 1) * limit
+	err = db.Group(" s.patient_id,s.mode_id").Select("s.mode_id,	s.patient_id,	count(o.id) as count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1 ").Offset(offset).Limit(limit).Scan(&order).Error
+	return order, err
+}