医保对接

controllers/his_api_controller.go

@@ -754,7 +754,6 @@ func (c *HisApiController) CreateHisPrescription() {
 								//查询药品的所有库存
 								list, _ := service.GetDrugWarehouseInfoPrescription(drug_id, adminInfo.CurrentOrgId)
 								var total_count int64
-
 								for _, it := range list {
 									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
 								}

service/common_service.go

@@ -987,13 +987,10 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	if lapseto > 0 {
-		fmt.Println("11111")
-		db = db.Joins("join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
 	if origin > 0 {
-		fmt.Println("22222")
-
-		db = db.Joins("join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).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 q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
@@ -1014,17 +1011,11 @@ func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto
 	}
 
 	if lapseto > 0 {
-		db = db.Joins("join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
 	if origin > 0 {
-		db = db.Joins("join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
 	}
-	//if lapseto == 0 {
-	//	db = db.Where("s.lapseto = 1 or s.lapseto = 2")
-	//}
-	//if lapseto > 0 {
-	//	db = db.Where("s.lapseto = ?", lapseto)
-	//}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).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 q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
@@ -2852,10 +2843,10 @@ func GetSystolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lap
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
 	if lapseto > 0 {
-		db = db.Joins("join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
 	if origin > 0 {
-		db = db.Joins("join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Select("x.id,x.systolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
@@ -2878,10 +2869,10 @@ func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (reco
 func GetDiastolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 	db := XTReadDB().Table("xt_monitoring_record as x")
 	if lapseto > 0 {
-		db = db.Joins("join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
 	}
 	if origin > 0 {
-		db = db.Joins("join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
 	}
 	err = db.Select("x.id,x.diastolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err