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

controllers/his_api_controller.go

@@ -10279,6 +10279,51 @@ func (this *HisApiController) GetCallHisPrescription() {
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.CurrentOrgId, patient_id, p_type)
+
+	//if
+	//storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+	//
+	//lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+
+	if adminUserInfo.CurrentOrgId == 10265 {
+		_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, subitems := range prescriptions {
+				for _, item := range subitems.VMHisPrescription {
+					for _, subItem := range item.HisDoctorAdviceInfo {
+						drug, _ := service.GetDrugByGoodId(subItem.DrugId)
+						info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, adminUserInfo.CurrentOrgId)
+						if info.RetailPrice > 0 {
+							if subItem.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+								subItem.Drug.RetailPrice = info.RetailPrice * float64(drug.MinNumber)
+							}
+							if subItem.PrescribingNumberUnit == drug.MinUnit {
+								subItem.Drug.MinPrice = info.RetailPrice
+								subItem.Drug.RetailPrice = info.RetailPrice
+							}
+
+						}
+					}
+				}
+			}
+		}
+
+		if config.ID > 0 && config.IsOpen == 1 {
+			for _, subitems := range prescriptions {
+				for _, item := range subitems.VMHisPrescription {
+					for _, subItem := range item.HisPrescriptionProject {
+						if subItem.Type == 3 {
+							info, _ := service.GetGoodWarehoseInfoByGoodId(subItem.ProjectId, adminUserInfo.CurrentOrgId)
+							if info.Price > 0 {
+								subItem.GoodInfo.PackingPrice = info.Price
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"prescriptions": prescriptions,

models/his_charge_models.go

@@ -387,6 +387,7 @@ type NewChargeDetail struct {
 	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	ItemId            int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	Pdate             string  `gorm:"column:pdate" json:"pdate" form:"pdate"`
+	CostClassify      int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
 }
 
 type NewHisChargeOrder struct {

models/his_hospital_models.go

@@ -85,6 +85,8 @@ type HisHospitalCheckRecord struct {
 	HisHospitalOrder     HisHospitalOrder `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"order"`
 	BalanceAccountsType  int64            `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
 	InsuplcAdmdvs        string           `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	ReturnOpter          string           `gorm:"column:return_opter" json:"return_opter" form:"return_opter"`
+	ReturnOpterTime      string           `gorm:"column:return_opter_time" json:"return_opter_time" form:"return_opter_time"`
 }
 
 func (HisHospitalCheckRecord) TableName() string {
@@ -133,6 +135,8 @@ type HisHospitalCheckRecordTwo struct {
 	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
 	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
 	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	ReturnOpter          string `gorm:"column:return_opter" json:"return_opter" form:"return_opter"`
+	ReturnOpterTime      string `gorm:"column:return_opter_time" json:"return_opter_time" form:"return_opter_time"`
 }
 
 func (HisHospitalCheckRecordTwo) TableName() string {

models/his_models.go

@@ -2405,6 +2405,8 @@ type NewHisHospitalCheckRecord struct {
 	MdtrtCertType   string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
 	InHosptialTime  string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
 	OutHosptialTime string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	ReturnOpter     string `gorm:"column:return_opter" json:"return_opter" form:"return_opter"`
+	ReturnOpterTime string `gorm:"column:return_opter_time" json:"return_opter_time" form:"return_opter_time"`
 }
 
 func (NewHisHospitalCheckRecord) TableName() string {
@@ -2609,6 +2611,8 @@ type HisHospitalCheckRecordTwenty struct {
 	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
 	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
 	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	ReturnOpter          string `gorm:"column:return_opter" json:"return_opter" form:"return_opter"`
+	ReturnOpterTime      string `gorm:"column:return_opter_time" json:"return_opter_time" form:"return_opter_time"`
 }
 
 func (HisHospitalCheckRecordTwenty) TableName() string {

service/his_charge_service.go

@@ -158,7 +158,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		switch item_type {
 		case 0:
 			if time_type == "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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify, 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 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_doctor_advice_info a ON oi.advice_id = a.id").
 					Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
@@ -167,7 +167,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 
 			} else {
 
-				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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,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").
@@ -180,7 +180,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		case 1:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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 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_doctor_advice_info a ON oi.advice_id = a.id").
 					Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
@@ -188,7 +188,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 					Where("oi.advice_id > 0 and oi.user_org_id = ? and  o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?    and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			} else {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -207,7 +207,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		case 0:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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 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_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).
@@ -216,7 +216,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 
 			} else {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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).
@@ -228,7 +228,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 			break
 		case 1:
 			if time_type == "0" {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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 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_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).
@@ -237,7 +237,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 
 			} else {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("-1000 as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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).
@@ -259,7 +259,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		switch item_type {
 		case 0:
 			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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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 ").
 					Joins(" left join xt_his_project project on  p.project_id = project.id").
@@ -269,7 +269,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 
 			} 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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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(" left join xt_his_project project on  p.project_id = project.id").
@@ -298,7 +298,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 2:
 			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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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").
@@ -307,7 +307,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ?  and oi.status = 1 ", 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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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").
@@ -320,7 +320,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 3:
 			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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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 = 3").
 					Joins("left join xt_his_project project on  p.project_id = project.id").
@@ -329,7 +329,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", 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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,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("left join xt_his_project project on  p.project_id = project.id").
@@ -342,7 +342,7 @@ 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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -351,7 +351,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -364,7 +364,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 5:
 			if time_type == "0" {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -373,7 +373,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -386,7 +386,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 6:
 			if time_type == "0" {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -395,7 +395,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -406,7 +406,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 7:
 			if time_type == "0" {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -415,7 +415,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -431,7 +431,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		switch item_type {
 		case 0:
 			if time_type == "0" {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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 ").
 					Joins("left join xt_his_project project on  p.project_id = project.id").
@@ -441,7 +441,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 
 			} else {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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("left join xt_his_project project on  p.project_id = project.id").
@@ -456,7 +456,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 2:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -465,7 +465,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					Where("oi.project_id > 0 and oi.user_org_id = ? and o.settle_accounts_date >= ?  and o.settle_accounts_date <= ? and oi.status = 1 ", org_id, start_time, end_time).Scan(&patients).Error
 
 			} else {
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -479,7 +479,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 3:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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 = 3").
 					Joins("left join xt_his_project project on  p.project_id = project.id").
@@ -489,7 +489,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 
 			} else {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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("left join xt_his_project project on  p.project_id = project.id").
@@ -501,7 +501,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 4:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -510,7 +510,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -522,7 +522,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 5:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -531,7 +531,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -543,7 +543,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 6:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -552,7 +552,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -564,7 +564,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 		case 7:
 			if time_type == "0" {
 
-				err = readDb.Table("his_order_info as oi").Select("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
@@ -573,7 +573,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 					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("FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").
+				err = readDb.Table("his_order_info as oi").Select("(case p.type  when 2 then project.cost_classify  when 3 then -100  END) as cost_classify,FROM_UNIXTIME(o.settle_accounts_date, '%Y-%m-%d %H:%i:%S') as pdate,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").