耗材参数

controllers/dialysis_parameter_api_controller.go

@@ -263,8 +263,8 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 
 		dialysisGoods, _, total := service.PCGetDialysisGoodsTwo(orgId, startime.Unix(), scheduletype, partitiontype, page, limit, keyword)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
-			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, orgId, startime.Unix())
-			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, orgId, startime.Unix())
+			goodUser, _ := service.GetLastDialysisGoodsTwo(item.PatientId, orgId, startime.Unix())
+			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepareTwo(item.PatientId, orgId, startime.Unix())
 			item.LastAutomaticReduceDetail = goodUser
 			item.LastDialysisBeforePrepare = lastGoodUserDetial
 		}
@@ -283,8 +283,8 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 		//获取当天排班的每个患者的库存使用情况
 		dialysisGoods, err, total := service.PCGetDialysisGoodsTwo(orgId, startime.Unix(), scheduletype, partitiontype, page, limit, keyword)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
-			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, orgId, startime.Unix())
-			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, orgId, startime.Unix())
+			goodUser, _ := service.GetLastDialysisGoodsTwo(item.PatientId, orgId, startime.Unix())
+			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepareTwo(item.PatientId, orgId, startime.Unix())
 
 			fmt.Println(goodUser)
 			fmt.Println(lastGoodUserDetial)

service/mobile_dialysis_service.go

@@ -1470,9 +1470,12 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 }
 
 func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goodUser []*AutomaticReduceDetail, err error) {
+
 	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
 	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
 	}
 	return
@@ -1543,3 +1546,24 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 
 	return vms, err, total
 }
+
+func GetLastDialysisGoodsTwo(patient_id int64, orgID int64, record_time int64) (goodUser []*AutomaticReduceDetail, err error) {
+
+	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
+	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
+	}
+	return
+}
+
+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
+	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
+	}
+	return
+}