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

controllers/his_charge_api_controller.go

@@ -33,6 +33,39 @@ func HisChargeApiRegistRouters() {
 
 	beego.Router("/api/his/getyidiclear", &HisChargeApiController{}, "get:GetHisYidiClearRecord")
 
+	beego.Router("/api/his/getexportdata", &HisChargeApiController{}, "get:GetExportData")
+
+}
+
+func (c *HisChargeApiController) GetExportData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	adminUser := c.GetAdminUserInfo()
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	chargePatient, err := service.GetAllChargeDetailsTwo(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": chargePatient,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
 }
 
 func (c *HisChargeApiController) UpdateFaPiaoRecordIsUse() {

models/his_charge_models.go

@@ -104,6 +104,7 @@ type HisChargeOrder struct {
 	PsnCashPay          float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	IsMedicineInsurance int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
 	HisChargeOrderInfo  []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+	Patients            Patients              `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
 }
 
 func (HisChargeOrder) TableName() string {

service/gobal_config_service.go

@@ -260,7 +260,14 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64,
 		db = db.Where("his_order.settle_accounts_date<=?", end_time)
 	}
 
-	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2 AND p_type = ? ", user_org_id, p_type)
+	if p_type > 0 {
+		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2 AND p_type = ? ", user_org_id, p_type)
+
+	} else {
+
+		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
+
+	}
 
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).

service/his_charge_service.go

@@ -536,3 +536,23 @@ func GetPatientGather(patient_id int64, org_id int64, start_time int64, end_time
 	}
 	return
 }
+
+func GetAllChargeDetailsTwo(org_id int64, start_time int64, end_time int64) (patients []*models.HisChargeOrder, err error) {
+	err = readDb2.Model(&models.HisChargeOrder{}).Preload("Patients", "status = 1").Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+			Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Preload("Drug", "status = 1").Where("status = 1")
+			}).
+			Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").
+					Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit").Where("status = 1 ")
+					}).
+					Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+					}).Where("status = 1 ")
+			}).Where("status = 1")
+	}).Where("status = 1  AND user_org_id = ? AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND order_status = 2", org_id, start_time, end_time).Group("id").Find(&patients).Error
+
+	return
+}