Browse Source

医保对接

csx 3 years ago
parent
commit
8806ace0e5
2 changed files with 27 additions and 14 deletions
  1. 15 14
      models/his_models.go
  2. 12 0
      service/his_charge_service.go

+ 15 - 14
models/his_models.go View File

@@ -50,20 +50,21 @@ func (XtHisProject) TableName() string {
50 50
 }
51 51
 
52 52
 type XtHisProjectTeam struct {
53
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
54
-	ProjectTeam string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
55
-	Price       float64 `gorm:"column:price" json:"price" form:"price"`
56
-	Pinyin      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
57
-	Wubi        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
58
-	TubeColor   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
59
-	TeamType    int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
60
-	Remark      string  `gorm:"column:remark" json:"remark" form:"remark"`
61
-	UserOrgId   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
62
-	Status      int64   `gorm:"column:status" json:"status" form:"status"`
63
-	CreatedTime int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
64
-	UpdatedTime int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
65
-	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
66
-	ItemId      string  `gorm:"column:item_id" json:"item_id" form:"item_id"`
53
+	ID          int64               `gorm:"column:id" json:"id" form:"id"`
54
+	ProjectTeam string              `gorm:"column:project_team" json:"project_team" form:"project_team"`
55
+	Price       float64             `gorm:"column:price" json:"price" form:"price"`
56
+	Pinyin      string              `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
57
+	Wubi        string              `gorm:"column:wubi" json:"wubi" form:"wubi"`
58
+	TubeColor   int64               `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
59
+	TeamType    int64               `gorm:"column:team_type" json:"team_type" form:"team_type"`
60
+	Remark      string              `gorm:"column:remark" json:"remark" form:"remark"`
61
+	UserOrgId   int64               `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
62
+	Status      int64               `gorm:"column:status" json:"status" form:"status"`
63
+	CreatedTime int64               `gorm:"column:created_time" json:"created_time" form:"created_time"`
64
+	UpdatedTime int64               `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
65
+	ProjectId   string              `gorm:"column:project_id" json:"project_id" form:"project_id"`
66
+	ItemId      string              `gorm:"column:item_id" json:"item_id" form:"item_id"`
67
+	List        []*XtHisProjectList `gorm:"-" json:"list" form:"list"`
67 68
 }
68 69
 
69 70
 func (XtHisProjectTeam) TableName() string {

+ 12 - 0
service/his_charge_service.go View File

@@ -184,6 +184,18 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
184 184
 				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)
185 185
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
186 186
 
187
+			break
188
+		case 5:
189
+			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 {
190
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 ", start_time, end_time, org_id)
191
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
192
+
193
+			break
194
+		case 6:
195
+			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 {
196
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
197
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
198
+
187 199
 			break
188 200
 
189 201
 		}