库存流水展示

controllers/his_api_controller.go

@@ -1054,8 +1054,201 @@ func (c *HisApiController) CreateHisPrescription() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChargeWrong)
 		return
 	}
-	//已发药和已收费限制逻辑
 
+	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
+
+	fmt.Println("0230032032032032032032023---------------", pharmacyConfig.IsOpen)
+	//药品发药出库
+	if pharmacyConfig.IsOpen == 1 {
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
+
+								var adviceId int64
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+								}
+
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
+
+								if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+									adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+								}
+
+								drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+									return
+								}
+
+								//查询药品的所有库存
+								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+
+								var total_count int64
+								for _, it := range list {
+									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+								}
+								totals := strconv.FormatInt(total_count, 10)
+								//查询该药品是否存在开药记录
+								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+								//新增处方
+								if advicelist.ID == 0 {
+									all_count, _ := strconv.ParseFloat(totals, 64)
+									if prescribingNumberUnit == drug.MinUnit {
+
+										if drug.IsUse != 1 {
+											if prescribing_number > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+
+										}
+
+									}
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if drug.IsUse != 1 {
+											if num > all_count {
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
+										}
+									}
+								}
+
+								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+								if drugOutConfig.IsOpen != 1 {
+									//修改处方
+									for _, advice := range advices {
+										var drug_id int64
+										var prescribing_number float64
+										var prescribingNumberUnit string
+										var prescribingNumber string
+
+										var adviceId int64
+										if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+											drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+										}
+										if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+											prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+											prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+											prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
+										}
+
+										if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+											prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+										}
+
+										if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
+											adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
+										}
+
+										drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, drug_id)
+										if drug.ID == 0 {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+											return
+										}
+										//查询药品的所有库存
+										list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
+										var total_count int64
+										for _, it := range list {
+											total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+										}
+										totals := strconv.FormatInt(total_count, 10)
+										//查询该药品是否存在开药记录
+										advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
+
+										//新增处方
+										if advicelist.ID == 0 {
+
+											all_count, _ := strconv.ParseFloat(totals, 64)
+											if prescribingNumberUnit == drug.MinUnit {
+												if drug.IsUse != 1 {
+													if prescribing_number > all_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+
+												}
+
+											} else {
+												if prescribingNumberUnit == drug.MaxUnit {
+													num := prescribing_number * float64(drug.MinNumber)
+													if drug.IsUse != 1 {
+														if num > all_count {
+															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+															return
+														}
+
+													}
+
+												}
+											}
+										}
+										//修改处方
+										if advicelist.ID > 0 {
+
+											var device_number int64
+
+											if advicelist.PrescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt * drug.MinNumber
+											}
+											if advicelist.PrescribingNumberUnit == drug.MinUnit {
+												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+												device_number = prescribingNumberInt
+											}
+
+											var number_count int64
+											if prescribingNumberUnit == drug.MaxUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt * drug.MinNumber
+											}
+											if prescribingNumberUnit == drug.MinUnit {
+												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+												number_count = prescribingNumberInt
+											}
+
+											//如果修改的数量大于之前修改的数量
+											if (number_count - device_number) > 0 {
+												//如果修改的差数量 大于库存数量
+												if drug.IsUse != 1 {
+													if (number_count - device_number) > total_count {
+														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+														return
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//已发药和已收费限制逻辑
 	if drugStockConfig.IsOpen == 1 || settleConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {

controllers/pharmacy_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"math"
+	"strconv"
 	"time"
 )
 
@@ -78,16 +80,7 @@ func (this *PharmacyController) TodayNumber() {
 	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	//shift, err := this.GetInt64("shift", 0) //班次
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//partition, err := this.GetInt64("partition", 0) //分区
-	//if err != nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -96,26 +89,47 @@ func (this *PharmacyController) TodayNumber() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var wtotal int
-	wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var wtotal int
+		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+
+		var itotal int
+		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	var itotal int
-	itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+		var wtotal int
+		var itotal int
+		//查找出库数量
+		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
+
+		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"wtotal": wtotal,
+			"itotal": itotal,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"wtotal": wtotal,
-		"itotal": itotal,
-	})
-	return
+
 }
 func (this *PharmacyController) IssuedDrug() {
 	var err error
@@ -150,24 +164,43 @@ func (this *PharmacyController) IssuedDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
+
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1)
+		fmt.Println("list23323232323232", list)
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 func (this *PharmacyController) WaitingDrug() {
 	var err error
@@ -202,24 +235,47 @@ func (this *PharmacyController) WaitingDrug() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//查询表里当天的数据
-	var flist []*models.TmpPatient
-	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
+		//查询表里当天的数据
+		var flist []*models.TmpPatient
+		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
+
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": listt,
+		})
 		return
 	}
