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

controllers/doctors_api_controller.go

 	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)
 	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
 	}
 	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/drug_stock_api_contorller.go

 
 	checker := c.GetAdminUserInfo().AdminUser.Id
 	//更改核对状态
-	err := service.CheckWarehousingInfo(warehousing_id, orgId, checker)
+	service.CheckWarehousingInfo(warehousing_id, orgId, checker)
 
-	if err == nil {
-		list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)
-		for _, item := range list {
-			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-				//新增库存
-				service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
+	list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)
+	for _, item := range list {
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			//新增库存
+			service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
 
-			}
-			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-				//新增库存
-				service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
+		}
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+			//新增库存
+			service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
 
-			}
+		}
 
-			if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 
-				//新增库存
-				service.AddDrugWarehouseStockMinNumber(item.WarehousingCount, item.ID)
+			//新增库存
+			service.AddDrugWarehouseStockMinNumber(item.WarehousingCount, item.ID)
 
-			}
+		}
 
-			Creator := c.GetAdminUserInfo().AdminUser.Id
+		Creator := c.GetAdminUserInfo().AdminUser.Id
 
-			//查询默认仓库
+		//查询默认仓库
 
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-				}
-				sum_count += it.StockMaxNumber + it.StockMinNumber
-				sum_in_count += it.WarehousingCount
-			}
-			flow := &models.DrugFlow{
-				WarehousingId:           0,
-				DrugId:                  item.DrugId,
-				Number:                  item.Number,
-				BatchNumber:             item.BatchNumber,
-				Count:                   item.WarehousingCount,
-				UserOrgId:               item.OrgId,
-				PatientId:               0,
-				SystemTime:              time.Now().Unix(),
-				ConsumableType:          1,
-				IsSys:                   0,
-				WarehousingOrder:        item.WarehousingOrder,
-				WarehouseOutId:          0,
-				WarehouseOutOrderNumber: "",
-				IsEdit:                  0,
-				CancelStockId:           0,
-				CancelOrderNumber:       "",
-				Manufacturer:            0,
-				Dealer:                  0,
-				Creator:                 Creator,
-				UpdateCreator:           Creator,
-				Status:                  1,
-				Ctime:                   item.Ctime,
-				Mtime:                   0,
-				Price:                   item.Price,
-				WarehousingDetailId:     item.ID,
-				WarehouseOutDetailId:    0,
-				CancelOutDetailId:       0,
-				ExpireDate:              item.ExpiryDate,
-				ProductDate:             item.ProductDate,
-				MaxUnit:                 item.MaxUnit,
-				MinUnit:                 item.MinUnit,
-				StorehouseId:            item.StorehouseId,
-				OverCount:               sum_count,
-			}
-			service.CreateDrugFlowTwo(flow)
-			//更新基础库剩余库存
-			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
-
-			drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
-			var total_count int64 // 入库总数量
-			var over_count int64  //剩余库存
-			for _, it := range drugInfolist {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-				}
-			}
-			for _, it := range drugInfolist {
-				total_count += it.WarehousingCount
-				over_count += it.StockMaxNumber + it.StockMinNumber
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 			}
-			//查询该仓库是否有默认数据
-			_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
-			if errcode == gorm.ErrRecordNotFound {
-				drugStock := models.XtDrugStockCount{
-					UserOrgId:      item.OrgId,
-					StorehouseId:   item.StorehouseId,
-					SumInCount:     total_count,
-					SumOutCount:    0,
-					SumCancelCount: 0,
-					DrugId:         item.DrugId,
-					Ctime:          time.Now().Unix(),
-					Mtime:          0,
-					Status:         1,
-					FlushCount:     over_count,
-					SumActOutCount: 0,
-				}
-				service.CreateDrugStockSum(drugStock)
+			sum_count += it.StockMaxNumber + it.StockMinNumber
+			sum_in_count += it.WarehousingCount
+		}
+		flow := &models.DrugFlow{
+			WarehousingId:           0,
+			DrugId:                  item.DrugId,
+			Number:                  item.Number,
+			BatchNumber:             item.BatchNumber,
+			Count:                   item.WarehousingCount,
+			UserOrgId:               item.OrgId,
+			PatientId:               0,
+			SystemTime:              time.Now().Unix(),
+			ConsumableType:          1,
+			IsSys:                   0,
+			WarehousingOrder:        item.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            0,
+			Dealer:                  0,
+			Creator:                 Creator,
+			UpdateCreator:           Creator,
+			Status:                  1,
+			Ctime:                   item.Ctime,
+			Mtime:                   0,
+			Price:                   item.Price,
+			WarehousingDetailId:     item.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ExpireDate:              item.ExpiryDate,
+			ProductDate:             item.ProductDate,
+			MaxUnit:                 item.MaxUnit,
+			MinUnit:                 item.MinUnit,
+			StorehouseId:            item.StorehouseId,
+			OverCount:               sum_count,
+		}
+		service.CreateDrugFlowTwo(flow)
+		//更新基础库剩余库存
+		service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
 
