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

controllers/his_api_controller.go

 	beego.Router("/api/comparedata/get", &HisApiController{}, "get:GetCompareData")
 	beego.Router("/api/fapiao/get", &HisApiController{}, "get:GetFaPiaoData")
 	beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
-
 	beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
 	beego.Router("/api/hisprescriptiontemplate/create", &HisApiController{}, "post:CreateHisPrescriptionTemplate")
 	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
 	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
-
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "post:RefudDetail")
-
 	beego.Router("/api/privateexpensesorder/get", &HisApiController{}, "get:GetPrivateExpensesOrder")
-
 	beego.Router("/api/uncharge/list", &HisApiController{}, "get:GetHisUnChargePatientList")
-
 	beego.Router("/api/monthcharge/info", &HisApiController{}, "get:GetHisMonthChargePatientInfo")
 	beego.Router("/api/monthhispatient/get", &HisApiController{}, "get:GetHisMonthPatientInfo")
-
 	beego.Router("/api/orders", &HisApiController{}, "get:GetAllOrder")
 
 	beego.Router("/api/psn/ncds/delete", &HisApiController{}, "post:DeleteNCDS")
 	beego.Router("/api/bailin/export", &PublicApiController{}, "get:GetBaiLinExportData")
 	beego.Router("/api/his/gethistdoctoradviceinfo", &HisApiController{}, "get:GetHisDoctorAdviceInfo")
-
 	beego.Router("/api/his/gethistdoctoradviceinfo", &HisApiController{}, "get:GetHisDoctorAdviceInfo")
-
 	beego.Router("/api/monthcharge/list", &HisApiController{}, "get:GetHisMonthChargePatientList")
-
 	beego.Router("/api/test/get", &HisApiController{}, "get:GetTestOrder")
-
 	beego.Router("/api/batch/settleaccount", &HisApiController{}, "get:GetBatchSettleAccounts")
