提交代码

controllers/his_charge_api_controller.go

@@ -343,6 +343,94 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 		}
 		writer.Close()
 
+		// 设置响应头，表明数据经过了 Gzip 压缩
+		c.Ctx.Output.Header("Content-Encoding", "gzip")
+		// 发送压缩后的数据
+		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+		break
+	case 4:
+		//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, time_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 5:
+		//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, time_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 6:
+		//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, time_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 7:
+		//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, time_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")
 		// 发送压缩后的数据

models/new_stock.go

@@ -31,6 +31,8 @@ type DrugWarehouseInfoTenOne struct {
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	PcDate                    int64       `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	IsPc                      int64       `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg                      int64       `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
 }
 
 func (DrugWarehouseInfoTenOne) TableName() string {

service/app_version.go

@@ -4,6 +4,8 @@ import (
 	"XT_New/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"math"
+	"strconv"
 	"time"
 )
 
@@ -484,82 +486,82 @@ func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 //}
 
 type HisOrderTen 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"`
-	Ctime                 int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64                 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
-	Number                string                `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode               int64                 `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg               string                `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo                string                `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg                string                `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime           string                `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid           string                `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus           int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId               string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId                string                `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo                 string                `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName               string                `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType           string                `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno                string                `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend                  string                `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty                  string                `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  time.Time             `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64               `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string                `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string                `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string                `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string                `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string                `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string                `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64               `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64               `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64               `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64               `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64               `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64               `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64               `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64               `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64               `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64               `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64               `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64               `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64               `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64               `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64               `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64               `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string                `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string                `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string                `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string                `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string                `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64                 `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64               `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string                `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64               `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64               `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64               `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64               `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64               `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64               `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	DepartmentName        string                `gorm:"-" json:"department_name" form:"department_name"`
-	DoctorName            string                `gorm:"-" json:"doctor_name" form:"doctor_name"`
-	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
-	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
-	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
-	//HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	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"`
+	Ctime                 int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64     `gorm:"column:status" json:"status" form:"status"`
+	Number                string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode               int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg               string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime           string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid           string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus           int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                 string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName               string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                  string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	Patients           Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
 func (HisOrderTen) TableName() string {
@@ -597,14 +599,17 @@ func (HisPrescriptionTen) TableName() string {
 	return "his_prescription"
 }
 
-func GetHisOrderDetailThree() (order []*HisOrderTen, err error) {
+func GetHisOrderDetailThree(start_time string, end_time string, org_id int64) (order []*HisOrderTen, err error) {
+	start_time = start_time + " 00:00:00"
+	end_time = end_time + " 23:59:00"
+
 	err = readDb.Model(&HisOrderTen{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug", "status = 1")
 		})
-	}).Where("setl_time >= '2024-01-01 00:00:00' AND setl_time <= '2024-01-31 23:59:00' AND status = 1 AND order_status =2  AND user_org_id = 10485").Find(&order).Order("patient_id").Error
+	}).Where("setl_time >= ? AND setl_time <= ? AND status = 1 AND order_status =2  AND user_org_id = ?", start_time, end_time, org_id).Find(&order).Order("patient_id").Error
 	return
 }
 
@@ -686,7 +691,7 @@ func (HisPrescriptionProjectTen) TableName() string {
 
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
 
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2024-04-01 00:00:00' AND in_hosptial_time <= '2024-05-31 23:59:59'", orgid).Find(&paitent).Error
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2024-06-01 00:00:00' AND in_hosptial_time <= '2024-06-30 23:59:59'", orgid).Find(&paitent).Error
 	return paitent, err
 }
 
@@ -902,7 +907,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("setl_time >= '2024-01-01 00:00:00' AND setl_time <= '2024-03-31 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10138").Find(&order).Error
+	}).Where("setl_time >= '2024-04-01 00:00:00' AND setl_time <= '2024-06-30 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
@@ -1402,3 +1407,207 @@ func GetOrderinfo(org_id int64) (info []models.HisOrderInfo, err error) {
 	}
 	return
 }