-			} else if errcode == nil {
-				service.UpdateDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count)
+		drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
+		var total_count int64 // 入库总数量
+		var over_count int64  //剩余库存
+		for _, it := range drugInfolist {
+			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+			}
+		}
+		for _, it := range drugInfolist {
+			total_count += it.WarehousingCount
+			over_count += it.StockMaxNumber + it.StockMinNumber
+		}
+		//查询该仓库是否有默认数据
+		_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
+		if errcode == gorm.ErrRecordNotFound {
+			drugStock := models.XtDrugStockCount{
+				UserOrgId:      item.OrgId,
+				StorehouseId:   item.StorehouseId,
+				SumInCount:     total_count,
+				SumOutCount:    0,
+				SumCancelCount: 0,
+				DrugId:         item.DrugId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				FlushCount:     over_count,
+				SumActOutCount: 0,
 			}
+			service.CreateDrugStockSum(drugStock)
 
+		} else if errcode == nil {
+			service.UpdateDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count)
 		}
 
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
-		})
 	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+
 }
 
 func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
 		////出库数量累加
 		var out_count_one int64
-		//fmt.Println("it.count", it.CountUnit)
-		//fmt.Println("MaxUnit", medical.MaxUnit)
-		//fmt.Println("MinUnit", medical.MinUnit)
-		//fmt.Println("count", it.Count)
-		//fmt.Println("number", medical.MinNumber)
+
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			out_count_one = it.Count * medical.MinNumber
 		}
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			out_count_one = it.Count
 		}
-		//fmt.Println("countone3232232323323232332332wo", out_count_one)
-		//增加出库数量
+
 		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
-		//fmt.Println("countunit23322332232323", it.CountUnit)
 
 	}
 	warehousingOutInfoListThree, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
 		drup, _ := service.FindBaseDrugLibRecord(it.OrgId, it.DrugId)
 		//出库逻辑
-		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it)
+		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit)
 
 		//查询剩余库存
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
 		//更新基础库库存
 		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
 
-		//查询该药品剩余库存
-		//infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut)
-		//var over_count int64
-		//for _, its := range infolist {
-		//  over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
-		//}
-		//更新剩余库存
 		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 
 	}
 		infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut)
 		var over_count int64
 		for _, its := range infolist {
-			over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+			fmt.Println("ITS", its.MaxUnit)
+			fmt.Println("itwowoowow", baseDrug.MaxUnit)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			fmt.Println("its.StockMaxNumber", its.StockMaxNumber)
+			fmt.Println("its.StockMinNumber", its.StockMinNumber)
+			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
+		fmt.Println("over_coutnwowowowowo", over_count)
 		service.UpdateDrugStockCount(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut, over_count)
 
 	}

controllers/mobile_api_controllers/patient_api_controller.go

 		})
 		return
 	} else if origin == 2 {
+		fmt.Println("缉拿咯喔我我哦我我")
 		adminInfo := c.GetMobileAdminUserInfo()
 		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		var ids []string
 				}
 
 				//
+				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/pharmacy_controller.go

 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10480 {
 		//查询表里当天的数据
 		var wtotal int
 		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
 		return
 	}
 
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10480 {
 		var wtotal int
 		var itotal int
 		//查找出库数量
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 {
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
 		})
 	}
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 {
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
 	}
 
 	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
-		fmt.Println("schedule--------", schedule)
 		var ids []int64
 		for _, item := range schedule {
 			ids = append(ids, item.PatientId)

controllers/schedule_api_controller.go

 
 	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

 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
+	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
 
 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)
+	list, _ := service.GetAllPatientNew(10188)
+	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)
+	}
+
+	//pdfg, _ := wkhtml.NewPDFGenerator()
+	//
+	//htmlStr := `<html><body><h1 style="color:red;">This is an html
+	// from pdf to test color<h1><img src="http://api.qrserver.com/v1/create-qr-
+	//code/?data=HelloWorld"   ></img></body></html>`
+	//
+	//pdfg.AddPage(wkhtml.NewPageReader(strings.NewReader(htmlStr)))
+	//
+	//// Create PDF document in internal buffer
+	//err = pdfg.Create()
+	//
+	////Your Pdf Name
+	//err = pdfg.WriteFile("./Your_pdfname.pdf")
+
+	//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,
+
 	})
 
 }
 
 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{})
 
 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

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

models/monitor_models.go

 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MonitorPatients) TableName() string {

models/patient_models.go

 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MSchedualPatientList) TableName() string {
 	InfectiousRemark             string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
 	AllergicHistory              string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress               string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (XtPatientsNew) TableName() string {
 	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 {

models/schedule_models.go

 }
 
 type VmBloodPatients struct {
-	ID    int64  `gorm:"column:id" json:"id" form:"id"`
-	BedId int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	Name  string `gorm:"column:name" json:"name" form:"name"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	BedId       int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (VmBloodPatients) TableName() string {

service/manage_center_service.go

 
 import (
 	"XT_New/models"
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 		for _, its := range list {
 			//查询该批次病人该药品出库数据
 			infos, _ := GetDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
-			fmt.Println("info2332323232332233223wo", infos.Count)
+
 			//查询该药品出库批次总入库数量
 			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, infos.OrgId)
 

service/manage_service.go

 
 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

 	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 {
 				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)
+							}
+
 						}
 
 					}
 							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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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)
+							}
+
 						}
 
 					}
 				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)
+							}
+
 						}
 
 					}
 				} 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/new_warehouse_service.go

 	return err
 }
 
+func FindOverCount(drug_id int64, org_id int64, storehouse_id int64) (models.XtDrugStockCount, error) {
+
+	stockCount := models.XtDrugStockCount{}
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and storehouse_id=?", drug_id, org_id, storehouse_id).Find(&stockCount).Error
+	return stockCount, err
+}
+
+func UpdateActOut(id int64, sum_in_count int64, flush_count int64, sum_cancel_count int64) error {
+
+	var sum_out_count int64
+	sum_out_count = sum_in_count - flush_count
+	var sum_act_out_count int64
+	sum_act_out_count = sum_out_count + sum_cancel_count
+	err := XTWriteDB().Model(&models.XtDrugStockCount{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"sum_out_count": sum_out_count, "sum_act_out_count": sum_act_out_count}).Error
+	return err
+}
+
 func ReduceDrugCount(drug_id int64, org_id int64, storehouse_id int64, out_count int64) error {
 	ut := XTWriteDB().Begin()
 	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and drug_id = ?", storehouse_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", out_count)).Error
 
 	}
 
-	fmt.Println("库存数量2嚄噢嚄噢噢哦哦嚄噢嚄o", stock_number)
-	fmt.Println("出库数咯哦我我我我嚄嚄嚄嚄", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
 
 			//查询今日该药品该患者是否有出库数据
 			lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-			fmt.Println("以色列---------------------------------------", lastDrugOutInfo.ID)
+
 			if lastDrugOutInfo.ID == 0 {
 				errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 				if errOne != nil {
 				}
 			}
 			if lastDrugOutInfo.ID > 0 {
-				fmt.Println("wowowowowowwwwwwwwwwwwwwwwwwwwwwwww")
+
 				//删除在新增
 				UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
 
 		fmt.Println("退款数来的发阿道夫", cancel_count)
 
 		fmt.Println("查收嗖嗖嗖哦", deliver_number_one-(out_count-cancel_count))
+
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number_one - out_count - cancel_count) != 0 {
 
 						AdviceId:                advice.ID,
 					}
 
-					AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+					errThreeThrtiy := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+					if errThreeThrtiy != nil {
+						drugError := models.XtDrugError{
+							UserOrgId:             orgID,
+							DrugId:                advice.DrugId,
+							RecordDate:            advice.AdviceDate,
+							PatientId:             advice.PatientId,
+							Remark:                "插入数据报错",
+							Status:                1,
+							Ctime:                 time.Now().Unix(),
+							Mtime:                 0,
+							SumCount:              0,
+							Prescribingnumber:     advice.PrescribingNumber,
+							PrescribingNumberUnit: advice.PrescribingNumberUnit,
+						}
+						CreateDrugError(drugError)
+					}
 
 				}
 				lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
 					}
 					CreateDrugError(drugError)
 				}
+
 				//出库数量相加
 				errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_nbumbwowowoowowow", deliver_number)
-		fmt.Println("out_coutnwoowowowowowow", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
 			CreateDrugFlowOne(drugflow)
 			//出库数量相加
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
 		}
 
 		if deliver_number < (out_count - cancel_count) {
 			CreateDrugFlowOne(drugflow)
 			//出库数量相加
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
 		}
 
 		if deliver_number < (out_count - cancel_count) {

service/patientmanage_service.go

 	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1")
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ? OR x.first_letter=?", likeKey, likeKey, likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)

service/sign_service.go

 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
 	"net/http"
+	"path"
 )
 
 func GetSignNameByPhone(phoneOne string) string {
 	return str, orderId
 }
 
-func SavePdfInformation() (string, string) {
+func SavePdfInformation(name string) (string, string) {
 
 	var url 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"
 	//预冲者样式
 	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)
 	//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)
 
 	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
 
 	}
 	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)
 	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)
+}
+
+func GetAllPatientNew(org_id int64) (new []*models.XtPatientsNew, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", org_id).Find(&new).Error
+	return new, err
+}
+
+func UpdatePatientNew(id int64, firstleterr string) error {
+
+	err := XTWriteDB().Model(models.XtPatientsNew{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"first_letter": firstleterr}).Error
+	return err
+}

service/stock_service.go

 }
 
 func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
-	ut := writeDb.Begin()
-	err := ut.Create(&info).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+	//ut := writeDb.Begin()
+	//err := ut.Create(&info).Error
+	//if err != nil {
+	//	ut.Rollback()
+	//	return err
+	//}
+	//ut.Commit()
+	//return err
+
+	err := writeDb.Create(&info).Error
+
 	return err
 }
 

service/warhouse_service.go

 			}
 			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
 }
 
 // 药品手动出库 递归方式
-func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, unit string) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+
 	var stock_number int64 = 0
-	var retail_price float64
+
+	var drug_price float64
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
-		formatInt := strconv.FormatInt(prescribingNumber, 10)
-		floatcount, _ := strconv.ParseFloat(formatInt, 64)
-		retail_price = floatcount * advice.Price
+
 	} else {
 		deliver_number = prescribingNumber
-		formatInt := strconv.FormatInt(prescribingNumber, 10)
-		floatcount, _ := strconv.ParseFloat(formatInt, 64)
-		retail_price = floatcount * advice.Price
+
+	}
+	if advice.CountUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
 	}
+	fmt.Println(drug_price)
 
-	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
-		//fmt.Println("stockmax", stockMax)
-		//fmt.Println("stockMin", stockMin)
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
+	if advice.CountUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
 	}
 
-	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
+	if advice.CountUnit != drup.MaxUnit || advice.CountUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
 
-	if err != nil {
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId)
+
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
 
-		return err
 	}
 
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, advice.StorehouseId)
+
 	// 将该批次的剩余库存数量转换为拆零数量
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
 	}
 	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
 		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
 	}
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	}
 
-	fmt.Println("stock_number", stock_number)
-	fmt.Println("deliver_number", deliver_number)
-	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	}
 	if stock_number >= deliver_number {
 
-		// 出库完成后，要减去对应批次的库存数量
-		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
 		}
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
+
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
 
 		warehouse.Mtime = time.Now().Unix()
 
+		//fmt.Println("stockmin", warehouse.StockMinNumber)
+		//fmt.Println("minnubmerr", minNumber)
 		if warehouse.StockMinNumber < minNumber {
+			//fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
-
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
 		} else {
-			//fmt.Println("maxNumber23323323332322323w9", maxNumber)
-			//fmt.Println("maxNumber23323323332322323w9", minNumber)
+			//fmt.Println("金5")
 			if minNumber > 0 {
-				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				} else {
-					if (warehouse.StockMinNumber - minNumber) >= 0 {
-						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-					}
-
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
+
 			}
 
-			if minNumber == 0 && maxNumber != 1 {
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
 				if warehouse.StockMinNumber > 0 {
-					if (warehouse.StockMinNumber - deliver_number) >= 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 					}
+
 				}
+
 			}
+
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
 			StockCount:              advice.StockCount,
 			WarehousingDetailId:     warehouse.ID,
 			OverCount:               over_count,
-			RetailPrice:             retail_price, //手动出库出库价格
+			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
 		}
 	} else {
 		stock_number_int := strconv.FormatInt(stock_number, 10)
 		stock_number_int_count, _ := strconv.ParseFloat(stock_number_int, 64)
-		retail_price = stock_number_int_count * advice.Price
+		drug_price = stock_number_int_count * advice.Price
 		//扣减库存
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
 			LastPrice:               warehouse.Price,
 			StockCount:              advice.StockCount,
 			OverCount:               over_count,
-			RetailPrice:             retail_price, //手动出库出库价格
+			RetailPrice:             drug_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			WarehousingDetailId:     warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
 
 		advice.CountUnit = drup.MinUnit
 
-		AutoDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+		AutoDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit)
 	}
 
 	return