-
 	beego.Router("/api/monthhispatient", &HisApiController{}, "get:GetMonthHisPatient")
 	beego.Router("/api/changeorderdesc", &HisApiController{}, "get:ChangeOrderDesc")
 	beego.Router("/api/getfapiaonumber", &HisApiController{}, "get:GetFaPiaoNumber")
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patients, _ := service.GetNewHisPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type, 0)
-	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type, 0)
+	var patients []*service.PatientTwo
+	var patients_two []*service.Patients
+
+	if c.GetAdminUserInfo().CurrentOrgId == 10768 {
+		patients, _ = service.GetNewHisPatientListBySource(adminInfo.CurrentOrgId, recordDateTime, sch_type, 0)
+		patients_two, _ = service.GetScheduleHisPatientListSource(adminInfo.CurrentOrgId, "", recordDateTime, sch_type, 0)
+
+	} else {
+		patients, _ = service.GetNewHisPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type, 0)
+		patients_two, _ = service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type, 0)
+	}
 
 	if patient_type == 2 && c.GetAdminUserInfo().CurrentOrgId == 10721 {
 		patients_three, _ := service.GetFuTouHisPatientList(adminInfo.CurrentOrgId, recordDateTime)

controllers/his_hospital_api_controller.go

 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
 	//var patients []*service.HospitalPatient
+
 	var all_tempPatients []*service.HospitalPatient
-	tempPatients, _ := service.GetHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
-	tempPatients_two, _ := service.GetHisHospitalSchPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+	var tempPatients []*service.HospitalPatient
+	var tempPatients_two []*service.HospitalPatient
 
+	if adminInfo.CurrentOrgId == 10768 {
+		tempPatients, _ = service.GetHisHospitalPatientListBySource(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		tempPatients_two, _ = service.GetHisHospitalSchPatientListBySource(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+	} else {
+		tempPatients, _ = service.GetHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		tempPatients_two, _ = service.GetHisHospitalSchPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+	}
 	if types == 0 {
-		all_tempPatients, _ = service.GetAllHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		if adminInfo.CurrentOrgId == 10768 {
+			all_tempPatients, _ = service.GetAllHisHospitalPatientListBySource(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		} else {
+			all_tempPatients, _ = service.GetAllHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		}
 		for _, item := range all_tempPatients {
 			for index, subItem := range tempPatients_two {
 				if item.ID == subItem.ID {
 
 	for _, item := range tempPatients {
 
-		if item.VMHisPrescriptionInfo.ID == 0 {
+		if len(item.HisPrescription) == 0 {
 			total_one = total_one + 1
 		}
-		if item.VMHisPrescriptionInfo.ID > 0 {
+		if len(item.HisPrescription) > 0 {
 			total_two = total_two + 1
 		}
 	}
 	} else if types == 1 { //未就诊
 		var patientsOne []*service.HospitalPatient
 		for _, item := range tempPatients {
-			if item.VMHisPrescriptionInfo.ID == 0 {
+			if len(item.HisPrescription) == 0 {
 				patientsOne = append(patientsOne, item)
 			}
 		}
 	} else if types == 2 { //已就诊
 		var patientsTwo []*service.HospitalPatient
 		for _, item := range tempPatients {
-
-			if item.VMHisPrescriptionInfo.ID > 0 {
+			if len(item.HisPrescription) > 0 {
 				patientsTwo = append(patientsTwo, item)
 			}
 		}

controllers/patient_api_controller.go

 	}
 	patient.IdCardNo = idCardNo
 
-	patient.PatientType = 1
+	insuplc_admdvs, _ := patientBody["insuplc_admdvs"].(string)
+	patient.InsuplcAdmdvs = insuplc_admdvs
 
 	if patientBody["dialysisNo"] == nil || reflect.TypeOf(patientBody["dialysisNo"]).String() != "string" {
 		utils.ErrorLog("dialysisNo")
 		return
 	}
 	patient.DialysisNo = dialysisNo
-	// }
 
 	if patientBody["lapseto"] == nil || reflect.TypeOf(patientBody["lapseto"]).String() != "float64" {
 		utils.ErrorLog("lapseto")

controllers/pharmacy_controller.go

 	stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 	stime = stmp.Unix()
 
+	var patients []*models.PharmacyPatients
 	is_medicine := 0
 	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
-	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
+	if orgid != 10217 {
+		w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
+		patients = append(patients, w_xt_advice_patient...)
+	}
 
-	var patients []*models.PharmacyPatients
 	patients = append(patients, w_his_advice_patient...)
-	patients = append(patients, w_xt_advice_patient...)
-
 	good_info, _ := service.GetGoodCodeOpen(orgid)
 	if good_info.IsOpen == 1 {
 		w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
 	}
 	var list []*models.PharmacyContent
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
-	list_p, err := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
-	list = append(list, list_p...)
+
+	good_info, _ := service.GetGoodCodeOpen(orgid)
+	if good_info.IsOpen == 1 {
+		list_p, _ := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
+		list = append(list, list_p...)
+	}
 	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	patients, _ := service.GetPatientByIDOne(orgid, patient_id)
 	//zoneList, _ := service.GetAllZoneByList(orgid)
 		//发药
 		err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 
-		err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+		good_info, _ := service.GetGoodCodeOpen(orgid)
+		if good_info.IsOpen == 1 {
+			//list_p, _ := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
+			//list = append(list, list_p...)
+			err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+
+		}
 
 		if err != nil {
 			utils.ErrorLog(err.Error())
 		//发药逻辑
 
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
-		err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+		//err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+		good_info, _ := service.GetGoodCodeOpen(orgid)
+		if good_info.IsOpen == 1 {
+			//list_p, _ := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
+			//list = append(list, list_p...)
+			err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+
+		}
 
 		//针对桑植盛康
 		if orgid == 10387 || orgid == 3877 {

models/patient_models.go

 	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	IsInfectious       int64  `gorm:"column:is_infectious" json:"is_infectious" form:"is_infectious"`
 	Height             int64  `gorm:"column:height" json:"height" form:"height"`
+	InsuplcAdmdvs      string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (MSchedualPatientList) TableName() string {
 }
 
 type PatientListForFace struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name        string `gorm:"column:name" json:"name" form:"name"`
-	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	Phone       string `gorm:"column:phone" json:"phone" form:"phone"`
-	Age         int64  `gorm:"column:age" json:"age"`
-	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name          string `gorm:"column:name" json:"name" form:"name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	DialysisNo    string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	IdCardNo      string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Phone         string `gorm:"column:phone" json:"phone" form:"phone"`
+	Age           int64  `gorm:"column:age" json:"age"`
+	CreatedTime   int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime   int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	InsuplcAdmdvs string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (PatientListForFace) TableName() string {
 	UpdatedTime        int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	InsuplcAdmdvs      string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (CdmPatients) TableName() string {
 }
 
 type BloodXtPatients struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	Name        string `gorm:"column:name" json:"name" form:"name"`
-	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DialysisNo    string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name          string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo      string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	PatientType   int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	InsuplcAdmdvs string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (BloodXtPatients) TableName() string {
 	Url                          string  `gorm:"column:url" json:"url" form:"url"`
 	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	InsuplcAdmdvsName            string  `gorm:"column:insuplc_admdvs_name" json:"insuplc_admdvs_name" form:"insuplc_admdvs_name"`
+	InsuplcAdmdvs                string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (XtPatients) TableName() string {
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	OutReason                    string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
 	DeathTime                    int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
+	InsuplcAdmdvs                string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (VmPatients) TableName() string {
 	Name          string `gorm:"column:name" json:"name" form:"name"`
 	TotalDialysis int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
 	Lapseto       int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	InsuplcAdmdvs string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (PatientsThirty) TableName() string {
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	InsuplcAdmdvs      string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (XtNewPatients) TableName() string {

service/his_hospital_service.go

 	Schedule               Schedule                      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisHospitalCheckRecord models.HisHospitalCheckRecord `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	VMHisPrescriptionInfo  VMHisPrescriptionInfo         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	HisPrescription        []models.HisPrescription      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"ps"`
 	HisHospitalOrder       models.HisHospitalOrder       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
 	FirstLetter            string                        `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
 	})
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1  AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
+func GetAllHisHospitalPatientListBySource(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
+	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.source = 2", org_id)
+	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1", org_id)
+	//db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+	})
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1  AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
 	return
 }
 	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
 		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
 	})
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
 	return
 }
 		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
 		})
+		db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
 		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
 		return
 
 		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
 		})
+		db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+		return
+
+	}
+
+}
+
+func GetHisHospitalPatientListBySource(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
+	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.source = 2", org_id)
+	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1 AND record.record_date = ? ", org_id, record_date)
+	db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+	})
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
+func GetHisHospitalSchPatientListBySource(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
+	if sch_type > 0 {
+		db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.source = 2", org_id)
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+		})
+		db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
+		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+		return
+
+	} else {
+		db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.source = 2", org_id)
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ?  ", org_id, record_date)
+		db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+		})
+		db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date)
 		err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
 		return
 

