2024/6/17

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -8107,16 +8107,21 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 		}
 	}
 
-	//出库逻辑
-	err = service.ConsumablesDeliveryTotal(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-
+	for _, item := range beforePrepares {
+		//查询该耗材今日出库了多少
+		service.GetHistoryWarehouseOutInfo(item.PatientId, adminInfo.Org.Id, record_time)
 	}
 
+	////出库逻辑
+	//err = service.ConsumablesDeliveryTotal(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
+	//
+	//if err != nil {
+	//	utils.ErrorLog(err.Error())
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//
+	//}
+
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
 		UserOrgId:  adminInfo.Org.Id,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -3021,6 +3021,8 @@ func (this *NewDialysisApiController) GetInspectionByProject() {
 
 	patient, _ := service.GetPatientDetailTwo(patient_id)
 
+	referenceList, _ := service.GetInSpctionRerefce(project_id, org_id)
+
 	inspection, _ := service.GetInspectionGroupByRecordDate(patient.BloodId, project_id, org_id)
 
 	if len(inspection) > 0 {
@@ -3035,7 +3037,8 @@ func (this *NewDialysisApiController) GetInspectionByProject() {
 	patients, _ := service.GetPatientByIDOne(org_id, patient.BloodId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"inspection": inspection,
-		"patients":   patients,
+		"inspection":    inspection,
+		"patients":      patients,
+		"referenceList": referenceList,
 	})
 }

service/dialysis_service.go

@@ -2499,3 +2499,10 @@ func GetAllAdviceList(patient_id int64, advice_date int64, user_org_id int64) (a
 
 	return advice, err
 }
+
+func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time int64) (outInfo []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and sys_record_time = ? and status =1", patient_id, user_org_id, record_time).Find(&outInfo).Error
+
+	return outInfo, err
+}

service/inspection_service.go

@@ -396,6 +396,12 @@ func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64)
 
 }
 
+func GetInSpctionRerefce(project_id int64, user_org_id int64) (inspct []*models.InspectionReference, err error) {
+
+	err = XTReadDB().Where("project_id = ? and (org_id = ? or org_id=0) and status =1", project_id, user_org_id).Find(&inspct).Error
+	return inspct, err
+}
+
 func GetInspectionGroupByRecordDate(patient_id int64, project_id int64, org_id int64) (inspetion []*models.Inspection, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("inspect_date asc").Limit(10).Group("inspect_date").Find(&inspetion).Error