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

controllers/doctors_api_controller.go

 		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
+
+		drug, _ := service.GetAllBaseDrugListTwenty(orgID)
 		for _, item := range project {
 			index := 0
 			for _, subItem := range item.HisPrescriptionTeamProject {
 				"config":         config,
 				"project_config": project_config,
 				"project":        project,
+				"drug":           drug,
 			})
 		}
 	}

service/mobile_dialysis_service.go

 }
 
 func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string) ([]*MScheduleDoctorAdviceVM, error) {
+
+	fmt.Println("execution_frequency---------------------------", execution_frequency)
+	fmt.Println("cost_type-----------", cost_type)
+	fmt.Println("adviceType-----------", adviceType)
+	fmt.Println("patientType---------", patientType)
+	fmt.Println("len(deliverWay)--------", len(deliverWay))
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}
 		}
 
 	} else if adviceType == 2 && len(deliverWay) > 0 {
+
 		if patientType == 0 {
 			if patient_id > 0 {
 				if execution_state > 0 {
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
+		fmt.Println("寄哪里233223322323233232", patientType)
+		fmt.Println("patient_id", patient_id)
+		fmt.Println("execution_state000000", execution_state)
+		fmt.Println("cost_type", cost_type)
+		fmt.Println("len23323232", len(execution_frequency))
 		if patientType == 0 {
 			if patient_id > 0 {
 				if execution_state > 0 {
 						}
 
 					} else {
-						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
-						adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+						if len(execution_frequency) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and execution_frequency = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+						}
+
 					}
 
 				}

service/pharmacy_service.go

 	XTWriteDB().Create(&tmp)
 }
 
-//
 func SavePharmacy() (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Raw("select * from xt_doctor_advice where id > 21780 and id < 21790").Scan(&advice_info).Error
 	return nil
 }
 
-//查询药房中某一天的患者人数,is_medicine:0未发，1已发(改)
+// 查询药房中某一天的患者人数,is_medicine:0未发，1已发(改)
 func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err error) {
 	//orgid = 9675
 	InitDrugidIsNil(orgid, stime, etime)
 
 }
 
-//(改)
+// (改)
 func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list []*models.TmpPatient, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	//病人
 
 }
 
-//查询患者（改）
+// 查询患者（改）
 func GetManyUsers(tmp []int64) (list []*models.TmpPatient, err error) {
 
 	for i := 0; i < len(tmp); i++ {
 	return
 }
 
-//查询患者当天时间段中的药,is_medicine:0未发，1已发(改)
+// 查询患者当天时间段中的药,is_medicine:0未发，1已发(改)
 func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
 	return
 }
 
-//获取创建者姓名(改)
+// 获取创建者姓名(改)
 func GetAdminUserName(doctor, orgid int64) string {
 	var tmp models.VmUserAdminRole
 	XTReadDB().Model(&models.VmUserAdminRole{}).Where("admin_user_id = ? and org_id = ? and status = 1", doctor, orgid).Find(&tmp)
 	return tmp.UserName
 }
 
-//查询该机构的药房配置,true: 通过药房发药，false：不通过药房发药。如果没有该机构的信息则生成一条数据
+// 查询该机构的药房配置,true: 通过药房发药，false：不通过药房发药。如果没有该机构的信息则生成一条数据
 func GetOrgIdPharmacyConfig(orgid int64) bool {
 	var total int
 	var tmp_pharmacy models.PharmacyConfig
 	}
 }
 
