提交代码

service/his_service.go

@@ -1166,7 +1166,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return err
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64, fee_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -1176,7 +1176,7 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
-		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id  AND patient.name like ? AND patient.user_org_id = ?", keywords, user_org_id)
+		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id   AND patient.user_org_id = ?  AND (patient.name like ? or his_order.mdtrt_id like ?)", user_org_id, keywords, keywords)
 
 	}
 	if sch_type > 0 && zone_type > 0 {
@@ -1193,6 +1193,17 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Where("his_order.med_type = ?", med_type)
 	}
 
+	if fee_type > 0 {
+		if fee_type == 2 {
+			db = db.Where("his_order.is_medicine_insurance <> 1")
+
+		}
+		if fee_type == 1 {
+			db = db.Where("his_order.is_medicine_insurance = 1")
+
+		}
+	}
+
 	//if zone_type > 0 {
 	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
 	//}
@@ -1883,6 +1894,7 @@ type VMHisProjectTeam struct {
 	ProjectId         string               `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	VMItemProjectList []*VMItemProjectList `gorm:"-" json:"list" form:"list"`
 	ItemId            string               `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	DrugItemId        string               `gorm:"column:drug_item_id" json:"drug_item_id" form:"drug_item_id"`
 }
 
 func (VMHisProjectTeam) TableName() string {
@@ -3657,3 +3669,25 @@ func GetFaPiaoHisOrderByID(order_id int64) (order models.HisFaPiaoOrder, err err
 	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("order_ids like ? and status = 1", key).First(&order).Error
 	return
 }
+
+func GetDrugInfomationList(orgid int64, keyword string) (drug []*models.BaseDrugLib, err error) {
+	key := "%" + keyword + "%"
+	if len(keyword) == 0 {
+		err = XTReadDB().Where("org_id = ? and status = 1 AND  find_in_set('停用',drug_status) = 0", orgid).Find(&drug).Error
+
+	} else {
+		err = XTReadDB().Where("org_id = ? and status = 1 AND drug_name like ? AND  find_in_set('停用',drug_status) = 0", orgid, key).Find(&drug).Error
+
+	}
+	return drug, err
+}
+
+func CreateDoctorAdviceTeamList(list *models.HisDoctorAdviceTeamInfo) error {
+	err := XTWriteDB().Model(&list).Save(&list).Error
+	return err
+}
+
+func GetDrugHisListByIds(ids []string) (hisProjectList []*models.HisDoctorAdviceTeamInfo, error error) {
+	error = XTReadDB().Model(&hisProjectList).Preload("BaseDrugLib").Where(" status = 1 and id in (?)", ids).Find(&hisProjectList).Error
+	return hisProjectList, error
+}