患者检验检查统计开发

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1287,9 +1287,10 @@ func (this *CommonApiController) GetPatientscontrol() {
 	limit, _ := this.GetInt64("limit")
 	fmt.Println("limit", limit)
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
-	fmt.Println("============================================================")
+	//统计非传染病类型
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	//获取最后一次数据
+	//统计传染病类型
+	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1297,9 +1298,10 @@ func (this *CommonApiController) GetPatientscontrol() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-		"control":  control,
+		"patients":          patients,
+		"total":             total,
+		"control":           control,
+		"infectiousControl": infectiousControl,
 	})
 }
 
@@ -1323,6 +1325,7 @@ func (this *CommonApiController) GetCartogramList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1330,8 +1333,9 @@ func (this *CommonApiController) GetCartogramList() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"cartogramlist": cartogramlist,
-		"total":         total,
+		"cartogramlist":     cartogramlist,
+		"total":             total,
+		"infectiouscontrol": infectiouscontrol,
 	})
 }
 

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -828,16 +828,18 @@ func (this *NewCommonApiController) GetMobilePatientControl() {
 
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	//获取最后一次数据
-
+	//统计传染病类型
+	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-		"control":  control,
+		"patients":          patients,
+		"total":             total,
+		"control":           control,
+		"infectiousControl": infectiousControl,
 	})
 }
 
@@ -861,14 +863,16 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	page, _ := this.GetInt64("page")
 	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+	infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"cartogramlist": cartogramlist,
-		"total":         total,
+		"cartogramlist":     cartogramlist,
+		"total":             total,
+		"infectiouscontrol": infectiouscontrol,
 	})
 }
 
@@ -915,13 +919,13 @@ func (this *NewCommonApiController) GetSeachPatientsControl() {
 	endtimeStrsUnix := endtimeStrs.Unix()
 	fmt.Println("结束时间搓", endtimeStrsUnix)
 	control, err := service.GetLastPatientsControlTwo(orgid, id, startimeStrUnix, endtimeStrsUnix)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-
 		"control": control,
 	})
 }

models/common_models.go

@@ -419,6 +419,9 @@ type PatientInspectionCount struct {
 	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
 	Sort         int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	LargeRange   string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	MinRange     string `gorm:"column:min_range" json:"min_range" form:"min_range"`
+	RangeType    int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
 }
 
 func (PatientInspectionCount) TableName() string {

service/common_service.go

@@ -59,7 +59,7 @@ func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*mod
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").Count(&total).
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name").Count(&total).
 		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
@@ -301,7 +301,7 @@ func TotalDialysisCount(startime int64, endtime int64, orgid int64) (order []*mo
 
 	db := XTReadDB().Table("xt_dialysis_order as o")
 
-	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o where o.status = 1 and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ?", startime, endtime, orgid).Group("o.patient_id").Scan(&order).Error
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule AS x ON x.patient_id = o.patient_id   where o.status = 1 and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and x.schedule_date = o.dialysis_date and x.status = 1", startime, endtime, orgid).Group("o.patient_id").Scan(&order).Error
 	return order, err
 }
 
@@ -584,7 +584,7 @@ func GetInspectionDetailById(id int64, orgid int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 
-	err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,t.inspection_frequency").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Group("project_id,patient_id").Scan(&projectCounts).Error
+	err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,t.inspection_frequency,t.sort").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Group("project_id,patient_id").Scan(&projectCounts).Error
 	return
 }
 
@@ -2332,7 +2332,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	d2 := readDb.Table("xt_quality_control_standard as d")
 	fmt.Println("d2", d2)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ? and x.inspect_value <> 0", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and x.inspect_type = 1", orgid)
 	}
 	if lapstor == 0 {
 		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
@@ -2350,7 +2350,71 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+
+	return inspection, err
+}
+
+func GetInfectiousPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+	table := readDb.Table("xt_patients as s")
+	fmt.Println(table)
+	d := readDb.Table(" xt_inspection_reference as r")
+	fmt.Println(d)
+	d2 := readDb.Table("xt_quality_control_standard as d")
+	fmt.Println("d2", d2)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.inspect_value <> '' and x.inspect_type = 2", orgid)
+	}
+	if lapstor == 0 {
+		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+
+	if lapstor == 1 {
+		table = table.Where("s.lapseto = 1")
+	}
+	if lapstor == 2 {
+		table = table.Where("s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+
+	return inspection, err
+}
+
+func GetInfectiousControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+	table := readDb.Table("xt_patients as s")
+	fmt.Println(table)
+	d := readDb.Table(" xt_inspection_reference as r")
+	fmt.Println(d)
+	d2 := readDb.Table("xt_quality_control_standard as d")
+	fmt.Println("d2", d2)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.inspect_value <> '' and x.inspect_type = 2", orgid)
+	}
+	if lapstor == 0 {
+		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+
+	if lapstor == 1 {
+		table = table.Where("s.lapseto = 1")
+	}
+	if lapstor == 2 {
+		table = table.Where("s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -2484,7 +2548,7 @@ func GetLastPatientsControlTwo(orgid int64, patientid int64, startime int64, end
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.large_range,d.min_range,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }