Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

service/export_data_service.go

@@ -320,7 +320,7 @@ func GetHisOrderBy10697Summary(start_time string, end_time string, ins string) (
         SUM(his_order.maf_pay) AS 医疗救助,
         SUM(his_order.hifmi_pay) AS 大病支付,
         SUM(his_order.hifes_pay) AS 企业补充支付,
-        "" AS 重大疾病补充,
+        0 AS 重大疾病补充,
         SUM(his_order.oth_pay) AS 其它支付
     `).
 		Joins("JOIN his_order_info i ON his_order.number = i.order_number").
@@ -330,3 +330,66 @@ func GetHisOrderBy10697Summary(start_time string, end_time string, ins string) (
 		Scan(&results).Error
 	return
 }
+
+func GetHisOrderBy10697SummaryTwo(startTime, endTime, ins string, st_stamp, end_stamp int64) ([]MedicalCharges, error) {
+	var results []MedicalCharges
+	// 改为字符串数组
+	medChargeTypes := []string{"01", "02", "03", "04", "05", "07", "08", "09", "10", "11", "12", "13", "14"}
+
+	// 定义子查询
+	subQuery := readDb.Table("his_order_info").
+		Select(`
+            order_number, 
+            med_chrgitm_type, 
+            SUM(det_item_fee_sumamt) AS det_item_fee_sumamt`).
+		Where("user_org_id = ? AND STATUS = ? AND (upload_date) >= ? AND (upload_date) <= ? AND med_chrgitm_type IN (?)",
+			10721, 1,
+			st_stamp,
+			end_stamp,
+			medChargeTypes).
+		Group("order_number, med_chrgitm_type").
+		SubQuery() // 作为临时表
+
+	// 执行主查询
+	err := readDb.Table("his_order").
+		Select(`
+            "" AS 编号,
+            his_order.certno AS 医疗保险号,
+            his_order.psn_name AS 姓名,
+            SUM(CASE WHEN i.med_chrgitm_type = '01' THEN i.det_item_fee_sumamt ELSE 0 END) AS 床位费,
+            SUM(CASE WHEN i.med_chrgitm_type = '02' THEN i.det_item_fee_sumamt ELSE 0 END) AS 诊察费,
+            SUM(CASE WHEN i.med_chrgitm_type = '03' THEN i.det_item_fee_sumamt ELSE 0 END) AS 检查费,
+            SUM(CASE WHEN i.med_chrgitm_type = '04' THEN i.det_item_fee_sumamt ELSE 0 END) AS 化验费,
+            SUM(CASE WHEN i.med_chrgitm_type = '05' THEN i.det_item_fee_sumamt ELSE 0 END) AS 治疗费,
+            SUM(CASE WHEN i.med_chrgitm_type = '07' THEN i.det_item_fee_sumamt ELSE 0 END) AS 护理费,
+            SUM(CASE WHEN i.med_chrgitm_type = '08' THEN i.det_item_fee_sumamt ELSE 0 END) AS 卫生材料费,
+            SUM(CASE WHEN i.med_chrgitm_type = '09' THEN i.det_item_fee_sumamt ELSE 0 END) AS 西药费,
+            SUM(CASE WHEN i.med_chrgitm_type = '10' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中药饮片费,
+            SUM(CASE WHEN i.med_chrgitm_type = '11' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中成药费,
+            SUM(CASE WHEN i.med_chrgitm_type = '12' THEN i.det_item_fee_sumamt ELSE 0 END) AS 一般诊疗费,
+            SUM(CASE WHEN i.med_chrgitm_type = '13' THEN i.det_item_fee_sumamt ELSE 0 END) AS 挂号费,
+            SUM(CASE WHEN i.med_chrgitm_type = '14' THEN i.det_item_fee_sumamt ELSE 0 END) AS 其他费,
+            SUM(distinct his_order.medfee_sumamt) AS 医疗费总额,
+            SUM(distinct his_order.psn_cash_pay) AS 个人自付金额,
+            SUM(distinct his_order.acct_pay) AS 基本账户支付,
+            SUM(distinct his_order.acct_mulaid_pay) AS 共济账户支付,
+            SUM(distinct his_order.cvlserv_pay) AS 公务员补助,
+            SUM(distinct his_order.hifp_pay) AS 统筹支付金额,
+            SUM(distinct his_order.maf_pay) AS 医疗救助,
+            SUM(distinct his_order.hifmi_pay) AS 大病支付,
+            SUM(distinct his_order.hifes_pay) AS 企业补充支付,
+            0 AS 重大疾病补充,
+            SUM(distinct his_order.oth_pay) AS 其它支付
+        `).
+		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery). // 使用子查询
+		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ? AND his_order.is_medicine_insurance = ? AND his_order.insutype = ? AND his_order.STATUS = ?",
+			10721, 2, startTime+" 00:00:00", endTime+" 23:59:59", 1, ins, 1).
+		Group("his_order.patient_id").
+		Scan(&results).Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}

service/patientmanage_service.go

@@ -1970,20 +1970,15 @@ type InspectionCount struct {
 }
 
 func GetNormalInspectionTotalByID(startime int64, endtime int64, orgid int64, item_name string, max_value float64, min_value float64) (total int64, err error) {
-	var count []*InspectionCount
+	var count []*models.Inspection
 	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x Join xt_patients pp on pp.id = x.patient_id and pp.lapseto = 1  WHERE (x.status = 1) AND (x.org_id = ?  and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE (xti.status = 1) AND (xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date<= ? and xti.`inspect_value` <= ? and xti.inspect_value >= ? ) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, min_value).Scan(&count).Error
-	for _, items := range count {
-		total = total + items.Count
-	}
-	return total, err2
+
+	return int64(len(count)), err2
 }
 func GetUnusualInspectionTotalByID(startime int64, endtime int64, orgid int64, item_name string, max_value float64, min_value float64) (total int64, err error) {
-	var count []*InspectionCount
+	var count []*models.Inspection
 	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x JOIN xt_patients pp on pp.id = x.patient_id and pp.status = 1 and pp.lapseto = 1  WHERE (x.status = 1) AND (x.org_id = ? and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE   (xti.status = 1 AND xti.org_id = ? and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value > ?) OR (xti.status = 1 AND xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value < ?) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, orgid, item_name, startime, endtime, min_value).Scan(&count).Error
-	for _, items := range count {
-		total = total + items.Count
-	}
-	return total, err2
+	return int64(len(count)), err2
 }
 func GetPatientNotInspectionTotal(startime int64, endtime int64, orgid int64, item_name string) (total int64, err error) {
 	err = XTReadDB().Model(models.XtPatients{}).Joins("LEFT JOIN xt_inspection pd ON xt_patients.id = pd.patient_id and pd.org_id = ? and pd.item_name = ? and pd.inspect_date >= ? and pd.inspect_date<=? ", orgid, item_name, startime, endtime).Where("xt_patients.user_org_id = ? and xt_patients.status = 1 and pd.patient_id IS NULL and xt_patients.lapseto = 1", orgid).Count(&total).Error