医保对接

controllers/his_hospital_api_controller.go

@@ -135,11 +135,10 @@ func (c *HisHospitalApiController) GetHisHospitalChargePatientList() {
 	orders, _ := service.GetNewAllChargeHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
 	tempPatients, _ := service.GetNewAllUnChargeHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
 
-	var patients []*service.HospitalPatient
+	var patients []*models.HisHospitalCheckRecord
 	for _, item := range tempPatients {
 		fmt.Println(item.ID)
-		if item.HisHospitalCheckRecord.ID > 0 && item.HisHospitalCheckRecord.InHospitalStatus == 1 &&
-			item.HisHospitalCheckRecord.HisHospitalOrder.ID == 0 {
+		if item.ID > 0 && item.InHospitalStatus == 1 && item.HisHospitalOrder.OrderStatus != 2 {
 			patients = append(patients, item)
 		}
 	}

models/his_charge_models.go

@@ -25,6 +25,7 @@ type HisChargeDoctorAdviceInfo struct {
 	AdviceName string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
 	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug       Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {

service/his_charge_service.go

@@ -12,7 +12,10 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+							Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+								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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
@@ -27,7 +30,9 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
@@ -42,7 +47,9 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Where("status = 1 ")
@@ -55,7 +62,9 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
@@ -68,19 +77,74 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 		}
 
 	} else {
-		keyword = "%" + keyword + "%"
-		err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-			return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-				Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-					return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", "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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_name,unit").Where("status = 1 ")
-						}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,good_name,good_unit").Where("status = 1 ")
-						}).Where("status = 1 ")
-					})
-				}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-		}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+		keyword := "%" + keyword + "%"
+		switch item_type {
+		case 0:
+			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,project_name,unit").Where("status = 1 ")
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+							}).Where("status = 1 ")
+						})
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+
+			break
+		case 1:
+			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,project_name,unit").Where("status = 1 ")
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+							}).Where("status = 1 ")
+						})
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+
+			break
+		case 2:
+			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,project_name,unit").Where("status = 1 ")
+							}).Where("status = 1 ")
+						})
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+
+			break
+		case 3:
+			err = readDb.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.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+							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").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+							}).Where("status = 1 ")
+						})
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+
+			break
+
+		}
 
 	}
 

service/his_hospital_service.go

@@ -103,20 +103,15 @@ func GetHisHospitalSchPatientList(org_id int64, record_date int64, sch_type int6
 
 }
 
-func GetNewAllUnChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
-	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
-	db = db.Joins("join his_hospital_check_record as hp ON hp.patient_id = xt_patients.id  AND hp.status = 1 AND hp.user_org_id = ? ", org_id)
-
-	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ? AND in_hospital_status = 1", org_id).Preload("HisHospitalOrder", "user_org_id = ? AND status = 1", org_id)
-	})
-	//db = db.Preload("HisHospitalOrder", "user_org_id = ? AND status = 1 ", org_id)
-	err = db.Group("id").Find(&patients).Error
+func GetNewAllUnChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*models.HisHospitalCheckRecord, err error) {
+	db := readDb.Model(&models.HisHospitalCheckRecord{}).Where("his_hospital_check_record.user_org_id = ? AND his_hospital_check_record.status = 1 AND his_hospital_check_record.in_hospital_status = 1", org_id)
+	db = db.Preload("HisHospitalOrder", "user_org_id = ? AND status = 1", org_id)
+	err = db.Group("number").Find(&patients).Error
 	return
 }
 
 func GetNewAllChargeHisHospitalPatientList(org_id int64, record_date int64) (orders []*HisHospitalOrder, err error) {
-	db := readDb.Model(&HisHospitalOrder{}).Where("his_order.user_org_id = ? AND his_order.status = 1 AND his_order.settle_accounts_date = ? AND his_order.p_type = 1", org_id, record_date)
+	db := readDb.Model(&HisHospitalOrder{}).Where("his_order.user_org_id = ? AND his_order.status = 1 AND his_order.settle_accounts_date = ? AND his_order.p_type = 1 AND his_order.order_status = 2", org_id, record_date)
 	db = db.Preload("Patient", "status = 1")
 	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND in_hospital_status = 1", org_id)