历史排班

controllers/doctors_api_controller.go

@@ -103,8 +103,9 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
+	var keyword string
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency, keyword)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		if err != nil {
 			c.ErrorLog("获取排班信息失败:%v", err)
@@ -1393,6 +1394,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	excution_way, _ := c.GetInt64("excution_way")
 	cost_type, _ := c.GetInt64("cost_type")
 	execution_frequency := c.GetString("execution_frequency")
+	keyword := c.GetString("keyword")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -1415,7 +1417,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(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.MobileGetScheduleDoctorAdvicesOne(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 {
 			c.ErrorLog("获取排班信息失败:%v", err)

controllers/his_api_controller.go

@@ -1817,12 +1817,22 @@ 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)
 									if prescribingNumberUnit == drug.MinUnit {
-
+										fmt.Println("prescribing_number", prescribing_number)
+										fmt.Println("all_count", all_count)
 										if drug.IsUse != 1 {
+											if all_count == 0 {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
 											if prescribing_number > all_count {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
@@ -1834,6 +1844,10 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if drug.IsUse != 1 {
+											if all_count == 0 {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
 											if num > all_count {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
@@ -1890,6 +1904,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											all_count, _ := strconv.ParseFloat(totals, 64)
 											if prescribingNumberUnit == drug.MinUnit {
 												if drug.IsUse != 1 {
+													if all_count == 0 {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
 													if prescribing_number > all_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
@@ -1899,6 +1917,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												if prescribingNumberUnit == drug.MaxUnit {
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
+														if all_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 														if num > all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
@@ -2011,13 +2033,21 @@ func (c *HisApiController) CreateHisPrescription() {
 								var batch_number_count int64
 								batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
 								batch_number_counts := strconv.FormatInt(batch_number_count, 10)
+								fmt.Println("woowowowowowwowowo", advicelist.ID)
+								fmt.Println("prescribing_number", prescribing_number)
+								fmt.Println("totototootto", totals)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
 									batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
+
 									if prescribingNumberUnit == drug.MinUnit {
 
 										if drug.IsUse != 1 {
+											if all_count == 0 {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
 											if prescribing_number > all_count {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
@@ -2036,6 +2066,10 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if drug.IsUse != 1 {
+											if all_count == 0 {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
 											if num > all_count {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
@@ -2105,6 +2139,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
+													if all_count == 0 {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
 													if prescribing_number > all_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
@@ -2123,6 +2161,10 @@ func (c *HisApiController) CreateHisPrescription() {
 													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
+														if all_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 														if num > all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
@@ -2174,6 +2216,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
+													if total_count == 0 {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
 													if (number_count - device_number) > total_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
@@ -2339,6 +2385,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
+													if all_count == 0 {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
 													if prescribing_number > all_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
@@ -2357,6 +2407,10 @@ func (c *HisApiController) CreateHisPrescription() {
 													batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 													num := prescribing_number * float64(drug.MinNumber)
 													if drug.IsUse != 1 {
+														if all_count == 0 {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
 														if num > all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
@@ -2406,6 +2460,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
 												if drug.IsUse != 1 {
+													if total_count == 0 {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
 													if (number_count - device_number) > total_count {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
@@ -2449,7 +2507,10 @@ func (c *HisApiController) CreateHisPrescription() {
 															var sum_in_count int64
 															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
 															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
-
+															if sum_in_count == 0 {
+																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
+																return
+															}
 															//如果修改的数量大于有库存的第一个批次
 															if number_count > sum_in_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
@@ -2522,6 +2583,10 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 										stock_counts := strconv.FormatInt(stock_count, 10)
 										stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+										if stock_total_count == 0 {
+											c.ServeDynamicFailJsonSend(project_name + "库存不足")
+											return
+										}
 										if totals > stock_total_count {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
@@ -2545,6 +2610,10 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 												//库存不足
+												if stock_count == 0 {
+													c.ServeDynamicFailJsonSend(project_name + "库存不足")
+													return
+												}
 												if (parsetotal - count) > stock_count {
 													c.ServeDynamicFailJsonSend(project_name + "库存不足")
 													return
@@ -2620,6 +2689,10 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 											stock_counts := strconv.FormatInt(stock_count, 10)
 											stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+											if stock_total_count == 0 {
+												c.ServeDynamicFailJsonSend(project_name + "库存不足")
+												return
+											}
 											if totals > stock_total_count {
 												c.ServeDynamicFailJsonSend(project_name + "库存不足")
 												return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1265,6 +1265,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		})
 		return
 	} else if origin == 2 {
+		fmt.Println("缉拿咯喔我我哦我我")
 		adminInfo := c.GetMobileAdminUserInfo()
 		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		var ids []string
@@ -1659,6 +1660,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//
+				fmt.Println("config.IsOpen", config.IsOpen)
+				fmt.Println("config.IsOpen", item.UserOrgId)
 				if config.IsOpen == 1 && item.UserOrgId == 10028 {
 
 					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)

controllers/schedule_api_controller.go

@@ -4223,7 +4223,6 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	fmt.Println("weekt_ywppwepwpwwep", week_type)
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
 		for _, item := range list {

controllers/sign_api_controller.go

@@ -657,14 +657,114 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	fmt.Println("err", err)
-	name := dataBody["name"].(string)
+	//dataBody := make(map[string]interface{}, 0)
+	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	//fmt.Println(err)
+	//name := dataBody["name"].(string)
+	//fmt.Println(name)
+	//sign := service.CreateNewUploadPact(name)
+	//fmt.Println("sign")
+	//information, pdfBase64 := service.SavePdfInformation(name)
+
+	pdf := gofpdf.New("P", "mm", "A4", "")
+	pdf.AddPage()
+	pdf.Text(5, 10, "血液净化治疗记录单")
+	//wd := pdf.GetStringWidth(titleStr) + 6
+	//fmt.Println("wd", wd)
+	//pdf.SetY(0.6)            //先要设置 Y，然后再设置 X。否则，会导致 X 失效
+	//pdf.SetX((210 - wd) / 2) //水平居中的算法
+	//pdf.AddUTF8Font("simkai", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
+	//pdf.SetFont("simkai", "", 20)
+
+	//将字体加载进来
+	//AddUTF8Font("给字体起个别名", "", "fontPath")
+	pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
+	pdf.SetFont("simfang", "", 20)
+	var title = "血液透析(滤过)记录表单"
+	//表格居中显示
+	pdf.Text(70, 10, title)
+	wd := pdf.GetStringWidth(title) + 100
+	fmt.Println("wd", wd)
+	pdf.SetY(100)            //先要设置 Y，然后再设置 X。否则，会导致 X 失效
+	pdf.SetX((210 - wd) / 2) //水平居中的算法
+	//pdf.SetLineWidth(0)
+
+	//pdf.Line(10, 30, 585, 30)
+	//pdf.Ln(1)
+	//pdf.Write(10, "\n")
+	var numuber = "100000"
+	//表格居中显示
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(10, 20, "病历号:"+numuber)
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(60, 20, "姓名:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(90, 20, "性别:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(120, 20, "年龄:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(150, 20, "透析次数:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+
+	//表格居中显示
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(10, 30, "入科方式:"+numuber)
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(60, 30, "诊断:")
+
+	//param1: 单元格的宽,为0时表示一行,单位根据new()里面设置的来
+	//param2: 单元格的高,不能为0,单位根据new()里面设置的来
+	//param3: 单元格内容
+	//param4: 边框样式,一个空字符串表示无边框,“1”表示全边框，一个或多个“L”,“T”,“R”和“B”分别表示边界左,上,右,下
+	//param5: 表示调用后当前位置的位置。可能的值为0,接着当前行继续,1换行,2目前没有试过
+	//param6: 字体的位置,水平对齐包括"L", “C"或"R”(左,中,右)。垂直对齐由包含控制"T", “M”, “B"或"A”(上,中,下,基线),可以组合,比如说LT,CM等等
+	//param7: 是否填充单元格,需要调用SetFillColor()方法.默认false
+	//param8: 内部超链接,没用过
+	//param9: 超链接,没用过
+	pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
+	pdf.SetFont("simfang", "", 14)  // 设置字体、字号
+	pdf.SetFillColor(200, 200, 200) // 设置填充颜色
+
+	// 设置起始位置
+	var x = 10.0
+	var y = 40.0
+	// 创建8行2列的表格
+
+	for j := 0; j < 1; j++ {
+		//cellText := fmt.Sprintf("行%d列%d", i+1, j+1)                 // 填充每个单元格的内容
+		pdf.SetXY(x, y)                                         // 设置当前位置
+		pdf.CellFormat(15, 15, "时间", "1", 0, "C", false, 0, "") // 使用CellFormat()方法创建表格单元格
+		pdf.CellFormat(20, 15, "血压(mmHg)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "脉搏(次/分)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "呼吸(次/分)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "血流量(ml/min)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "静脉压(mmHg)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "跨膜压(mmHg)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "透析液温(℃)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "钠浓度(mmol/L)", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(20, 15, "超滤量(ml) ", "1", 0, "CM", false, 0, "")
+		pdf.CellFormat(35, 15, "病情变化及处理", "1", 0, "CM", false, 0, "")
+
+		y += 15 // 下一行起始位置的y坐标增加60（单元格高度）
+	}
+	x += 200.0 // 下一列起始位置的x坐标增加190（单元格宽度）
+	y = 10.0   // 行起始位置的y坐标重置为10
+
+	//设置表格单元格大小，
+	//pdf.CellFormat(180, 15, "李王", "1", 0, "LM", false, 0, "")
+
+	pdf.Ln(2)
+	//pdf.Ln(2) 行距2mm
+
+	if err := pdf.OutputFileAndClose("6.pdf"); err != nil {
+		panic(err.Error())
+	}
 
-	sign := service.CreateNewUploadPact(name)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"sign": sign,
+		//"sign":      information,
+		//"pdfBase64": pdfBase64,
+		//"name": name,
+
 	})
 
 }
@@ -715,7 +815,8 @@ func (this *SignApiController) CreateSdkSendInformation() {
 
 func (this *SignApiController) SavePdfInformation() {
 
-	information, pdfBase64 := service.SavePdfInformation()
+	var name string
+	information, pdfBase64 := service.SavePdfInformation(name)
 	informationOne := service.ToCheckInformation(pdfBase64)
 
 	maprequest := make(map[string]interface{})
@@ -973,7 +1074,8 @@ func (this *SignApiController) SavePdfInformation() {
 
 func (this *SignApiController) ToCheckInformation() {
 
-	information, pdfBase64 := service.SavePdfInformation()
+	var name string
+	information, pdfBase64 := service.SavePdfInformation(name)
 	informationOne := service.ToCheckInformation(pdfBase64)
 
 	this.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

@@ -7107,7 +7107,7 @@ func (this *StockManagerApiController) CheckWarehouseOut() {
 		}
 		service.CreateGoodErrcode(goodErrcode)
 	}
-	//查询已审核的单据
+	//查询已保存的单据
 	warehousingOutInfo, erroce := service.GetWarehouseOutById(id, orgId)
 	if erroce != nil {
 		goodErrcode := models.XtGoodErrcode{

models/patient_models.go

@@ -1808,6 +1808,9 @@ type NewDialysisPrescription struct {
 	AdminUserId                int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
 }
 
 func (NewDialysisPrescription) TableName() string {

service/manage_service.go

@@ -1818,7 +1818,7 @@ func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjec
 
 func GetDialysisOrderPatient(org_id int64) (order []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1667232000, 1669737600).Find(&order).Error
+	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1669824000, 1672416000).Find(&order).Error
 
 	return order, err
 }

service/mobile_dialysis_service.go

@@ -4518,10 +4518,13 @@ func GetFistMonitorSix(orgid int64, patient_id int64, dialysis_date int64) (reco
 	return record, err
 }
 
-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) {
+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, keyword string) ([]*MScheduleDoctorAdviceVM, error) {
 
 	var vms []*MScheduleDoctorAdviceVM
+
+	keyword = "%" + keyword + "%"
 	adviceWhere := ""
+
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {
@@ -4529,20 +4532,47 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ?"
+
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and  execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and  execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and  execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -4562,8 +4592,14 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_frequency = ?"
 							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_frequency)
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							}
+
 						}
 
 					}
@@ -4574,20 +4610,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+							}
+
 						}
 
 					}
@@ -4595,20 +4655,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+							}
+
 						}
 
 					}
@@ -4622,20 +4706,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -4643,20 +4751,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+							}
+
 						}
 
 					}
@@ -4667,20 +4799,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+							}
+
 						}
 
 					}
@@ -4688,20 +4844,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and  is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+							}
+
 						}
 
 					}
@@ -4715,20 +4895,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -4736,20 +4940,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							}
+
 						}
 
 					}
@@ -4760,20 +4988,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				if execution_state > 0 {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and is_settle=?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+							}
+
 						}
 
 					}
@@ -4781,20 +5033,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+							}
+
 						}
 
 					}
@@ -4811,20 +5087,44 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				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 record_date = ? and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and is_settle = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and is_settle = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and is_settle = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+							}
+
 						}
 
 					}
@@ -4832,20 +5132,35 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 				} else {
 					if cost_type > 0 {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? and execution_frequency = ? and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? and execution_frequency = ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, execution_frequency)
+							}
+
 						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? and advice_name like ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and is_settle = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, cost_type)
+							}
+
 						}
 
 					} else {
 						if len(execution_frequency) > 0 {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_frequency = ?"
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_frequency)
-						} else {
-							adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? "
-							adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							if len(keyword) > 0 {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ?  and advice_name like ?"
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, keyword)
+							} else {
+								adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? "
+								adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+							}
+
 						}
 
 					}

service/sign_service.go

@@ -10,8 +10,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
 	"net/http"
+	"path"
 )
 
 func GetSignNameByPhone(phoneOne string) string {
@@ -1657,7 +1659,7 @@ func CreateSdkSendInformation() (string, string) {
 	return str, orderId
 }
 
-func SavePdfInformation() (string, string) {
+func SavePdfInformation(name string) (string, string) {
 
 	var url string
 
@@ -1671,19 +1673,20 @@ func SavePdfInformation() (string, string) {
 
 	maprequest["signTitle"] = "举报合同"
 
-	//file := "C:/Users/28169/Desktop/2.pdf"
-	file := "/swspan/gopath/src/XT_New/static/6.pdf"
-
-	fileBytes, _ := ioutil.ReadFile(file) // 读取file
+	//file := "C:/Users/28169/Desktop/9.pdf"
+	//file := "/swspan/gopath/src/XT_New/static/16.pdf"
+	//fileBytes, _ := ioutil.ReadFile(file) // 读取file
+	//
+	//contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
 
-	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+	//fmt.Println("contractBase64", contractBase64)
 
 	//文件获取方式
-	maprequest["fileType"] = 1
+	maprequest["fileType"] = 3
 
-	maprequest["pdfBase64"] = contractBase64
+	//maprequest["pdfBase64"] = name
 	//合同内容
-	maprequest["fileContent"] = contractBase64
+	maprequest["fileContent"] = "https://kuyi.shengws.com/20.pdf"
 
 	//签署用户人ID
 	maprequest["userId"] = "JMO9U8JH4TN8E3QOI0GUVUF2"
@@ -1712,46 +1715,44 @@ func SavePdfInformation() (string, string) {
 	//预冲者样式
 	inputArrOne := make(map[string]interface{})
 	inputArrOne["sealName"] = "1"
-	inputArrOne["keyword"] = "杨姣"
+	inputArrOne["keyword"] = "穿刺者"
 	inputArrOne["pages"] = "0"
 	inputArrOne["offsetX"] = "50"
 	inputArrOne["offsetY"] = "0"
 
 	keywordSignControls = append(keywordSignControls, inputArrOne)
-
-	//穿刺者样式
+	stepStamper["keywordSignControls"] = keywordSignControls
+	//医生签名
 	//inputArr := make(map[string]interface{})
 	//inputArr["sealName"] = "2"
-	//inputArr["keyword"] = "治疗护士"
+	//inputArr["keyword"] = "医生签名"
 	//inputArr["pages"] = "1"
 	//inputArr["offsetX"] = "100"
 	//inputArr["offsetY"] = "0"
 	//
 	//keywordSignControls = append(keywordSignControls, inputArr)
 	//
-	////上机者
+	//上机者
 	//inputArrSix := make(map[string]interface{})
 	//inputArrSix["sealName"] = "3"
-	//inputArrSix["keyword"] = "核对护士"
+	//inputArrSix["keyword"] = "护士签名"
 	//inputArrSix["pages"] = "1"
 	//inputArrSix["offsetX"] = "100"
 	//inputArrSix["offsetY"] = "0"
 	//
 	//keywordSignControls = append(keywordSignControls, inputArrSix)
-	//
 
 	////医生签名
 	//inputArrSeven := make(map[string]interface{})
 	//inputArrSeven["sealName"] = "4"
-	//inputArrSeven["keyword"] = "医生签名"
+	//inputArrSeven["keyword"] = "核对护士签名"
 	//inputArrSeven["pages"] = "1"
 	//inputArrSeven["offsetX"] = "100"
 	//inputArrSeven["offsetY"] = "0"
 	//
 	//keywordSignControls = append(keywordSignControls, inputArrSeven)
-	//
+
 	//stepStamper["keywordSignControls"] = keywordSignControls
-	stepStamper["keywordSignControls"] = keywordSignControls
 	//
 
 	//crossSignControls := make([]map[string]interface{}, 0)
@@ -1766,17 +1767,16 @@ func SavePdfInformation() (string, string) {
 	//stepStamper["crossSignControls"] = crossSignControls
 	//
 	//xySignControls := make([]map[string]interface{}, 0)
-	//
 	//inputArrThree := make(map[string]interface{})
 	//inputArrThree["sealName"] = "1"
-	//inputArrThree["positionX"] = "100"
-	//inputArrThree["positionY"] = "0"
+	//inputArrThree["positionX"] = "200"
+	//inputArrThree["positionY"] = "100"
 	//inputArrThree["pages"] = "0"
 	//
 	//xySignControls = append(xySignControls, inputArrThree)
-	//
+	////
 	//stepStamper["xySignControls"] = xySignControls
-
+	//
 	maprequest["stepStamper"] = stepStamper
 
 	seals := make([]map[string]interface{}, 0)
@@ -1794,7 +1794,7 @@ func SavePdfInformation() (string, string) {
 
 	sealTextsList := make(map[string]interface{})
 	sealTextsList["text"] = "2023年8月8日"
-	sealTextsList["fontSize"] = "100"
+	sealTextsList["fontSize"] = "12"
 	sealTextsList["fontColor"] = "#333333"
 	sealTextsList["isTextArea"] = true
 	sealTextsList["textAlign"] = 0
@@ -1941,7 +1941,7 @@ func SavePdfInformation() (string, string) {
 
 	}
 	str := string(respBytes)
-
+	fmt.Println("报错提示", str)
 	var respJSON map[string]interface{}
 	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -2037,3 +2037,16 @@ func UpdatePersionEnterPrise(id int64, userId string) error {
 	err := XTWriteDB().Model(&models.XtDevicePersonEnterprise{}).Where("id=? and status =1", id).Updates(map[string]interface{}{"user_id": userId}).Error
 	return err
 }
+
+func SingleImg2Pdf(pathStr string) {
+	pdf := gofpdf.New("P", "mm", "A4", "")
+	pdf.AddPage()
+	pdf.SetFont("Arial", "", 11)
+	pdf.Image(pathStr, 10, 10, pdf.GetPageSizeStr("A4").Wd-20, 0, false, "", 0, "")
+	// pdf.Text(50, 20, "logo.png")
+	fileNameAll := path.Base(pathStr)
+	fileSuffix := path.Ext(pathStr)
+	fileStr := fmt.Sprintf("./pdfs/%s.pdf", fileNameAll[0:len(fileNameAll)-len(fileSuffix)])
+	err := pdf.OutputFileAndClose(fileStr)
+	fmt.Println(err)
+}

service/warhouse_service.go

@@ -5756,11 +5756,10 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			}
 			CreateGoodErrcode(goodErrcode)
 		}
-	}
-
-	goods.Count = deliver_number - stock_number
-	ConsumablesDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator)
 
+		goods.Count = deliver_number - stock_number
+		ConsumablesDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator)
+	}
 	return nil
 }