+
+type Result22 struct {
+	InspectDate           string
+	Inspect               int64
+	PatientID             int64
+	ItemID1               int64
+	ItemID2               int64
+	ItemName1             string
+	ItemName2             string
+	InspectValue1         string
+	InspectValue2         string
+	WeightAfter           float64
+	ActualUltrafiltration float64
+	ActualTreatmentHour   int64
+	ActualTreatmentHours  float64
+	WeightBefore          float64
+}
+
+func Aaa() {
+
+	var inspections []Result22
+	readDb.Raw(`
+        SELECT 
+            DATE(FROM_UNIXTIME(xts.inspect_date)) AS inspect_date,
+            xts.inspect,
+            xts.patient_id,
+            xts.item_id AS item_id_1,
+            b.item_id AS item_id_2,
+            xts.item_name AS item_name_1,
+            b.item_name AS item_name_2,
+            xts.inspect_value AS inspect_value1,
+            b.inspect_value AS inspect_value2,
+            b.weight_after,
+            b.actual_ultrafiltration,
+            b.actual_treatment_hour,
+            b.actual_treatment_minute / 60.0 AS actual_treatment_hours,
+            xts.weight_before
+        FROM
+            (SELECT 
+                DATE(FROM_UNIXTIME(xts.inspect_date)) AS inspect_date,
+            	xts.inspect_date as inspect,
+                xts.patient_id,
+                xts.item_id,
+                xts.item_name,
+                xts.inspect_value,
+                be.weight_before
+             FROM xt_inspection xts 
+             JOIN xt_assessment_before_dislysis be 
+             ON be.patient_id = xts.patient_id 
+             AND DATE(FROM_UNIXTIME(xts.inspect_date)) = DATE(FROM_UNIXTIME(be.assessment_date))
+             WHERE xts.org_id = 10677 AND xts.item_id = 106770503) xts
+        JOIN
+            (SELECT 
+                DATE(FROM_UNIXTIME(xt.inspect_date)) AS inspect_date,
+            	xt.inspect_date as inspect,
+                xt.patient_id,
+                xt.item_id,
+                xt.item_name,
+                xt.inspect_value,
+                ad.weight_after,
+                ad.actual_ultrafiltration,
+                ad.actual_treatment_hour,
+                ad.actual_treatment_minute
+             FROM xt_inspection xt
+             JOIN xt_assessment_after_dislysis ad 
+             ON DATE(FROM_UNIXTIME(xt.inspect_date)) = DATE(FROM_UNIXTIME(ad.assessment_date)) 
+             AND xt.patient_id = ad.patient_id 
+             WHERE xt.org_id = 10677 AND xt.item_id = 106771301 
+             AND ad.weight_after > 0 
+             AND ad.actual_ultrafiltration > 0) b 
+        ON xts.inspect_date = b.inspect_date 
+        AND xts.patient_id = b.patient_id;
+    `).Scan(&inspections)
+
+	for _, item := range inspections {
+		// 定义一个日期字符串
+		timestamp := item.Inspect
+		var ins models.Inspection
+		ins.Status = 1
+		ins.PatientId = item.PatientID
+		ins.OrgId = 10677
+		ins.ItemName = "透析前尿素氮"
+		ins.CreatedTime = time.Now().Unix()
+		ins.UpdatedTime = time.Now().Unix()
+		ins.ProjectName = "KT/V"
+		ins.InspectType = 3
+		ins.InspectDate = timestamp
+		ins.InspectValue = item.InspectValue1
+		ins.ProjectId = 1014
+		ins.ItemId = 10879
+		writeDb.Create(&ins)
+
+		var ins2 models.Inspection
+		ins2.Status = 1
+		ins2.PatientId = item.PatientID
+		ins2.OrgId = 10677
+		ins2.ItemName = "透析后尿素氮"
+		ins2.CreatedTime = time.Now().Unix()
+		ins2.UpdatedTime = time.Now().Unix()
+		ins2.ProjectName = "KT/V"
+		ins2.InspectType = 3
+		ins2.InspectDate = timestamp
+		ins2.InspectValue = item.InspectValue2
+		ins2.ProjectId = 1014
+		ins2.ItemId = 10878
+		writeDb.Create(&ins2)
+
+		var ins3 models.Inspection
+		ins3.Status = 1
+		ins3.PatientId = item.PatientID
+		ins3.OrgId = 10677
+		ins3.ItemName = "透析时间"
+		ins3.CreatedTime = time.Now().Unix()
+		ins3.UpdatedTime = time.Now().Unix()
+		ins3.ProjectName = "KT/V"
+		ins3.InspectType = 3
+		ins3.InspectDate = timestamp
+		strValue := fmt.Sprintf("%f", float64(item.ActualTreatmentHour)+item.ActualTreatmentHours)
+		ins3.InspectValue = strValue
+		ins3.ProjectId = 1014
+		ins3.ItemId = 10877
+		writeDb.Create(&ins3)
+
+		var ins4 models.Inspection
+
+		ins4.Status = 1
+		ins4.PatientId = item.PatientID
+		ins4.OrgId = 10677
+		ins4.ItemName = "实际超滤量"
+		ins4.CreatedTime = time.Now().Unix()
+		ins4.UpdatedTime = time.Now().Unix()
+		ins4.ProjectName = "KT/V"
+		ins4.InspectType = 3
+		ins4.InspectDate = timestamp
+		strValue2 := fmt.Sprintf("%f", item.ActualUltrafiltration/1000)
+		ins4.InspectValue = strValue2
+		ins4.ProjectId = 1014
+		ins4.ItemId = 10876
+		writeDb.Create(&ins4)
+
+		var ins7 models.Inspection
+		ins7.Status = 1
+		ins7.PatientId = item.PatientID
+		ins7.OrgId = 10677
+		ins7.ItemName = "透后体重"
+		ins7.CreatedTime = time.Now().Unix()
+		ins7.UpdatedTime = time.Now().Unix()
+		ins7.ProjectName = "KT/V"
+		ins7.InspectType = 3
+		ins7.InspectDate = timestamp
+		strValue5 := fmt.Sprintf("%f", item.WeightAfter)
+		ins7.InspectValue = strValue5
+		ins7.ProjectId = 1014
+		ins7.ItemId = 10874
+		writeDb.Create(&ins7)
+
+		var ins8 models.Inspection
+		ins8.Status = 1
+		ins8.PatientId = item.PatientID
+		ins8.OrgId = 10677
+		ins8.ItemName = "KT/V"
+		ins8.CreatedTime = time.Now().Unix()
+		ins8.UpdatedTime = time.Now().Unix()
+		ins8.ProjectName = "KT/V"
+		ins8.InspectType = 3
+		ins8.InspectDate = timestamp
+		ins8.InspectValue = ""
+		ins8.ProjectId = 1014
+		ins8.ItemId = 10950
+
+		C0, _ := strconv.ParseFloat(item.InspectValue1, 64)
+		Ct, _ := strconv.ParseFloat(item.InspectValue2, 64)
+
+		a := math.Log((Ct/C0 - (0.008 * (float64(item.ActualTreatmentHour) + item.ActualTreatmentHours))))
+		b := (4 - 3.5*(Ct/C0)) * ((item.ActualUltrafiltration / 1000) / item.WeightAfter)
+		c := -a + b
+
+		// 格式化输出，保留5位小数
+		valueFormatted := fmt.Sprintf("%.5f", c)
+
+		ins8.InspectValue = valueFormatted
+		writeDb.Create(&ins8)
+
+		var ins9 models.Inspection
+		ins9.Status = 1
+		ins9.PatientId = item.PatientID
+		ins9.OrgId = 10677
+		ins9.ItemName = "URR(%)"
+		ins9.CreatedTime = time.Now().Unix()
+		ins9.UpdatedTime = time.Now().Unix()
+		ins9.ProjectName = "KT/V"
+		ins9.InspectType = 3
+		ins9.InspectDate = timestamp
+		before, _ := strconv.ParseFloat(item.InspectValue1, 64)
+		after, _ := strconv.ParseFloat(item.InspectValue2, 64)
+		value2 := (((before - after) / before) * 100)
+		rounded := math.Round(value2*100) / 100
+		strValue6 := fmt.Sprintf("%f", rounded)
+		ins9.InspectValue = strValue6
+		ins9.ProjectId = 1014
+		ins9.ItemId = 10951
+		writeDb.Create(&ins9)
+	}
+}

service/his_charge_service.go

@@ -339,6 +339,91 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 
 			}
 
+			break
+		case 4:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 and project.cost_classify = 3", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 and project.cost_classify = 3 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
+
+			break
+		case 5:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1  and project.cost_classify = 2", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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  and project.cost_classify = 2", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
+
+			break
+		case 6:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 and project.cost_classify = 6", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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  and project.cost_classify = 6", org_id, start_time, end_time).Scan(&patients).Error
+			}
+			break
+		case 7:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 and project.cost_classify = 11", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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  and project.cost_classify = 11", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
 			break
 		}
 	} else {
@@ -413,6 +498,90 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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
 
 			}
+		case 4:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 and project.cost_classify = 3 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 and project.cost_classify = 3 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
+		case 5:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1  and project.cost_classify = 2", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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  and project.cost_classify = 2 ", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
+		case 6:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1  and project.cost_classify = 10", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 and project.cost_classify = 10", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
+		case 7:
+			if time_type == "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 FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') 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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1   and project.cost_classify = 11", org_id, start_time, end_time).Scan(&patients).Error
+
+			} else {
+				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("left join xt_his_project project on  p.project_id = project.id").
+					Joins("left 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 and project.cost_classify = 11", org_id, start_time, end_time).Scan(&patients).Error
+
+			}
 
 			break
 		}

service/new_stock_medical_insurance_service.go

@@ -4,12 +4,19 @@ import "XT_New/models"
 
 func FindAllDrugWarehousingInfo(org_id int64, is_pc int64, is_bg int64, start_time int64, end_time int64) (list []*models.DrugWarehouseInfoTenOne, err error) {
 	db := readDb.Model(&models.DrugWarehouseInfoTenOne{}).Preload("BaseDrugLib", "org_id = ?", org_id)
-	if is_pc != 0 {
+	if is_pc == 1 {
 		db = db.Where("is_pc = ?", is_pc)
 	}
-	if is_bg != 0 {
+	if is_bg == 1 {
 		db = db.Where("is_bg = ?", is_bg)
 	}
+	if is_pc == 2 {
+		db = db.Where("is_pc = ?", 0)
+	}
+	if is_bg == 2 {
+		db = db.Where("is_bg = ?", 0)
+	}
+
 	if start_time != 0 {
 		db = db.Where("ctime >= ?", start_time)