历史排班

controllers/doctors_api_controller.go

@@ -1647,7 +1647,7 @@ func (c *DoctorsApiController) GetLongScheduleAdvicesList() {
 	excution_way, _ := c.GetInt64("excution_way")
 	cost_type, _ := c.GetInt64("cost_type")
 	execution_frequency := c.GetString("execution_frequency")
-
+	keyword := c.GetString("keyword")
 	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
 	if parseDateErr != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1657,7 +1657,7 @@ func (c *DoctorsApiController) GetLongScheduleAdvicesList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetLongScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency)
+	scheduals, err := service.MobileGetLongScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency, keyword)
 
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {

controllers/his_api_controller.go

@@ -1964,10 +1964,6 @@ func (c *HisApiController) CreateHisPrescription() {
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
-								fmt.Println("wooooooooooooo", advicelist.ID)
-								fmt.Println("prescribingNumberUnit", prescribingNumberUnit)
-								fmt.Println("prescribingNumberUnit", drug.MinUnit)
-								fmt.Println("prescribingNumberUnit", drug.MaxUnit)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3430,6 +3430,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10629 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 
@@ -4466,7 +4471,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 {
+			if adminInfo.Org.Id == 10551 || adminInfo.Org.Id == 10617 || adminInfo.Org.Id == 10580 || adminInfo.Org.Id == 10629 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2865,7 +2865,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
-			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+
+			if dialysisSolution != nil && dialysisSolution.DialysisStrainer != "" {
+				newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+			}
+
 			newprescribe.Remark = lastDialysisPrescription.Remark
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)

controllers/self_drug_api_congtroller.go

@@ -3848,6 +3848,20 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}
+
+			//获取期初结余
+			balanceList, _ := service.GetInitBalanceList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
+			for _, it := range balanceList {
+				item.StWarehousingInfoTwo = append(item.StWarehousingInfoTwo, it)
+			}
+
+			//期间减少
+			banceOutList, _ := service.GetInitOutBanceList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			for _, it := range banceOutList {
+				item.WarehouseOutInfoTenty = append(item.WarehouseOutInfoTenty, it)
+			}
+
 		}
 
 		if err != nil {

controllers/sign_api_controller.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
-	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
@@ -665,33 +664,39 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	list, _ := service.GetAllPatientNew(10375)
-	for _, item := range list {
-
-		hans := item.Name // 要转换的汉字字符串
-		// 创建一个拼音转换器
-		p := pinyin.NewArgs()
-
-		// 将汉字转为拼音
-		pinyinSlice := pinyin.Pinyin(hans, p)
-
-		// 输出拼音
-		fmt.Println("Pinyin:", pinyinSlice)
+	orderList, _ := service.GetDialysisOrderListOne(21741)
 
-		// 获取首字母
-		firstLetter := ""
-		for _, py := range pinyinSlice {
-			if len(py) > 0 {
-				firstLetter += string(py[0][0])
-			}
-		}
-
-		item.FirstLetter = firstLetter
-		service.UpdatePatientNew(item.ID, item.FirstLetter)
-		// 输出首字母
-		//fmt.Println("First Letter:", firstLetter)
+	for _, item := range orderList {
+		service.UpdateSchedulePatient(item.PatientId, item.DialysisDate, item.ZoneId, item.BedID)
 	}
 
+	//list, _ := service.GetAllPatientNew(10375)
+	//for _, item := range list {
+	//
+	//	hans := item.Name // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
+	//
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//
+	//	// 输出拼音
+	//	fmt.Println("Pinyin:", pinyinSlice)
+	//
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//
+	//	item.FirstLetter = firstLetter
+	//	service.UpdatePatientNew(item.ID, item.FirstLetter)
+	//	// 输出首字母
+	//	//fmt.Println("First Letter:", firstLetter)
+	//}
+
 	//baseList, _ := service.GeteAllBaseList(10375)
 	//for _, item := range baseList {
 	//	hans := item.DrugName // 要转换的汉字字符串

models/new_stock_models.go

@@ -286,6 +286,9 @@ type GoodInfoTwenty struct {
 	WarehouseOutInfoStart  []*VmStockFlowTwenty
 	WarehouseInfoEnd       []*VmStockFlowTwenty //期末入库量
 	StartFlowWarehouseInfo []*VmStockFlowTwenty //本期增加
+
+	StWarehousingInfoTwo  []*StWarehousingInfoOne  `gorm:"json:"new_warehouse_info_start"` //期间增加
+	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`
 	//期初结余
 	StartFlowInfo    []*VmStockFlowTwenty
 	StartOutFlowInfo []*VmStockFlowTwenty
@@ -308,10 +311,6 @@ type GoodInfoTwenty struct {
 	WareStartEndStockInventoryProfit []*VmStockFlowTwenty //期间盘盈
 	WareStartEndStockInventoryLosses []*VmStockFlowTwenty //期间盘亏
 
-	//newOverInCount     []*VmStockFlowTwenty
-	//newOverOuntCount   []*VmStockFlowTwenty
-	//newOverCancelCount []*VmStockFlowTwenty
-
 	//期初结余
 	GoodStartFlowInfo VmStockFlowTwenty
 	//期末结余

models/stock_models.go

@@ -113,6 +113,20 @@ func (StWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
 
+type StWarehousingInfoOne struct {
+	ID               int64  `gorm:"column:id" json:"id"`
+	GoodId           int64  `gorm:"column:good_id" json:"good_id"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit  string `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	PackingUnit      string `json:"packing_unit"`
+	StorehouseId     int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id"`
+}
+
+func (StWarehousingInfoOne) TableName() string {
+	return "xt_warehouse_info"
+}
+
 type XtWarehouse struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
@@ -1689,3 +1703,18 @@ type WarehousingInfoNight struct {
 func (WarehousingInfoNight) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type WarehouseOutInfoTenty 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"`
+	Mtime         int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime         int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status        int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId         int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SysRecordTime int64 `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+}
+
+func (WarehouseOutInfoTenty) TableName() string {
+	return "xt_warehouse_out_info"
+}

service/mobile_dialysis_service.go

@@ -8699,10 +8699,11 @@ func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPa
 	return weight, err
 }
 
-func MobileGetLongScheduleDoctorAdvices(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) {
+func MobileGetLongScheduleDoctorAdvices(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, keyword string) ([]*MScheduleDoctorAdviceVM, error) {
 
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
+	keyword = "%" + keyword + "%"
 	adviceCondition := []interface{}{}
 	if adviceType == 1 {
 		if patientType == 0 {
@@ -8710,20 +8711,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -8731,20 +8756,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and patient_id = ? and is_settle = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 and patient_id = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+							}
+
 						}
 
 					}
@@ -8755,31 +8804,67 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+							}
+
 						}
 
 					}
 
 				} else {
 					if cost_type > 0 {
-						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and is_settle = ? "
-						adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+						if len(keyword) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and is_settle = ? and advice_name like ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, keyword)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and is_settle = ? "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+						}
+
 					} else {
-						adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1   "
-						adviceCondition = append(adviceCondition, adviceWhere, orgID)
+						if len(keyword) > 0 {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  and advice_name like ?"
+							adviceCondition = append(adviceCondition, adviceWhere, orgID, keyword)
+						} else {
+							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1   "
+							adviceCondition = append(adviceCondition, adviceWhere, orgID)
+						}
+
 					}
 
 				}
@@ -8791,20 +8876,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and  is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -8812,20 +8921,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and is_settle = ?and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and is_settle = ?and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and is_settle = ?and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and patient_id = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and patient_id = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, patient_id)
+							}
+
 						}
 
 					}
@@ -8836,20 +8969,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and execution_state=? and is_settle = ?and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and execution_state=? and is_settle = ?and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? and execution_state=? and is_settle = ?and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_state=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_state)
+							}
+
 						}
 
 					}
@@ -8857,20 +9014,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and  is_settle = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND advice_doctor = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ?  and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND advice_doctor = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, adminUserId)
+							}
+
 						}
 
 					}
@@ -8884,20 +9065,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -8905,20 +9110,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ?  and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ?  and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and patient_id = ?  and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and patient_id = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and patient_id = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and patient_id = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, patient_id)
+							}
+
 						}
 
 					}
@@ -8929,20 +9158,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1AND execution_staff = 0 and execution_state = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_state)
+							}
+
 						}
 
 					}
@@ -8951,20 +9204,44 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND execution_staff = 0 and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0 and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1  AND execution_staff = 0"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID)
+							}
+
 						}
 
 					}

service/patient_service.go

@@ -79,7 +79,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	}
 	if lapseto != 2 && lapseto != 3 {
-		if orgID != 10579 && orgID != 10600 {
+		if orgID != 10579 && orgID != 10600 && orgID != 10587 {
 			err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
@@ -87,6 +87,10 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 			err = db.Order("p.dialysis_no asc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 		}
 
+		if orgID == 10587 {
+			err = db.Order("p.created_time desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+		}
+
 	}
 
 	return

service/pharmacy_service.go

@@ -1026,6 +1026,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	//针对阜阳经沃
 	if orgid != 10480 {
 		for _, v := range advice_info {
+
 			//扣减库存
 			if !IsPharmacyDelivery(v.DrugId, orgid) {
 				continue
@@ -1056,6 +1057,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			//退药
 			UpdateHisPrescriptionInfo(v.PatientId, v.AdviceDate, v.UserOrgId)
 
+			//退药
+			UpdateHisPrescriptionInfoOne(v.PatientId, v.AdviceDate, v.UserOrgId)
+
 		}
 	}
 
@@ -2272,10 +2276,15 @@ func UpdateAdviceFlow(id int64) error {
 }
 
 func UpdateHisPrescriptionInfo(patient_id int64, advice_date int64, user_org_id int64) error {
-
 	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date = ? and user_org_id= ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
 
-	err = XTWriteDB().Model(&models.HisPrintPrescription{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	return err
+}
+
+func UpdateHisPrescriptionInfoOne(patient_id int64, advice_date int64, user_org_id int64) error {
+
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
 	return err
 }
 

service/self_drug_service.go

@@ -3012,3 +3012,52 @@ func GetPurchaseStockQueryList(good_type int64, keyword string, page int64, limi
 
 	return goodinfo, total, err
 }
+
+func GetInitBalanceList(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.StWarehousingInfoOne, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1")
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime<=?", start_time)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+
+}
+
+func GetInitOutBanceList(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.WarehouseOutInfoTenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1")
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime<=?", start_time)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+}

service/sign_service.go

@@ -2212,3 +2212,16 @@ func UpdateWarehouseOutOrderInfo(id int64, warehouse_out_order_number string) er
 	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? and status=1", id).Updates(map[string]interface{}{"warehouse_out_order_number": warehouse_out_order_number}).Error
 	return err
 }
+
+func GetDialysisOrderListOne(patient_id int64) (order []*models.DialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and status=1 and user_org_id =10495", patient_id).Find(&order).Error
+
+	return order, err
+}
+
+func UpdateSchedulePatient(patient_id int64, schedule_date int64, zone_id int64, bed_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("patient_id = ? and schedule_date =? and partition_id = ? and bed_id =?", patient_id, schedule_date, zone_id, bed_id).Updates(map[string]interface{}{"status": 1}).Error
+	return err
+}