-	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+	//当天已发药的人数
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0)
+
+		var flist []models.TmpPatientOne
+		if len(list) > 0 {
+			for _, item := range list {
+				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+				flist = append(flist, patientlist)
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": flist,
+		})
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": listt,
-	})
-	return
+
 }
 
 //
@@ -290,6 +346,47 @@ func (this *PharmacyController) DispensingMedicine() {
 		etime = stime + 86399
 	}
 
+	advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+	if len(advicelist) > 0 {
+		var total int64
+		var prescribing_number_total int64
+		for _, item := range advicelist {
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+			//查询该药品是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//判断单位是否相等
+			if medical.MaxUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//转化为最小单位
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count * medical.MinNumber
+			}
+			if medical.MinUnit == item.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count
+			}
+
+			if medical.IsUse != 1 {
+				//如果出库数量大于库存数量
+				if prescribing_number_total > total {
+					err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+					if err != nil {
+						utils.ErrorLog(err.Error())
+						this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+						return
+					}
+				}
+			}
+
+		}
+	}
+
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 	if err != nil {
 		utils.ErrorLog(err.Error())

models/pharmacy_models.go

@@ -31,6 +31,17 @@ type TmpPatient struct {
 	PatientID  int64
 	Name       string
 	DialysisNo string //透析号
+
+}
+
+type TmpPatientOne struct {
+	PatientID  int64  `gorm:"column:id" json:"PatientID" form:"id"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"DialysisNo" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"Name" form:"name"`
+}
+
+func (TmpPatientOne) TableName() string {
+	return "xt_patients"
 }
 
 //药品信息

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		//AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},

service/pharmacy_service.go

@@ -46,11 +46,11 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 	var tmp []*models.TmpTTT
 	if is_medicine == 0 {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 0 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 0 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -58,11 +58,11 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 		}
 	} else {
 		err = XTReadDB().Raw("select distinct patient_id from his_doctor_advice_info where "+
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 			"union "+
 			"select distinct patient_id from xt_doctor_advice where "+
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = 1 and "+
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = 1 and "+
 			"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 			stime, etime, orgid, orgid, stime, etime, orgid, orgid).Scan(&tmp).Error
 		if err != nil {
@@ -74,6 +74,52 @@ func GetTodayPharmacy(stime, etime, orgid, is_medicine int64) (num int, err erro
 
 }
 
+func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err error) {
+
+	//orgid = 9675
+	InitDrugidIsNil(orgid, stime, etime)
+	var tmp []*models.TmpTTT
+	if is_medicine == 0 {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=0 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	} else {
+		err = XTReadDB().Raw("select * from his_doctor_advice_info where status= 1 and advice_date>=? and advice_date<=? and user_org_id=? and is_medicine=1 group by patient_id",
+			stime, etime, orgid).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+
+	return len(tmp), err
+}
+
+func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
+	if stime > 0 {
+		db = db.Where("advice_date>=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", stime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Group("patient_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetPatientByAdviceId(patient_id int64) (models.TmpPatientOne, error) {
+
+	patient := models.TmpPatientOne{}
+	err = XTReadDB().Where("id = ?", patient_id).Find(&patient).Error
+	return patient, err
+}
+
 // (改)
 func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list []*models.TmpPatient, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
@@ -84,22 +130,22 @@ func GetTodayDrug(stime, etime, orgid, is_medicine int64, keyword string) (list
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"patient_id in (select id from xt_patients where user_org_id = ? and name like ? or dialysis_no like ?) and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc ",
 				stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid, stime, etime, orgid, is_medicine, orgid, keyword, keyword, orgid).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select a.* from(select distinct patient_id,dispensing_time from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct patient_id,dispensing_time from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1))a order by dispensing_time desc",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -172,13 +218,13 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	var tmp []*models.HisDoctorAdviceInfoL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
@@ -201,13 +247,13 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	var tmp_advice []*models.XtDoctorAdviceL
 	if is_medicine == 0 {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
 	} else {
 		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
 		if err != nil {
 			return pp, err
 		}
@@ -580,7 +626,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	time_now := time.Now().Unix()
 	var hids []*models.TmpID
 	var xids []*models.TmpID
-	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
+	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return
@@ -629,7 +675,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 		return err1
 	}
 
-	err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
+	err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
 		"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
 	if err != nil {
 		return
@@ -1911,3 +1957,24 @@ func GetAllValidDeviceZones02(orgID int64) ([]*models.DeviceZone, error) {
 	}
 	return zones, nil
 }
+
+func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("advice_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("advice_date<=?", etime)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}