提交代码

models/his_charge_models.go

@@ -227,6 +227,7 @@ type HisChargeProject struct {
 	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
 	MedicalCoverage int64  `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
 	CostClassify    int64  `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	MedicalCode     string `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
 }
 
 func (HisChargeProject) TableName() string {
@@ -234,13 +235,14 @@ func (HisChargeProject) TableName() string {
 }
 
 type HisChargeGoodInfo struct {
-	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName              string `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodUnit              int64  `gorm:"column:good_unit" json:"good_unit"`
-	SpecificationnName    string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	RegisterNumber        string `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	PackingUnit           string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	MedicalInsuranceLevel int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName               string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit               int64  `gorm:"column:good_unit" json:"good_unit"`
+	SpecificationnName     string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	RegisterNumber         string `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	PackingUnit            string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	MedicalInsuranceLevel  int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (HisChargeGoodInfo) TableName() string {
@@ -508,7 +510,9 @@ type NewPDetail struct {
 	ProjectId    string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	ItemId       string  `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	MdtrtId      string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	AdviceDoctor int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	CertNo       string  `gorm:"column:cert_no" json:"cert_no" form:"cert_no"`
+
+	AdviceDoctor int64 `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
 }
 
 type OrderSchedule struct {

service/his_summary_service.go

@@ -16,9 +16,9 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 						return db.Preload("Drug", "status = 1").Where("status = 1 ")
 					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
 					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit,remark").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,project_name,unit,medical_coverage,cost_classify").Where("status = 1 ")
+						return db.Select("id,project_name,unit,medical_coverage,cost_classify,medical_code").Where("status = 1 ")
 					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,good_name,good_unit,specification_name,packing_unit,medical_insurance_level").Where("status = 1 ")
+						return db.Select("id,good_name,good_unit,specification_name,packing_unit,medical_insurance_level,medical_insurance_number").Where("status = 1 ")
 					}).Where("status = 1 ")
 				})
 			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
@@ -345,7 +345,7 @@ func GetAllHisOrderList(org_id int64, patient_id int64, start_time int64, end_ti
 		db = db.Where("settle_accounts_date >=?", start_time)
 	}
 	if end_time > 0 {
-		db = db.Where("settle_accounts_date<=?", end_time)
+		db = db.Where("settle_accounts_date <=?", end_time)
 	}
 
 	err = db.Find(&order).Error