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

models/his_models.go

 }
 
 type XtHisProjectTeam struct {
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectTeam string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
-	Price       float64 `gorm:"column:price" json:"price" form:"price"`
-	Pinyin      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	TubeColor   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
-	TeamType    int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
-	Remark      string  `gorm:"column:remark" json:"remark" form:"remark"`
-	UserOrgId   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status      int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId      string  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ID          int64               `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam string              `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price       float64             `gorm:"column:price" json:"price" form:"price"`
+	Pinyin      string              `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi        string              `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor   int64               `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType    int64               `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark      string              `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId   int64               `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status      int64               `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64               `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64               `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ProjectId   string              `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId      string              `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	List        []*XtHisProjectList `gorm:"-" json:"list" form:"list"`
 }
 
 func (XtHisProjectTeam) TableName() string {

service/his_charge_service.go

 				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
+			break
+		case 5:
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 390", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 ", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+
+			break
+		case 6:
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 310 ", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+
 			break
 
 		}