service/his_service.go

 	return
 }
 
+func GetScheduleHisPatientListSource(org_id int64, keywords string, record_date int64, sch_type int64, patient_type int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type <> 4 and xt_patients.source = 1", org_id)
+
+	if sch_type != 0 {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
+	} else {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? ", record_date, org_id)
+	}
+
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Group("xt_patients.id").Find(&patients).Error
+	return
+}
+
 func GetScheduleHisPatientListTwo(org_id int64, record_date int64) (patients []*Patients, err error) {
 	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,xt_patients.first_letter,xt_patients.patient_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type = 4", org_id)
 
 	return
 }
 
+func GetNewHisPatientListBySource(org_id int64, record_date int64, sch_type int64, patient_type int64) (patients []*PatientTwo, err error) {
+	db := readDb.Model(&PatientTwo{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 and xt_patients.patient_type <> 4 and xt_patients.source = 1", org_id).
+		Joins("join his_patient as hp ON hp.patient_id = xt_patients.id AND hp.record_date = ? AND hp.status = 1 AND hp.user_org_id = ?", record_date, org_id)
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? AND schedule_type = ?", record_date, org_id, sch_type)
+	}
+	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("HisPrescriptionTwo", "status = 1 AND user_org_id = ?  AND record_date = ?", org_id, record_date).Where("user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	})
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
 func GetNewHisPatientListTwo(org_id int64, record_date int64, sch_type int64) (patients []*PatientThree, err error) {
 	db := readDb.Model(&PatientThree{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	//if sch_type > 0 {