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

controllers/dialysis_api_controller.go

@@ -2573,13 +2573,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3178,7 +3178,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {

controllers/his_api_controller.go

@@ -108,6 +108,18 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/getallgoodinforlist", &HisApiController{}, "Get:GetAllGoodInforList")
 
+	beego.Router("/api/savegoodlist", &HisApiController{}, "Post:SaveGoodList")
+
+	beego.Router("/api/getgoodlist", &HisApiController{}, "Get:GetGoodList")
+
+	beego.Router("/api/getgoodnamedetail", &HisApiController{}, "Get:GetGoodNameDetail")
+
+	beego.Router("/api/updategoodlist", &HisApiController{}, "Post:UpdateGoodList")
+
+	beego.Router("/api/deletegoodteam", &HisApiController{}, "Get:DeleteGoodTeam")
+
+	beego.Router("/api/deletegood", &HisApiController{}, "Get:DeleteGood")
+
 }
 
 func (c *HisApiController) CheckHisPatient() {
@@ -14187,3 +14199,190 @@ func (c *HisApiController) GetAllGoodInforList() {
 	})
 	return
 }
+
+func (this *HisApiController) SaveGoodList() {
+
+	project_name := this.GetString("project_name")
+	sort, _ := this.GetInt64("sort")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	goodTeam := models.XtGoodTeam{
+		ProjectName: project_name,
+		Sort:        sort,
+		UserOrgId:   orgId,
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       time.Now().Unix(),
+	}
+
+	service.CreateGoodTeam(goodTeam)
+
+	lastGoodTeam, _ := service.GetLastGoodTeam(orgId)
+
+	if dataBody["info"] != nil && reflect.TypeOf(dataBody["info"]).String() == "[]interface {}" {
+		infos, _ := dataBody["info"].([]interface{})
+		if len(infos) > 0 {
+			for _, item := range infos {
+				items := item.(map[string]interface{})
+				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+					utils.ErrorLog("good_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				good_id := int64(items["good_id"].(float64))
+
+				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "float64" {
+					utils.ErrorLog("number")
+				}
+
+				number := int64(items["number"].(float64))
+
+				xtGoodTeamList := models.XtGoodTeamList{
+					GoodId:    good_id,
+					Count:     number,
+					TeamId:    lastGoodTeam.ID,
+					UserOrgId: orgId,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+				}
+
+				service.CreateGoodList(xtGoodTeamList)
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"lastGoodTeam": lastGoodTeam,
+			})
+		}
+	}
+	return
+}
+
+func (this *HisApiController) GetGoodList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	keyword := this.GetString("keyword")
+	list, total, _ := service.GetGoodList(orgId, limit, page, keyword)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (this *HisApiController) GetGoodNameDetail() {
+
+	id, _ := this.GetInt64("id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	goodNameDetail, _ := service.GetGoodNameDetail(id, orgId)
+	goodList, _ := service.GetAllGoodList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"goodNameDetail": goodNameDetail,
+		"goodList":       goodList,
+	})
+}
+
+func (this *HisApiController) UpdateGoodList() {
+
+	project_name := this.GetString("project_name")
+	sort, _ := this.GetInt64("sort")
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	goodTeam := models.XtGoodTeam{
+		ProjectName: project_name,
+		Sort:        sort,
+		UserOrgId:   orgId,
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       time.Now().Unix(),
+		ID:          id,
+	}
+
+	service.SaveGoodTeam(goodTeam)
+
+	lastGoodTeam, _ := service.GetLastGoodTeam(orgId)
+
+	if dataBody["info"] != nil && reflect.TypeOf(dataBody["info"]).String() == "[]interface {}" {
+		infos, _ := dataBody["info"].([]interface{})
+		if len(infos) > 0 {
+			for _, item := range infos {
+				items := item.(map[string]interface{})
+				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+					utils.ErrorLog("good_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				good_id := int64(items["good_id"].(float64))
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "float64" {
+					utils.ErrorLog("number")
+				}
+
+				number := int64(items["number"].(float64))
+
+				xtGoodTeamList := models.XtGoodTeamList{
+					ID:        id,
+					GoodId:    good_id,
+					Count:     number,
+					TeamId:    lastGoodTeam.ID,
+					UserOrgId: orgId,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+				}
+
+				service.SaveGoodList(xtGoodTeamList)
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"lastGoodTeam": lastGoodTeam,
+			})
+		}
+	}
+	return
+}
+
+func (this *HisApiController) DeleteGoodTeam() {
+
+	id, _ := this.GetInt64("id")
+	team, _ := service.DeleteGoodTeam(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"team": team,
+	})
+}
+
+func (this *HisApiController) DeleteGood() {
+
+	id, _ := this.GetInt64("id")
+
+	good, _ := service.DeleteGood(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"good": good,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -319,7 +319,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 || adminUserInfo.Org.Id == 10723 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -952,7 +952,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对患者称重两次没有数据的问题
-		if adminUserInfo.Org.Id == 10702 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10723 {
 
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3741,6 +3741,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10723 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 

controllers/new_stock_api_controller.go

@@ -112,14 +112,14 @@ func (c *NewStockApiController) GetDrugChange() {
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
-	//patientList, _ := service.GetAllPatientListSix(orgId)
+	patientList, _ := service.GetAllPatientListSix(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
 		"houseList":        houseList,
-		//"patientList":      patientList,
+		"patientList":      patientList,
 	})
 }
 func (c *NewStockApiController) GetDrugQuery() {

controllers/pharmacy_controller.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"strings"
 	"time"
 
 	"XT_New/enums"
@@ -185,8 +186,17 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
+	var patientsId []int64
+
+	patient, _ := service.GetPatientKeyWord(keyword, orgid)
+	if len(patient) > 0 {
+		for _, item := range patient {
+			patientsId = append(patientsId, item.ID)
+		}
+	}
+
 	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
 
 	var ids []int64
 	for _, item := range schedule {
@@ -262,34 +272,19 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	//if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
-	//	//查询表里当天的数据
-	//	var flist []*models.TmpPatient
-	//	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-	//
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	//
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
-	//	this.ServeSuccessJSON(map[string]interface{}{
-	//		"list":     listt,
-	//		"baseList": baseList,
-	//	})
-	//	return
-	//}
-	fmt.Println(keyword)
+	var patientsId []int64
+
+	patient, _ := service.GetPatientKeyWord(keyword, orgid)
+	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", patient)
+	if len(patient) > 0 {
+		for _, item := range patient {
+			patientsId = append(patientsId, item.ID)
+		}
+	}
+
 	//当未发药的人数
 	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
 	var ids []int64
 	for _, item := range schedule {
 		ids = append(ids, item.PatientId)
@@ -1383,14 +1378,14 @@ func (this *PharmacyController) ChangeDrugCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	data_source, _ := this.GetInt64("data_source")
 	drug_code := this.GetString("drug_code")
-
-	fmt.Println("data_source--------------------", data_source)
+	str := strings.Replace(drug_code, " ", "", -1)
+	// 去除换行符
+	str = strings.Replace(str, "\n", "", -1)
 	if data_source == 1 {
-		fmt.Println("HHAHAHAH")
-		service.ChangeHisDrugCode(id, drug_code, orgId)
+		service.ChangeHisDrugCode(id, str, orgId)
 	}
 	if data_source == 2 {
-		service.ChangeAdivceDrugCode(id, drug_code, orgId)
+		service.ChangeAdivceDrugCode(id, str, orgId)
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{

models/his_models.go

@@ -2903,3 +2903,33 @@ type XtSelfDrugOutConfig struct {
 func (XtSelfDrugOutConfig) TableName() string {
 	return "xt_self_drug_out_config"
 }
+
+type XtGoodTeam struct {
+	ID             int64             `gorm:"column:id" json:"id" form:"id"`
+	ProjectName    string            `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Sort           int64             `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId      int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64             `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	XtGoodTeamList []*XtGoodTeamList `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"xt_good_team_list"`
+}
+
+func (XtGoodTeam) TableName() string {
+	return "xt_good_team"
+}
+
+type XtGoodTeamList struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodId    int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count     int64 `gorm:"column:count" json:"count" form:"count"`
+	TeamId    int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtGoodTeamList) TableName() string {
+	return "xt_good_team_list"
+}

models/new_drug_stock.go

@@ -65,11 +65,11 @@ type NewDrugFlow struct {
 	IsChange                  int64                  `gorm:"column:is_change" json:"is_change" form:"is_change"`
 	Bchno                     string                 `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	BgBchno                   string                 `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
-
-	PCount float64
-	SDate  string
-	PDate  int64
-	Unit   string
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,AdviceDate,DrugId;AssociationForeignKey:PatientId,SystemTime,DrugId"json:"his_advice_info" `
+	PCount                    float64
+	SDate                     string
+	PDate                     int64
+	Unit                      string
 }
 
 func (NewDrugFlow) TableName() string {

service/his_service.go

@@ -3520,3 +3520,86 @@ func GetDialysisPresriptionById(user_org_id int64, patient_id int64, record_date
 
 	return prescriptionInfo, err
 }
+
+func CreateGoodTeam(team models.XtGoodTeam) error {
+
+	err := XTWriteDB().Create(&team).Error
+
+	return err
+}
+
+func SaveGoodTeam(team models.XtGoodTeam) error {
+
+	err := XTWriteDB().Save(&team).Error
+
+	return err
+}
+
+func GetLastGoodTeam(org_id int64) (models.XtGoodTeam, error) {
+
+	goodTeam := models.XtGoodTeam{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", org_id).Last(&goodTeam).Error
+
+	return goodTeam, err
+}
+
+func CreateGoodList(list models.XtGoodTeamList) error {
+
+	err := XTWriteDB().Create(&list).Error
+
+	return err
+}
+
+func SaveGoodList(list models.XtGoodTeamList) error {
+
+	err := XTWriteDB().Save(&list).Error
+
+	return err
+}
+
+func GetGoodList(user_org_id int64, limit int64, page int64, keyword string) (list []*models.XtGoodTeam, total int64, err error) {
+
+	key := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(&list).Where("status=1")
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("project_name like ?", key)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&list).Error
+
+	return list, total, err
+}
+
+func GetGoodNameDetail(id int64, org_id int64) (models.XtGoodTeam, error) {
+
+	goodTeam := models.XtGoodTeam{}
+
+	err := XTReadDB().Where("id = ? and status =1 and user_org_id = ?", id, org_id).Preload("XtGoodTeamList", "status = 1 and user_org_id = ?", org_id).Find(&goodTeam).Error
+
+	return goodTeam, err
+}
+
+func DeleteGoodTeam(id int64) (models.XtGoodTeamList, error) {
+
+	goodTeamList := models.XtGoodTeamList{}
+
+	err := XTWriteDB().Model(&goodTeamList).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return goodTeamList, err
+}
+
+func DeleteGood(id int64) (models.XtGoodTeam, error) {
+
+	goodTeam := models.XtGoodTeam{}
+
+	err := XTWriteDB().Model(&goodTeam).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return goodTeam, err
+}

service/new_stock_medical_insurance_service.go

@@ -58,7 +58,7 @@ func GetNewDrugFlow(orgid int64, limit int64, page int64, startTime int64, endTi
 	//}
 
 	//}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Preload("XtDrugWarehouseOutInfo", "status = 1").Find(&drug_flow).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1 and org_id =?", orgid).Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid).Preload("XtDrugWarehouseOutInfo", "status = 1 and org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status=1 and user_org_id =?", orgid).Find(&drug_flow).Error
 	for _, item := range drug_flow {
 		var doc models.HisDoctorAdviceInfo
 		var p models.HisPrescription

service/pharmacy_service.go

@@ -97,7 +97,24 @@ func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err e
 	return len(tmp), err
 }
 
-func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64) (schedule []*models.XtSchedules, err error) {
+func GetPatientKeyWord(keywword string, org_id int64) (patient []*models.XtPatients, err error) {
+
+	db := XTReadDB().Model(&patient).Where("status=1")
+
+	likeKey := "%" + keywword + "%"
+	if len(keywword) > 0 {
+		db = db.Where("name like ? or first_letter like ?", likeKey, likeKey)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	err = db.Find(&patient).Error
+
+	return patient, err
+}
+
+func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64, patientsId []int64) (schedule []*models.XtSchedules, err error) {
 
 	db := XTReadDB().Model(&schedule).Where("status = 1")
 
@@ -118,6 +135,15 @@ func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_
 	if partion_type > 0 {
 		db = db.Where("partition_id = ?", partion_type)
 	}
+
+	if len(patientsId) == 0 {
+		db = db.Where("patient_id in(?)", patientsId)
+	}
+
+	if len(patientsId) > 0 {
+		db = db.Where("patient_id in(?)", patientsId)
+	}
+
 	err = db.Find(&schedule).Error
 
 	return schedule, err