2024/6/17

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -7781,12 +7781,24 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 		if patient_id != 0 {
 			for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
 				goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.Org.Id, date.Unix())
+
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
+
 				//获取患者总的出库数据
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
 				item.Project = project
+
+				for _, it := range item.AutomaticReduceDetail {
+					var total int64
+					auto, _ := service.GetPatientAutoMatic(it.PatientId, adminUser.Org.Id, date.Unix(), it.GoodId)
+					for _, its := range auto {
+						total += its.Count
+					}
+					it.Count = total
+				}
 			}
+
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"dialysis_goods":   dialysisGoods,
@@ -7813,6 +7825,14 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				item.Project = project
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
+				for _, it := range item.AutomaticReduceDetail {
+					var total int64
+					auto, _ := service.GetPatientAutoMatic(it.PatientId, adminUser.Org.Id, date.Unix(), it.GoodId)
+					for _, its := range auto {
+						total += its.Count
+					}
+					it.Count = total
+				}
 			}
 		}
 		if err == nil {

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2990,4 +2990,38 @@ func (this *NewDialysisApiController) GetNextInspectionDetail() {
 
 func (this *NewDialysisApiController) GetInspectionGroup() {
 
+	patient_id, _ := this.GetInt64("patient_id")
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+
+	inspection, _ := service.GetInspectionGroup(patient_id, org_id)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			inspecList, _ := service.GetInspectionByProjectId(item.PatientId, org_id, item.ProjectId)
+			item.Count = int64(len(inspecList))
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+	})
+}
+
+func (this *NewDialysisApiController) GetInspectionByProject() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	project_id, _ := this.GetInt64("project_id")
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+
+	inspection, _ := service.GetInspectionByProject(patient_id, project_id, org_id)
+
+	patients, _ := service.GetPatientByIDOne(org_id, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+		"patients":   patients,
+	})
 }

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -190,4 +190,6 @@ func NewMobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/patient/getinspectiongroup", &NewDialysisApiController{}, "Get:GetInspectionGroup")
 
+	beego.Router("/m/api/patient/getinspectionbyprojectid", &NewDialysisApiController{}, "Get:GetInspectionByProject")
+
 }

models/patient_models.go

@@ -2737,3 +2737,15 @@ func (XtAgePatients) TableName() string {
 
 	return "xt_patients"
 }
+
+type NewInspection struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId       int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId       int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectDate     int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	Count           int64
+	LastInspectData int64
+}

service/inspection_service.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
 	"errors"
 	"fmt"
 	"strings"
 	"time"
+
+	"XT_New/models"
 )
 
 func GetInspectionReference(orgId int64, inspect_type int64) (reference []*models.InspectionReference, err error) {
@@ -351,3 +352,44 @@ func GetInsepctionConfigurationList(orgid int64) (standard []*models.QualityCont
 		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Scan(&standard).Error
 	return standard, err
 }
+
+func GetInspectionGroup(patient_id int64, org_id int64) (inspection []*models.NewInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection").Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+
+	err = db.Order("inspect_date desc").Group("project_id").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64) (inspection []*models.NewInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection").Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	if project_id > 0 {
+		db = db.Where("project_id = ?", project_id)
+	}
+
+	err = db.Order("inspect_date desc").Group("inspect_date").Scan(&inspection).Error
+	return inspection, err
+
+}
+
+func GetInspectionByProject(patient_id int64, project_id int64, org_id int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("id desc").Find(&inspection).Error
+
+	return inspection, err
+}

service/mobile_dialysis_service.go

@@ -3058,6 +3058,13 @@ func GetLastDialysisBeforePrepare(patient_id int64, orgID int64, record_time int
 	return
 }
 
+func GetPatientAutoMatic(patient_id int64, orgID int64, record_time int64, good_id int64) (auto []*models.AutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and org_id = ? and record_time = ? and good_id =? and status=1", patient_id, orgID, record_time, good_id).Find(&auto).Error
+
+	return auto, err
+}
+
 func GetAllWarehouseOutSumList(patient_id int64, orgID int64, record_time int64) (info []*models.WarehouseOutInfoSeven, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status = 1", patient_id, orgID, record_time).Find(&info).Error