提交代码

controllers/his_api_controller.go

@@ -8420,7 +8420,7 @@ func (c *HisApiController) GetCompareData() {
 func (c *HisApiController) GetFaPiaoData() {
 	order_id, _ := c.GetInt64("order_id")
 	patient_id, _ := c.GetInt64("patient_id")
-	number := c.GetString("number")
+	//number := c.GetString("number")
 
 	adminUser := c.GetAdminUserInfo()
 	order, _ := service.GetHisOrderByID(order_id)
@@ -8430,7 +8430,7 @@ func (c *HisApiController) GetFaPiaoData() {
 
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
-	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, number)
+	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, order.MdtrtId)
 
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 

service/common_service.go

@@ -2506,7 +2506,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1 and r.is_status = 1", orgid).Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1 and r.is_status = 1", orgid).Group("x.patient_id").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
 
 	return inspection, total, err
 }
@@ -2547,7 +2547,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
 	table := readDb.Table("xt_patients as s")
-	fmt.Println(table)
+	//fmt.Println(table)
 	d := readDb.Table(" xt_inspection_reference as r")
 	fmt.Println(d)
 	d2 := readDb.Table("xt_quality_control_standard as d")
@@ -2571,7 +2571,7 @@ 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,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").Where("d.min_range<>''and d.user_org_id = ? and d.is_status =1", orgid).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").Where("d.min_range<>''and d.user_org_id = ? and d.is_status =1 and NOT EXISTS(SELECT 1 FROM xt_inspection AS x2 WHERE x2.patient_id = x.patient_id AND x2.org_id = ? AND x2.item_id = x.item_id AND x2.inspect_date > x.inspect_date)", orgid, orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }