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

controllers/his_charge_api_controller.go

@@ -5,7 +5,11 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
 	"github.com/astaxie/beego"
+	"net/http"
 	"time"
 )
 
@@ -16,6 +20,7 @@ type HisChargeApiController struct {
 func HisChargeApiRegistRouters() {
 	beego.Router("/api/his/chargestatistics/detail", &HisChargeApiController{}, "get:GetChargeStatisticsDetail")
 	beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
+	//beego.InsertFilter("/api/his/chargestatistics/detail", beego.BeforeRouter, GzipFilter)
 
 	beego.Router("/api/his/patient", &HisChargeApiController{}, "get:GetAllPatient")
 	//beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
@@ -226,10 +231,10 @@ func (c *HisChargeApiController) GetFaPiaoRecord() {
 }
 
 func (c *HisChargeApiController) GetChargeStatisticsDetail() {
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "接口优化升级，如有数据需要，请联系客服！",
-	})
-	return
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"msg": "接口优化升级，如有数据需要，请联系客服！",
+	//})
+	//return
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
@@ -252,19 +257,124 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
+	switch item_type {
+	case 0:
+		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeDrug = append(chargeDrug, chargeProject...)
+		b, _ := structToBytes(chargeDrug)
+		//cd, _ := compressData(b)
+		// 使用 Gzip 压缩数据
+		var compressedData bytes.Buffer
+		writer := gzip.NewWriter(&compressedData)
+		_, err = writer.Write(b)
+		if err != nil {
+			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+			c.Ctx.WriteString(err.Error())
+			return
+		}
+		writer.Close()
+
+		// 设置响应头，表明数据经过了 Gzip 压缩
+		c.Ctx.Output.Header("Content-Encoding", "gzip")
+		// 发送压缩后的数据
+		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+		break
+	case 1:
+		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		//chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		//chargeDrug = append(chargeDrug, chargeProject...)
+		b, _ := structToBytes(chargeDrug)
+		//cd, _ := compressData(b)
+		// 使用 Gzip 压缩数据
+		var compressedData bytes.Buffer
+		writer := gzip.NewWriter(&compressedData)
+		_, err = writer.Write(b)
+		if err != nil {
+			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+			c.Ctx.WriteString(err.Error())
+			return
+		}
+		writer.Close()
+
+		// 设置响应头，表明数据经过了 Gzip 压缩
+		c.Ctx.Output.Header("Content-Encoding", "gzip")
+		// 发送压缩后的数据
+		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+		break
+	case 2:
+		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		//chargeDrug = append(chargeDrug, chargeProject...)
+		b, _ := structToBytes(chargeProject)
+		//cd, _ := compressData(b)
+		// 使用 Gzip 压缩数据
+		var compressedData bytes.Buffer
+		writer := gzip.NewWriter(&compressedData)
+		_, err = writer.Write(b)
+		if err != nil {
+			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+			c.Ctx.WriteString(err.Error())
+			return
+		}
+		writer.Close()
+
+		// 设置响应头，表明数据经过了 Gzip 压缩
+		c.Ctx.Output.Header("Content-Encoding", "gzip")
+		// 发送压缩后的数据
+		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+		break
+
+	case 3:
+		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+		//chargeDrug = append(chargeDrug, chargeProject...)
+		b, _ := structToBytes(chargeProject)
+		//cd, _ := compressData(b)
+		// 使用 Gzip 压缩数据
+		var compressedData bytes.Buffer
+		writer := gzip.NewWriter(&compressedData)
+		_, err = writer.Write(b)
+		if err != nil {
+			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+			c.Ctx.WriteString(err.Error())
+			return
+		}
+		writer.Close()
+
+		// 设置响应头，表明数据经过了 Gzip 压缩
+		c.Ctx.Output.Header("Content-Encoding", "gzip")
+		// 发送压缩后的数据
+		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+		break
 
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"patients": chargePatient,
-		})
-		return
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	}
 
+}
+
+func structToBytes(p []*models.NewChargeDetail) ([]byte, error) {
+	data, err := json.Marshal(p)
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}
+
+func compressData(data []byte) ([]byte, error) {
+	var compressedData bytes.Buffer
+	writer := gzip.NewWriter(&compressedData)
+
+	_, err := writer.Write(data)
+	if err != nil {
+		return nil, err
+	}
+
+	err = writer.Close()
+	if err != nil {
+		return nil, err
 	}
 
+	return compressedData.Bytes(), nil
 }
 
 func (c *HisChargeApiController) GetChargeStatisticsSettle() {

controllers/schedule_api_controller.go

@@ -131,6 +131,11 @@ func (c *ScheduleApiController) CoverSch() {
 	if err == nil {
 		err2 := service.SaveSch(&new_sch)
 		if err2 == nil {
+			//去除当天患者排班中重复数据，保留最后一条数据
+			service.UpdateRepeatSchStatus(sch.UserOrgId, sch.ScheduleDate)
+			service.UpdateRepeatSchStatus(sch_two.UserOrgId, sch_two.ScheduleDate)
+			service.UpdateRepeatSchStatus(new_sch.UserOrgId, new_sch.ScheduleDate)
+
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":     "覆盖成功",
 				"new_sch": new_sch,
@@ -177,6 +182,11 @@ func (c *ScheduleApiController) ExchangeSch() {
 
 	err := service.UpdateScheduleThree(sch, sch_two)
 	if err == nil {
+
+		//去除当天患者排班中重复数据，保留最后一条数据
+		service.UpdateRepeatSchStatus(sch.UserOrgId, sch.ScheduleDate)
+		service.UpdateRepeatSchStatus(sch_two.UserOrgId, sch_two.ScheduleDate)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "交换成功",
 		})
@@ -685,8 +695,13 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					service.SaveSch(&schedule)
 				}
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
+				//去除当天患者排班中重复数据，保留最后一条数据
+				service.UpdateRepeatSchStatus(adminInfo.CurrentOrgId, schedule.ScheduleDate)
+
 			}
+
 		}
+
 	}
 	////修改或保存数据
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
@@ -836,6 +851,10 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					schedule.DialysisMachineName = DialysisMachineName
 					schedule.IsExport = 3000
 					service.SaveSch(&schedule)
+
+					//去除当天患者排班中重复数据，保留最后一条数据
+					service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 				} else { //新的排班信息
 
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
@@ -1025,6 +1044,9 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					}
 				}
 
+				//去除当天患者排班中重复数据，保留最后一条数据
+				service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "保存成功",
 				})
@@ -1609,6 +1631,8 @@ func (c *ScheduleApiController) CreateSchedule() {
 	}
 	schedule.Patient = patientInfo.Name
 
+	service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":      "ok",
 		"schedule": schedule,
@@ -1868,6 +1892,10 @@ func (c *ScheduleApiController) CreateScheduleTwo() {
 		redis.Set(keySeven, "", time.Second)
 		defer redis.Close()
 		schedule.Patient = patientInfo.Name
+
+		//去除当天患者排班中重复数据，保留最后一条数据
+		service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":          "ok",
 			"schedule":     schedule,
@@ -2198,6 +2226,8 @@ func (c *ScheduleApiController) ChangeSchedule() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChangeScheduleFail)
 			return
 		}
+		service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":      "ok",
 			"schedule": &schedule,
@@ -2209,6 +2239,8 @@ func (c *ScheduleApiController) ChangeSchedule() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChangeScheduleFail)
 			return
 		}
+		service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":      "ok",
 			"schedule": &schedule,
@@ -5236,7 +5268,11 @@ func (c *ScheduleApiController) ChangeScheduleTen() {
 
 		}
 	}
+	//去除当天患者排班中重复数据，保留最后一条数据
+	service.UpdateRepeatSchStatus(schedule.UserOrgId, schedule.ScheduleDate)
+
 	scheduletwo, _ := service.GetSchedule(adminINfo.CurrentOrgId, id)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":      "ok",
 		"schedule": scheduletwo,

models/his_charge_models.go

@@ -340,3 +340,128 @@ type HisChargeOrderInfoTwo struct {
 func (HisChargeOrderInfoTwo) TableName() string {
 	return "his_order_info"
 }
+
+type NewChargePatient struct {
+	ID             int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name           string               `gorm:"column:name" json:"name" form:"name"`
+	Lapseto        int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status         int64                `gorm:"column:status" json:"status" form:"status"`
+	HisChargeOrder []*NewHisChargeOrder `gorm:"ForeignKey:PatientID;AssociationForeignKey:ID" json:"orders"`
+}
+
+func (NewChargePatient) TableName() string {
+	return "xt_patients"
+}
+
+type NewChargeDetail struct {
+	Cnt               float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric              float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PName             string  `gorm:"column:p_name" json:"p_name" form:"p_name"`
+	ItemName          string  `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	Dose              string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit          string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinNumber         int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	DetItemFeeSumamt  string  `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	PId               int64   `gorm:"column:p_id" json:"p_id" form:"p_id"`
+	AdviceId          int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	ProjectId         int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	PType             string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	ItemId            int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+}
+
+type NewHisChargeOrder struct {
+	ID                  int64                       `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64                       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId        int64                       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate  int64                       `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Status              int64                       `gorm:"column:status" json:"status" form:"status"`
+	Number              string                      `gorm:"column:number" json:"number" form:"number"`
+	OrderStatus         int64                       `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string                      `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	PatientId           int64                       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HifesPay            float64                     `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	MafPay              float64                     `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	FundPaySumamt       float64                     `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	AcctPay             float64                     `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	MedfeeSumamt        float64                     `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	HifpPay             float64                     `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	HifmiPay            float64                     `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	IsUploadDiagnose    int64                       `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo   int64                       `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess     int64                       `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	SetlTime            string                      `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	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  []*NewHisChargeOrderInfoTwo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+}
+
+func (NewHisChargeOrder) TableName() string {
+	return "his_order"
+}
+
+type NewHisChargeOrderInfoTwo struct {
+	ID                           int64                        `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber                  string                       `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	AdviceId                     int64                        `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt             float64                      `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                          float64                      `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                         float64                      `gorm:"column:pric" json:"pric" form:"pric"`
+	MedChrgitmType               string                       `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	ChldMedcFlag                 string                       `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv                    string                       `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt                   float64                      `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	PricUplmtAmt                 float64                      `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	HisChargePrescriptionProject HisChargePrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisChargeDoctorAdviceInfo    NewHisChargeDoctorAdviceInfo `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
+}
+
+func (NewHisChargeOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+
+type NewDrug struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName     string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit      string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber    int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit      string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose         string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit     string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	DrugDose     float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+}
+
+func (NewDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type NewHisChargeDoctorAdviceInfo struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	Drug                  NewDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSelfDrug            int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+}
+
+func (NewHisChargeDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}

service/his_charge_service.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.ChargePatient, err error) {
+func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.NewChargePatient, err error) {
 	if len(keyword) == 0 {
 		switch item_type {
 		case 0:
@@ -152,6 +152,150 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 	return
 }
 
+func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.NewChargeDetail, err error) {
+	if len(keyword) == 0 {
+		switch item_type {
+		case 0:
+			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
+				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			break
+		case 1:
+			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
+				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+			break
+
+		}
+
+	} else {
+		keyword := "%" + keyword + "%"
+		switch item_type {
+		case 0:
+			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
+				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+		case 1:
+			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
+				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
+				Where("oi.advice_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+
+		}
+
+	}
+
+	return
+}
+func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str string, end_time_str string, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.NewChargeDetail, err error) {
+	if len(keyword) == 0 {
+		switch item_type {
+		case 0:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id ").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			//err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			//	return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+			//		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 ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			//}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+
+			break
+		case 2:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 2").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+		case 3:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+
+		}
+
+	} else {
+		keyword := "%" + keyword + "%"
+		switch item_type {
+		case 0:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id ").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+
+		case 2:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 2").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+		case 3:
+			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
+				Joins(" join xt_his_project project on  p.project_id = project.id").
+				Joins(" join  xt_good_information good on  p.project_id = good.id").
+				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id and pp.name like ?", keyword).
+				Where("oi.project_id > 0 and oi.user_org_id = ? and oi.`upload_date` >= ?  and oi.`upload_date` <= ?   and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			break
+
+		}
+
+	}
+
+	return
+}
+
 func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.SettlePatient, err error) {
 	if len(keyword) == 0 {
 		switch item_type {

service/schedule_service.go

@@ -1769,3 +1769,21 @@ func GetLastSchedule(patient_id int64, user_org_id int64) (models.XtSchedule, er
 	err := XTReadDB().Where("patient_id = ? and status =1 and user_org_id = ?", patient_id, user_org_id).Find(&schedule).Error
 	return schedule, err
 }
+
+func UpdateRepeatSchStatus(user_org_id int64, schedule_date int64) {
+	var schedules []models.XtSchedule
+	// Find duplicate records based on patient_id, schedule_date, and user_org_id
+	XTReadDB().Where("user_org_id = ? AND schedule_date = ? AND status = ?", user_org_id, schedule_date, 1).
+		Group("patient_id, schedule_date").
+		Having("COUNT(*) > 1").
+		Select("patient_id, schedule_date, MAX(id) as max_id").
+		Find(&schedules)
+
+	for _, schedule := range schedules {
+		// Update records with status = 0 where id is less than max_id
+		XTReadDB().Model(&models.XtSchedule{}).
+			Where("patient_id = ? AND schedule_date = ? AND id < ?", schedule.PatientId, schedule.ScheduleDate, schedule.MaxId).
+			Update("status", 0)
+	}
+
+}