体积小

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -56,6 +56,9 @@ func XcxApiControllersRegisterRouters() {
 	//获取数据字典数据
 	beego.Router("/xcx/api/mobile/getdataconfig", &XcxApiController{}, "Get:GetDataConfig")
 
+	//检验检查
+	beego.Router("/xcx/api/mobile/getinspectionlist", &XcxApiController{}, "Get:GetInspectionList")
+
 }
 
 type XcxApiController struct {
@@ -854,3 +857,31 @@ func (this *XcxApiController) GetDataConfig() {
 		"list": configList,
 	})
 }
+
+func (this *XcxApiController) GetInspectionList() {
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+
+	list, _ := service.GetInspectionGroupList(patient_id, startTime.Unix(), endTime.Unix())
+
+	insepctionList, _ := service.GetInsepctionList(patient_id, startTime.Unix(), endTime.Unix())
+
+	for _, item := range list {
+		for _, it := range insepctionList {
+			if item.ProjectId == it.ProjectId && item.InspectDate == it.InspectDate {
+				item.Childs = append(item.Childs, it)
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/xcx_user_models.go

@@ -560,3 +560,25 @@ type XcxSchedule struct {
 func (XcxSchedule) TableName() string {
 	return "xt_schedule"
 }
+
+type XcxInspection 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"`
+	InspectTips  string           `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
+	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"`
+	Childs       []*XcxInspection `json:"childs" `
+}
+
+func (XcxInspection) TableName() string {
+	return "xt_inspection"
+}

service/xcx_mobile_api_service.go

@@ -576,6 +576,37 @@ func GetDataConfig(orgid int64) (list []*models.XcxDataConfig, err error) {
 func GetLastScheduleListOne(patient_id int64, schedule_date int64) (models.XcxSchedule, error) {
 
 	schedule := models.XcxSchedule{}
-	err := XTReadDB().Model(&schedule).Where("patient_id = ? and status = 1 and schedule_date <=?", patient_id, schedule_date).Last(&schedule).Error
+	err := XTReadDB().Model(&schedule).Where("patient_id = ? and status = 1 and schedule_date <=?", patient_id, schedule_date).Order("schedule_date desc").Last(&schedule).Error
 	return schedule, err
 }
+
+func GetInspectionGroupList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, 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)
+	}
+	err = db.Group("x.inspect_date,x.project_id").Find(&inspection).Error
+	return inspection, err
+}
+
+func GetInsepctionList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, 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)
+	}
+	err = db.Find(&inspection).Error
+	return inspection, err
+}