-//修改该机构的药房配置
+// 修改该机构的药房配置
 func ModifyPharmacyConfig(orgid, isopen int64) (err error) {
 	if isopen == 1 || isopen == 2 {
 		err = XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{
 	return
 }
 
-//查询该药品是否通过药房发药.0否；1是
+// 查询该药品是否通过药房发药.0否；1是
 func DrugAllocation(drug_id int64) (is_pharmacy int64, err error) {
 	tmp := models.BaseDrugLib{}
 	err = XTReadDB().Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).Find(&tmp).Error
 	return tmp.IsPharmacy, err
 }
 
-//根据id查询该药是否发药
+// 根据id查询该药是否发药
 func MedicineState(id int64) (is_medicine models.HisDoctorAdviceInfoL, err error) {
 	tmp := models.HisDoctorAdviceInfoL{}
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("id = ?", id).Find(&tmp).Error
 	return tmp, err
 }
 
-//发药明细列表(
+// 发药明细列表(
 func DispensingDetailsList(stime, etime, orgid, page, limit int64, keyword string) (dislist []*models.DispensingList, total int64, err error) {
 	var fenye []*models.Pharmary //分页用的
 	offset := (page - 1) * limit
 	return
 }
 
-//处方详情//////////////////////
+// 处方详情//////////////////////
 func PrescriptionDetails(patient_id, record_date, orgid int64) (pre []*models.PrescripDetails, err error) {
 	var tmp []*models.HisDoctorAdviceInfoL
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
 	return
 }
 
-//查询病人的his id
+// 查询病人的his id
 func GetHisID(prescription_id, orgid int64) (id int64) {
 	var tmp models.HisPrintPrescription
 	XTReadDB().Model(&models.HisPrintPrescription{}).Where("id = ?", prescription_id).Find(&tmp)
 	return fin.ID
 }
 
-//根据药品id获取药品信息
+// 根据药品id获取药品信息
 func GetDrugNameTX(id int64, tx *gorm.DB) (tmp models.SpBaseDrug, err error) {
 	err = tx.Model(&models.SpBaseDrug{}).Where("id = ? and status = 1", id).Find(&tmp).Error
 	return
 	return
 }
 
-//查询药品（使用keyword）
+// 查询药品（使用keyword）
 func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDrug, error) {
 	var tmp []*models.PharmacyBaseDrug
 	tt := make(map[int64]models.PharmacyBaseDrug)
 	return tt, err
 }
 
-//查询(
+// 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.TmpLLL
 	return
 }
 
-//根据药品id获取药品规格(
+// 根据药品id获取药品规格(
 func FindDrugSpecifications(id int64) (name, specifications string) {
 	var tmp models.PharmacyBaseDrug
 	XTReadDB().Model(&models.PharmacyBaseDrug{}).Where("id = ?", id).Find(&tmp)
 	return
 }
 
-//根据药品id获取当前药品出库仓库的库存数量
+// 根据药品id获取当前药品出库仓库的库存数量
 func GetInventoryQuantity(orgid, drugid int64) (number string, err error) {
 	//获取药品拆零数量
 	var phar models.PharmacyBaseDrug
 	return
 }
 
-//获取该药品的病人信息(
+// 获取该药品的病人信息(
 func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*models.PatientInformation, err error) { ///////////////
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
 	return
 }
 
-//患者发药按钮点击（
+// 患者发药按钮点击（
 func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
 	return
 }
 
-//患者退药按钮点击
+// 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
 	return
 }
 
-//获取患者名称
+// 获取患者名称
 func FindUserName(patient_id int64) (name string) {
 	var tmp models.GetHisName
 	XTReadDB().Model(&models.GetHisName{}).Where("id = ?", patient_id).Find(&tmp)
 	return
 }
 
-//获取药品名称
+// 获取药品名称
 func FindDrugsName(drug_id int64) (name string) {
 	var tmp models.Drug
 	XTReadDB().Model(&models.Drug{}).Where("id = ?", drug_id).Find(&tmp)
 	return
 }
 
-//药品发药按钮点击(
+// 药品发药按钮点击(
 func MedicineDeparture(ids string, creater, orgid int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
 	return
 }
 
-//获取领药人姓名（
+// 获取领药人姓名（
 func GetUserAdminName(id, orgID int64) string {
 	var tmp models.XTSgjUserAdminRole
 	XTReadDB().Model(&models.XTSgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgID).Find(&tmp)
 	return tmp.UserName
 }
 
-//根据id查询是否已发药,true已发药，false未发药gai
+// 根据id查询是否已发药,true已发药，false未发药gai
 func GiveTheMedicine(id int64) bool {
 	var xue models.PharmacyDoctorAdvice
 	XTReadDB().Model(&models.PharmacyDoctorAdvice{}).Where("id = ?", id).Find(&xue)
 	return false
 }
 
-//查询改组中的药品是否包含已发药的，true已发药，false未发药
+// 查询改组中的药品是否包含已发药的，true已发药，false未发药
 func GiveGroupMedicine(orgid, groupNo int64) bool {
 	var total int
 	XTReadDB().Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ? and status = 1 and is_medicine = 1", orgid, groupNo).Count(&total)
 	return false
 }
 
-//查询处方中是否包含已发药的
+// 查询处方中是否包含已发药的
 func GiveChuMedicine(id int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("prescription_id = ? and status = 1 and is_medicine = 1", id).Count(&total)
 	return false
 }
 
-//根据处方id查找该处方中是否存在已发药的药品
+// 根据处方id查找该处方中是否存在已发药的药品
 func IsChuIssuedDrugs(prescription_id int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where("prescription_id = ? and status = 1 and is_medicine = 1", prescription_id).Count(&total)
 	return false
 }
 
-//判断该药品是否通过药房管理出库，true是，false否
-//id 药品id,org_id 机构id
+// 判断该药品是否通过药房管理出库，true是，false否
+// id 药品id,org_id 机构id
 func IsPharmacyDelivery(id, org_id int64) bool {
 	//判断药品是否通过药房管理
 	var total01 int
 	return false
 }
 
-//判断机构是否通过药房管理出库
+// 判断机构是否通过药房管理出库
 func IsPharmacyConfig(orgid int64) (bo bool) {
 	var total int
 	XTReadDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and is_open = 1 and status = 1", orgid).Count(&total)
 	return false
 }
 
-//根据患者id和发药时间，获取医生的id和姓名
+// 根据患者id和发药时间，获取医生的id和姓名
 func GetDoctorIds(id, recordtime, orgid int64) (doctor_id int64, doctor_name string, err error) {
 	var tmp []*models.TmpAdviceDoctor
 	//var tmp []int64
 	return dataString
 }
 
-//封装扣减库存
+// 封装扣减库存
 func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 
 	err = HisDrugsDelivery(orgid, creater, v)
 	return
 }
 
-//封装查询药品库存是否足够
+// 封装查询药品库存是否足够
 func FenDrugInventory(item *models.HisDoctorAdviceInfo, orgid int64) bool {
 	var total int64
 	var prescribing_number_total int64
 	return false, err
 }
 
-//判断药品是否零用
+// 判断药品是否零用
 func PettyCash(id int64) bool {
 	drug := models.XtBaseDrug{}
 	XTReadDB().Model(&drug).Where("id = ? and status = 1", id).Find(&drug)
 	return false
 }
 
-//初始化
+// 初始化
 func InitDrugidIsNil(orgid, stime, etime int64) {
 	var advice []*models.DoctorAdvice
 	XTReadDB().Model(&models.DoctorAdvice{}).Where("drug_id = 0 and user_org_id = ? and status = 1 and created_time >= ? and created_time <= ?", orgid, stime, etime).Find(&advice)
 	for _, v := range advice {
-		XTWriteDB().Exec("update xt_doctor_advice set drug_id = (select id from xt_base_drug where drug_name = ? and org_id = ?) where id = ?", v.AdviceName, v.UserOrgId, v.ID)
+		XTWriteDB().Exec("update xt_doctor_advice set drug_id = (select id from xt_base_drug where drug_name = ? and org_id = ? and status = 1 limit 1) where id = ?", v.AdviceName, v.UserOrgId, v.ID)
 	}
 }
 
-//改变处方状态(发药
+// 改变处方状态(发药
 func ChangeHisPrescription(tmp []int64) (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
 	return
 }
 
-//改变处方状态(退药
+// 改变处方状态(退药
 func ChangeHisPrescriptionT(tmp []int64) (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
 	return
 }
 
-//改变处方状态
+// 改变处方状态
 func ChangeHisPrescriptionid(id string) (err error) {
 	var advice models.HisDoctorAdviceInfo
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1", id).Find(&advice).Error
 	return
 }
 
