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

controllers/new_stock_api_controller.go

@@ -162,23 +162,18 @@ func (c *NewStockApiController) GetDrugQuery() {
 func (this *NewStockApiController) GetHisDrugCodeQuery() {
 
 	start_time := this.GetString("start_time")
-
 	end_time := this.GetString("end_time")
-
 	limit, _ := this.GetInt64("limit")
-
 	page, _ := this.GetInt64("page")
-
 	is_sale, _ := this.GetInt64("is_sale")
+	is_settle, _ := this.GetInt64("is_settle")
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
@@ -196,8 +191,8 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 		endTime = theTime.Unix()
 	}
 
-	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale)
-	fmt.Println("totla------------------------", total)
+	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle)
+
 	drug, _ := service.GetAllDrugList(orgId)
 
 	codeConfig, _ := service.GetDrugCodeConfig(orgId)

service/stock_service.go

@@ -11019,32 +11019,33 @@ func SaveDrugOpen(open models.XtDrugCodeOpen) error {
 	return err
 }
 
-func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64) (list []*models.HisDoctorAdviceInfo, total int64, err error) {
+func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64, is_settle int64) (list []*models.NewHisDoctorAdviceInfo, total int64, err error) {
 
-	offset := (page - 1) * limit
-	db := XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("status=1")
+	db := XTReadDB().Model(&models.NewHisDoctorAdviceInfo{}).Preload("NewHisPrescription", "status = 1").Where("his_doctor_advice_info.status=1")
+	if is_settle == 2 {
+		db = db.Joins("join his_prescription on his_prescription.id = his_doctor_advice_info.prescription_id and his_prescription.order_status = 2 and his_prescription.status = 1")
+
+	} else if is_settle == 1 {
+		db = db.Joins("join his_prescription on his_prescription.id = his_doctor_advice_info.prescription_id and his_prescription.order_status <> 2 and his_prescription.status = 1")
+	}
 
 	if orgId > 0 {
-		db = db.Where("user_org_id=?", orgId)
+		db = db.Where("his_doctor_advice_info.user_org_id=?", orgId)
 	}
 	if start_time > 0 {
-		db = db.Where("advice_date >= ?", start_time)
+		db = db.Where("his_doctor_advice_info.advice_date >= ?", start_time)
 	}
-
 	if end_time > 0 {
-		db = db.Where("advice_date<=?", end_time)
+		db = db.Where("his_doctor_advice_info.advice_date<=?", end_time)
 	}
-
+	offset := (page - 1) * limit
 	if is_sale == 1 {
-		db = db.Where("is_upload = 1")
+		db = db.Where("his_doctor_advice_info.is_upload = 1")
 	}
 	if is_sale == 2 {
-		db = db.Where("is_upload = 2 or is_upload =0")
+		db = db.Where("his_doctor_advice_info.is_upload = 2 or his_doctor_advice_info.is_upload =0")
 	}
-
-	err = db.Count(&total).Error
-
-	err = db.Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("his_doctor_advice_info.record_date desc").Find(&list).Error
 
 	return list, total, err
 }