时间选择更新

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1466,14 +1466,32 @@ func (this *NewDialysisApiController) GetAllDoctor() {
 
 func (this *NewDialysisApiController) GetAllInspection() {
 
-	inspection, err := service.GetAllInspection(0)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	//查询该机构是否存在检验检测项目
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Print("orgid", orgid)
+	_, errcode := service.GetInspectionByOrgId(orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		inspection, err := service.GetAllInspection(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	} else if errcode == nil {
+		inspection, err := service.GetAllInspection(orgid)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	} else {
+
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"inspection": inspection,
-	})
+
 }
 
 func (this *NewDialysisApiController) GetInspection() {
@@ -1498,6 +1516,12 @@ func (this *NewDialysisApiController) GetInspection() {
 	orgid := adminInfo.Org.Id
 	fmt.Print("patient", patient)
 	fmt.Print("orgid", orgid)
+
+	//查询该机构是否存在
+	//inspection, _ := service.GetInspectionById(patient.BloodId, startime, endtime, orgid)
+	//if len(inspection) == 0 {
+	//
+	//}
 	inspection, total, err := service.GetInspection(patient.BloodId, startime, endtime, limit, page, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/inspection_models.go

@@ -20,6 +20,28 @@ func (Inspection) TableName() string {
 	return "xt_inspection"
 }
 
+type Inspections 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"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	RangeType    int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin     string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax     string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions string `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit         string `gorm:"column:unit" json:"unit" form:"unit"`
+}
+
 type InspectionReference struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`

service/patientmanage_service.go

@@ -897,6 +897,39 @@ func UpdatedCustomer(customer models.SgjUserCustomer, id int64) error {
 	return err
 }
 
+func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
+	diseases := models.XtInspectionReference{}
+	err := XTReadDB().Model(&diseases).Where("org_id = ? and status = 1", orgid).Find(&diseases).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &diseases, nil
+
+}
+
+//func GetInspectionById(patientid int64,startime int64,endtime int64,orgId int64)(inspection []*models.XtInspectionReference,err error)  {
+//
+//  db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+//  if patientid > 0 {
+//    db = db.Where("x.patient_id = ?", patientid)
+//  }
+//  if startime > 0 {
+//    db = db.Where("x.inspect_date >= ?", startime)
+//  }
+//  if endtime > 0 {
+//    db = db.Where("x.inspect_date<=?", endtime)
+//  }
+//  if orgId > 0 {
+//    db = db.Where("x.org_id = ?", orgId)
+//  }
+//  err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(inspection).Error
+//
+//  return inspection,err
+//}
+
 func GetAllInspection(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&inspection).Error
@@ -918,15 +951,16 @@ func GetInspection(patientid int64, startime int64, endtime int64, limit int64,
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Count(&total).Order("x.inspect_date").Group("x.id").
+	err = db.Count(&total).Order("x.inspect_date desc").Group("x.id").
 		Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(&inspection).Error
 	return inspection, total, err
 }
 
-func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int64) (inspection []*models.Inspection, err error) {
+func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int64) (inspection []*models.Inspections, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status =1")
-
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Print("table", table)
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
 	}
@@ -941,7 +975,7 @@ func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int
 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time").Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on r.id = x.item_id ").Scan(&inspection).Error
 	return inspection, err
 }