-//获取药品规格
+// 获取药品规格
 func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrugs, err error) {
 	var g errgroup.Group
 	var lib []*models.BaseDrugLib
 	return
 }
 
-//获取药品规格，不考虑特殊病
+// 获取药品规格，不考虑特殊病
 func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error) {
 	var lib []*models.BaseDrugLib
 	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1 and drug_status not like '%停用%' ", orgid).Find(&lib).Error
 	return
 }
 
-//根据药品id获取药品名字
+// 根据药品id获取药品名字
 func IdToDrugName(id int64) (name string) {
 	var lib models.BaseDrugLib
 	readDb.Model(&models.BaseDrugLib{}).Where("id = ?", id).Find(&lib)
 	return lib.DrugName
 }
 
-//获取项目和耗材和套餐
+// 获取项目和耗材和套餐
 func ProjectConsumables3(orgid int64) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
 	return
 }
 
-//获取项目和耗材
+// 获取项目和耗材
 func ProjectConsumables2(orgid int64, special bool) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
 	return
 }
 
-//获取项目和耗材不考虑特殊病
+// 获取项目和耗材不考虑特殊病
 func ProjectConsumables2T(orgid int64) (list []*models.DropDownList, err error) {
 
 	var project []*models.XtHisProject
 	return
 }
 
-//查询药品
+// 查询药品
 func FindPatientDrug(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1 and "+
 	return false
 }
 
-//查询项目
+// 查询项目
 func FindPatientXiang(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 2 and "+
 	return false
 }
 
-//查询耗材
+// 查询耗材
 func FindPatientXiang2(orgid, patient_id, drugid, mode int64) bool {
 	var total int
 	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 3 and "+
 	return false
 }
 
-//types处方类型，1.药品 2.项目,model透析模式
+// types处方类型，1.药品 2.项目,model透析模式
 func GetHisInfoTempalteId(model, orgid, types int64) (tp []int64) {
 	type tmpid struct {
 		Id int64
 	return
 }
 
-//替换药品处方模板
+// 替换药品处方模板
 func ReplaceDrugPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionAdviceTemplate, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
 		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
 	return err
 }
 
-//替换项目模板
+// 替换项目模板
 func ReplaceProjectPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionProjectTemplate, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
 		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
 	return err
 }
 
-//删除项目模板
+// 删除项目模板
 func DeleteProjectTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
 		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
 	return err
 }
 
-//删除处方模板
+// 删除处方模板
 func DeletePrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
 		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
 	return err
 }
 
-//根据透析模式和患者id获取该患者的处方内容
+// 根据透析模式和患者id获取该患者的处方内容
 func PTemplateInformation(orgid, mode_id, patient_id int64) (tmp interface{}, err error) {
 	//获取处方id
 	var tt []*models.HisPrescriptionTemplate
 
 }
 
-//收尾工作
+// 收尾工作
 func Scavenger(orgid int64) (err error) {
 	//开事务
 	tx := XTWriteDB().Begin()
 	return
 }
 
-//分区和收费(患者发药
+// 分区和收费(患者发药
 func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*models.TmpPatient) (tmp []*models.TmpPatient, err error) {
 	//获取排班
 	var sch []*models.XtScheduleTwo
 	return
 }
 
-//分区和收费(药品发药
+// 分区和收费(药品发药
 func PartitionAndLayoutDrug(deliveryway string, stime, etime, orgid, shift, partition int64, flist []*models.PatientInformation) (tmp []*models.PatientInformation, err error) {
 	//获取排班
 	var sch []*models.XtScheduleTwo
 	return
 }
 
-//给药途径
+// 给药途径
 func Administration(deliveryway string, orgid int64, flist []*models.ListOfDrugs) (tmp []*models.ListOfDrugs, err error) {
 	//查询药品
 	var pp []*models.PharmacyBaseDrug
 	return
 }
 
-//计算总量
+// 计算总量
 func CalculateTheTotalAmount(tmp []*models.PatientInformation, drug_id int64) (total string, err error) {
 	//获取药品信息
 	var t models.SpBaseDrug