耗材参数

controllers/dialysis_parameter_api_controller.go

@@ -36,6 +36,7 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 	keywords := this.GetString("keyword")
 	adminUserInfo := this.GetAdminUserInfo()
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
 	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())
@@ -57,27 +58,31 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 		var elist []interface{}
 		for _, item := range patient {
 			//查询当前日期的病人是否存在数据
-			_, errcode := service.GetToDayDialysisPrescription(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
-			if errcode == gorm.ErrRecordNotFound {
-				//查询每个病人透析处方的最后一次数据
-				prescription, _ := service.GetLastDialysisPrescription(item.PatientId, adminUserInfo.CurrentOrgId)
-				vlist = append(vlist, prescription)
-			} else if errcode == nil {
-				//获取当前日期
-				prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
-				vlist = append(vlist, prescription)
-			}
-
-			_, errcodes := service.GetTodayAssessmentBeforDialysis(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
-			if errcodes == gorm.ErrRecordNotFound {
-				//查询每个病人透前评估的最后一次数据
-				dialysis, _ := service.GetLastAssessmentBeforDialysis(item.PatientId, adminUserInfo.CurrentOrgId)
-				elist = append(elist, dialysis)
-			} else if errcodes == nil {
-				dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
-				elist = append(elist, dialysis)
-			}
-
+			//_, errcode := service.GetToDayDialysisPrescription(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			//if errcode == gorm.ErrRecordNotFound {
+			//	//查询每个病人透析处方的最后一次数据
+			//	prescription, _ := service.GetLastDialysisPrescription(item.PatientId, adminUserInfo.CurrentOrgId)
+			//	vlist = append(vlist, prescription)
+			//} else if errcode == nil {
+			//	//获取当前日期
+			//	prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			//	vlist = append(vlist, prescription)
+			//}
+
+			//_, errcodes := service.GetTodayAssessmentBeforDialysis(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			//if errcodes == gorm.ErrRecordNotFound {
+			//	//查询每个病人透前评估的最后一次数据
+			//	dialysis, _ := service.GetLastAssessmentBeforDialysis(item.PatientId, adminUserInfo.CurrentOrgId)
+			//	elist = append(elist, dialysis)
+			//} else if errcodes == nil {
+			//	dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, adminUserInfo.CurrentOrgId, theTime.Unix())
+			//	elist = append(elist, dialysis)
+			//}
+
+			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 {
@@ -209,27 +214,33 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 	for _, item := range patient {
 		fmt.Println("---------", item.PatientId)
 		//查询当前日期的病人是否存在数据
-		_, errcode := service.GetToDayDialysisPrescription(item.PatientId, orgId, startime.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, startime.Unix())
-			vlist = append(vlist, prescription)
-		}
+		//_, errcode := service.GetToDayDialysisPrescription(item.PatientId, orgId, startime.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, startime.Unix())
+		//	vlist = append(vlist, prescription)
+		//}
 
 		//查询每个病人当前日期是否存在数据
-		_, errco := service.GetAotoMaticReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
-		fmt.Println("errco--------------------------", errco)
-		if errco == gorm.ErrRecordNotFound {
-			reduece, _ := service.GetMaticReduece(item.PatientId, orgId)
-			clist = append(clist, reduece)
-		} else if errco == nil {
-			reduece, _ := service.GetMaticeReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
-			clist = append(clist, reduece)
-		}
+		//_, errco := service.GetAotoMaticReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
+		//fmt.Println("errco--------------------------", errco)
+		//if errco == gorm.ErrRecordNotFound {
+		//	reduece, _ := service.GetMaticReduece(item.PatientId, orgId)
+		//	clist = append(clist, reduece)
+		//} else if errco == nil {
+		//	reduece, _ := service.GetMaticeReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
+		//	clist = append(clist, reduece)
+		//}
+
+		prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgId, startime.Unix())
+		vlist = append(vlist, prescription)
+
+		reduece, _ := service.GetMaticeReduceByPatientId(item.PatientId, orgId, startime.Unix(), endtime.Unix())
+		clist = append(clist, reduece)
 	}
 	//获取透析耗材数据
 	consumables, err := service.GetDialysisConsumables(startime.Unix(), endtime.Unix(), orgId)
@@ -252,7 +263,6 @@ 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())
 			item.LastAutomaticReduceDetail = goodUser