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

controllers/his_export_data_controller.go

@@ -153,10 +153,11 @@ func (c *HisExportDataController) GetSummaryExport() {
 		}
 		endTime = theTime.Unix()
 	}
-	fmt.Println("111111")
 	result, _ := service.GetHisOrderBy10697SummaryThree(start_time, end_time, startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
+	org_info, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"result": result,
+		"result":   result,
+		"org_info": org_info,
 	})
 }
 

service/export_data_service.go

@@ -296,6 +296,7 @@ type MedicalCharges struct {
 
 type MedicalChargesThree struct {
 	PatientID                string  `gorm:"column:ID"`   // 姓名
+	CanBaoDi                 string  `gorm:"column:参保地"`  // 姓名
 	PsnName                  string  `gorm:"column:姓名"`   // 姓名
 	TypeName                 string  `gorm:"column:类型"`   // 姓名
 	Total                    float64 `gorm:"column:合计次数"` // 姓名
@@ -451,6 +452,7 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 	// 执行主查询
 	err := readDb.Table("his_order").
 		Select(`p.id as ID, p.name AS 姓名,
+			pp.insuplc_admdvs as 参保地,
 			CASE his_order.insutype
 				WHEN '390' THEN '城乡'
 				WHEN '310' THEN '职工'
@@ -476,9 +478,9 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 			"" AS 挂账,
 			"" AS 冲账,
 			0 AS 实收`).
-		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery).                       // 使用子查询
-		Joins("JOIN xt_patients p on p.id = his_order.patient_id and p.user_org_id = ?", org_id). // 使用子查询
-
+		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery).                           // 使用子查询
+		Joins("JOIN xt_patients p on p.id = his_order.patient_id and p.user_org_id = ?", org_id).     // 使用子查询
+		Joins("JOIN his_patient pp on pp.number = his_order.mdtrt_id and p.user_org_id = ?", org_id). // 使用子查询
 		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ?  AND his_order.STATUS = ?",
 			org_id, 2, startTime+" 00:00:00", endTime+" 23:59:59", 1).
 		Group("his_order.patient_id").