打印单单位修改

controllers/dialysis_api_controller.go

@@ -3312,6 +3312,18 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 						childSingleDose, _ := strconv.ParseFloat(childMap["single_dose"].(string), 64)
 						child.SingleDose = childSingleDose
 					}
+					if childMap["single_dose"] != nil && reflect.TypeOf(childMap["single_dose"]).String() == "float64" {
+						//childSingleDose, _ := strconv.ParseFloat(childMap["single_dose"].(string), 64)
+						child.SingleDose = childMap["single_dose"].(float64)
+					}
+					if childMap["remark"] != nil && reflect.TypeOf(childMap["remark"]).String() == "string" {
+						//childSingleDose, _ := strconv.ParseFloat(childMap["single_dose"].(string), 64)
+						child.Remark = childMap["remark"].(string)
+					}
+					if childMap["drug_id"] != nil && reflect.TypeOf(childMap["drug_id"]).String() == "float64" {
+						//childSingleDose, _ := strconv.ParseFloat(childMap["single_dose"].(string), 64)
+						child.DrugId = int64(childMap["drug_id"].(float64))
+					}
 
 					if childMap["single_dose_unit"] != nil && reflect.TypeOf(childMap["single_dose_unit"]).String() == "string" {
 						childSingleDoseUnit, _ := childMap["single_dose_unit"].(string)
@@ -3322,6 +3334,10 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 						childPrescribingNumber, _ := strconv.ParseFloat(childMap["prescribing_number"].(string), 64)
 						child.PrescribingNumber = childPrescribingNumber
 					}
+					if childMap["prescribing_number"] != nil && reflect.TypeOf(childMap["prescribing_number"]).String() == "float64" {
+						//childPrescribingNumber, _ := strconv.ParseFloat(childMap["prescribing_number"].(string), 64)
+						child.PrescribingNumber = childMap["prescribing_number"].(float64)
+					}
 
 					if childMap["prescribing_number_unit"] != nil && reflect.TypeOf(childMap["prescribing_number_unit"]).String() == "string" {
 						childPrescribingNumberUnit, _ := childMap["prescribing_number_unit"].(string)

controllers/patient_api_controller.go

@@ -1935,7 +1935,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
 						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig)
 						if prescriptionConfig.IsOpen == 1 {
-							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,item.UserOrgId){
+							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1972,7 +1972,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 					} else {
-						if medical.IsUse == 2 {
+						if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 							//更新字典里面的库存
 							var sum_count int64
@@ -2252,7 +2252,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					if prescribing_number_total <= total {
-						if medical.IsUse == 2 {
+						if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId, item.UserOrgId) {
 
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
@@ -3307,7 +3307,7 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 
 	if dataBody["drug_id"] != nil && reflect.TypeOf(dataBody["drug_id"]).String() == "string" {
 		drug_id, _ := dataBody["drug_id"].(string)
-		tmpDrugId,_ := strconv.ParseInt(drug_id,10,64)
+		tmpDrugId, _ := strconv.ParseInt(drug_id, 10, 64)
 		advice.DrugId = tmpDrugId
 	}
 	if dataBody["drug_id"] != nil && reflect.TypeOf(dataBody["drug_id"]).String() == "float64" {

controllers/pharmacy_controller.go

@@ -14,78 +14,79 @@ type PharmacyController struct {
 }
 
 func PharmacyApiRegistRouters() {
-	beego.Router("/api/pharmacy/ceshili",&PharmacyController{},"get:Tlili")
-	beego.Router("/api/pharmacy/todaynumber",&PharmacyController{},"get:TodayNumber")//查询今天的待发药，已发药人数（
-	beego.Router("/api/pharmacy/waitingdrug",&PharmacyController{},"get:WaitingDrug")//获取当天待发药的所有患者（
-	beego.Router("/api/pharmacy/issueddrugs",&PharmacyController{},"get:IssuedDrug")//获取当天已发药的所有患者（
-	beego.Router("/api/pharmacy/getpharmacycontent",&PharmacyController{},"get:GetPharmacyContent")//获取当天该患者的所有信息（
-	beego.Router("/api/pharmacy/dispensingmedicine",&PharmacyController{},"get:DispensingMedicine")//患者发药按钮点击（
-	beego.Router("/api/pharmacy/drugwithdrawal",&PharmacyController{},"get:DrugWithdrawal")//退药按钮点击
-	beego.Router("/api/pharmacy/dispensingdetails",&PharmacyController{},"get:DispensingDetails")//获取发药明细的患者列表(
-	beego.Router("/api/pharmacy/prescriptiondetails",&PharmacyController{},"get:PrescriptionDetails")//发药明细-详情(
-	beego.Router("/api/pharmacy/dispensemedicine",&PharmacyController{},"get:DispenseMedicine")//获取当天已发药的药品(
-	beego.Router("/api/pharmacy/waitingmedicine",&PharmacyController{},"get:WaitingMedicine")//获取当天待发药的药品(
-	beego.Router("/api/pharmacy/getpatientswithdrugs",&PharmacyController{},"get:GetPatientsWithDrugs")//获取当天该药品的所有患者(
-	beego.Router("/api/pharmacy/medicinedeparture",&PharmacyController{},"get:MedicineDeparture")//药品发药按钮点击(
-	beego.Router("/api/pharmacy/getcurrentname",&PharmacyController{},"get:GetCurrentName")//获取当前登录账号的名字(
+	beego.Router("/api/pharmacy/ceshili", &PharmacyController{}, "get:Tlili")
+	beego.Router("/api/pharmacy/todaynumber", &PharmacyController{}, "get:TodayNumber")                   //查询今天的待发药，已发药人数（
+	beego.Router("/api/pharmacy/waitingdrug", &PharmacyController{}, "get:WaitingDrug")                   //获取当天待发药的所有患者（
+	beego.Router("/api/pharmacy/issueddrugs", &PharmacyController{}, "get:IssuedDrug")                    //获取当天已发药的所有患者（
+	beego.Router("/api/pharmacy/getpharmacycontent", &PharmacyController{}, "get:GetPharmacyContent")     //获取当天该患者的所有信息（
+	beego.Router("/api/pharmacy/dispensingmedicine", &PharmacyController{}, "get:DispensingMedicine")     //患者发药按钮点击（
+	beego.Router("/api/pharmacy/drugwithdrawal", &PharmacyController{}, "get:DrugWithdrawal")             //退药按钮点击
+	beego.Router("/api/pharmacy/dispensingdetails", &PharmacyController{}, "get:DispensingDetails")       //获取发药明细的患者列表(
+	beego.Router("/api/pharmacy/prescriptiondetails", &PharmacyController{}, "get:PrescriptionDetails")   //发药明细-详情(
+	beego.Router("/api/pharmacy/dispensemedicine", &PharmacyController{}, "get:DispenseMedicine")         //获取当天已发药的药品(
+	beego.Router("/api/pharmacy/waitingmedicine", &PharmacyController{}, "get:WaitingMedicine")           //获取当天待发药的药品(
+	beego.Router("/api/pharmacy/getpatientswithdrugs", &PharmacyController{}, "get:GetPatientsWithDrugs") //获取当天该药品的所有患者(
+	beego.Router("/api/pharmacy/medicinedeparture", &PharmacyController{}, "get:MedicineDeparture")       //药品发药按钮点击(
+	beego.Router("/api/pharmacy/getcurrentname", &PharmacyController{}, "get:GetCurrentName")             //获取当前登录账号的名字(
 }
-func (this *PharmacyController)Tlili(){
-	times := this.GetString("time","")
+func (this *PharmacyController) Tlili() {
+	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	//orgid := this.GetAdminUserInfo().CurrentOrgId
-	service.InitDrugidIsNil(9675,stime,etime)
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	service.InitDrugidIsNil(orgid, stime, etime)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": "err",
 	})
 	return
 }
-func (this *PharmacyController)GetCurrentName(){
+func (this *PharmacyController) GetCurrentName() {
 	create := this.GetAdminUserInfo().AdminUser.Id
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": create,
 	})
 	return
 }
+
 //查询今天的待发药，已发药人数
-func (this *PharmacyController)TodayNumber(){
+func (this *PharmacyController) TodayNumber() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
 	orgid := this.GetAdminUserInfo().CurrentOrgId
-	times := this.GetString("time","")
+	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	//查询表里当天的数据
 	var wtotal int
-	wtotal,err = service.GetTodayPharmacy(stime,etime,orgid,1)
-	if err != nil{
+	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{
+	itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -96,30 +97,30 @@ func (this *PharmacyController)TodayNumber(){
 	})
 	return
 }
-func (this *PharmacyController)IssuedDrug(){
+func (this *PharmacyController) IssuedDrug() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	keyword := this.GetString("keyword","")
-	times := this.GetString("time","")
+	keyword := this.GetString("keyword", "")
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	//查询表里当天的数据
 	var flist []*models.TmpPatient
-	flist,err = service.GetTodayDrug(stime,etime,orgid,1,keyword)
-	if err != nil{
+	flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -129,30 +130,30 @@ func (this *PharmacyController)IssuedDrug(){
 	})
 	return
 }
-func (this *PharmacyController)WaitingDrug(){
+func (this *PharmacyController) WaitingDrug() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	keyword := this.GetString("keyword","")
-	times := this.GetString("time","")
+	keyword := this.GetString("keyword", "")
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	//查询表里当天的数据
 	var flist []*models.TmpPatient
-	flist,err = service.GetTodayDrug(stime,etime,orgid,0,keyword)
-	if err != nil{
+	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -162,31 +163,32 @@ func (this *PharmacyController)WaitingDrug(){
 	})
 	return
 }
+
 //
-func (this *PharmacyController)GetPharmacyContent(){
+func (this *PharmacyController) GetPharmacyContent() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	patient_id,_ := this.GetInt64("patient_id",0)
-	is_medicine,_ := this.GetInt64("is_medicine",0)//0：待发药，1：已发药
-	times := this.GetString("time","")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	is_medicine, _ := this.GetInt64("is_medicine", 0) //0：待发药，1：已发药
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	var list []*models.PharmacyContent
-	list,err = service.GetPatientMedication(orgid,patient_id,stime,etime,is_medicine)
-	if err != nil{
+	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -200,30 +202,31 @@ func (this *PharmacyController)GetPharmacyContent(){
 	return
 
 }
+
 //发药按钮点击
-func (this *PharmacyController)DispensingMedicine()  {
+func (this *PharmacyController) DispensingMedicine() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	patient_id,_ := this.GetInt64("patient_id",0)
-	times := this.GetString("time","")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	creater := this.GetAdminUserInfo().AdminUser.Id
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	err = service.DispensingMedicine(orgid,patient_id,stime,etime,creater)
-	if err != nil{
+	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -233,30 +236,31 @@ func (this *PharmacyController)DispensingMedicine()  {
 	})
 	return
 }
+
 //退药按钮点击
-func (this *PharmacyController)DrugWithdrawal(){
+func (this *PharmacyController) DrugWithdrawal() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	patient_id,_ := this.GetInt64("patient_id",0)
-	times := this.GetString("time","")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	creater := this.GetAdminUserInfo().AdminUser.Id
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
-	err = service.DrugWithdrawal(orgid,patient_id,stime,etime,creater)
-	if err != nil{
+	err = service.DrugWithdrawal(orgid, patient_id, stime, etime, creater)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -269,69 +273,70 @@ func (this *PharmacyController)DrugWithdrawal(){
 }
 
 //发药明细列表
-func (this *PharmacyController)DispensingDetails(){
+func (this *PharmacyController) DispensingDetails() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	keyword := this.GetString("keyword","")//患者名称
-	start_time := this.GetString("start_time","")//开始时间
-	end_time := this.GetString("end_time","")//结束时间
-	page, _ := this.GetInt64("page",1)               //页码
-	limit, _ := this.GetInt64("limit",10)             //每一页查出来的条数
+	keyword := this.GetString("keyword", "")       //患者名称
+	start_time := this.GetString("start_time", "") //开始时间
+	end_time := this.GetString("end_time", "")     //结束时间
+	page, _ := this.GetInt64("page", 1)            //页码
+	limit, _ := this.GetInt64("limit", 10)         //每一页查出来的条数
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if start_time == ""{
+	var stime, etime int64
+	if start_time == "" {
 		stime = 1
-	}else {
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		stime = stmp.Unix()
 	}
-	if end_time == ""{
-		_,etime = service.GetNowTime()
-	}else {
-		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59",loc)
+	if end_time == "" {
+		_, etime = service.GetNowTime()
+	} else {
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 		etime = etmp.Unix()
 	}
 	var dislist []*models.DispensingList
 	var total int64
-	dislist,total,err = service.DispensingDetailsList(stime,etime,orgid,page,limit,keyword)
-	if err != nil{
+	dislist, total, err = service.DispensingDetailsList(stime, etime, orgid, page, limit, keyword)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": dislist,
-		"total":total,
+		"list":  dislist,
+		"total": total,
 	})
 	return
 }
+
 //处方详情
-func (this *PharmacyController)PrescriptionDetails(){
+func (this *PharmacyController) PrescriptionDetails() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
 	//患者姓名
-	patient_id,_ := this.GetInt64("patient_id",0)
+	patient_id, _ := this.GetInt64("patient_id", 0)
 	//发药时间
-	record_date,_ := this.GetInt64("record_date",0)
+	record_date, _ := this.GetInt64("record_date", 0)
 	orgid := this.GetAdminUserInfo().CurrentOrgId
-	if record_date == 0 || patient_id == 0{
+	if record_date == 0 || patient_id == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数不足")
 		return
 	}
 	var list []*models.PrescripDetails
-	list,err = service.PrescriptionDetails(patient_id,record_date,orgid)
-	if err != nil{
+	list, err = service.PrescriptionDetails(patient_id, record_date, orgid)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -343,30 +348,30 @@ func (this *PharmacyController)PrescriptionDetails(){
 }
 
 //已发药品的信息
-func (this *PharmacyController)DispenseMedicine(){
+func (this *PharmacyController) DispenseMedicine() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	keyword := this.GetString("keyword","")
-	times := this.GetString("time","")
+	keyword := this.GetString("keyword", "")
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	//查询表里当天的数据
 	var flist []*models.ListOfDrugs
-	flist,err = service.GetTodayMedicine(stime,etime,orgid,1,keyword)
-	if err != nil{
+	flist, err = service.GetTodayMedicine(stime, etime, orgid, 1, keyword)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
@@ -376,31 +381,32 @@ func (this *PharmacyController)DispenseMedicine(){
 	})
 	return
 }
+
 //待发药的药品信息
-func (this *PharmacyController)WaitingMedicine(){
+func (this *PharmacyController) WaitingMedicine() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	keyword := this.GetString("keyword","")
-	times := this.GetString("time","")
+	keyword := this.GetString("keyword", "")
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	//查询表里当天的数据
 	var flist []*models.ListOfDrugs
-	flist,err = service.GetTodayMedicine(stime,etime,orgid,0,keyword)
-	if err != nil{
+	flist, err = service.GetTodayMedicine(stime, etime, orgid, 0, keyword)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -412,30 +418,30 @@ func (this *PharmacyController)WaitingMedicine(){
 }
 
 //获取药品的所有患者信息
-func (this *PharmacyController)GetPatientsWithDrugs(){
+func (this *PharmacyController) GetPatientsWithDrugs() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	drug_id,_ := this.GetInt64("drug_id",0)
-	is_medicine,_ := this.GetInt64("is_medicine",0)//0：待发药，1：已发药
-	times := this.GetString("time","")
+	drug_id, _ := this.GetInt64("drug_id", 0)
+	is_medicine, _ := this.GetInt64("is_medicine", 0) //0：待发药，1：已发药
+	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime,etime int64
-	if times == ""{
-		stime,etime = service.GetNowTime()
-	}else {
+	var stime, etime int64
+	if times == "" {
+		stime, etime = service.GetNowTime()
+	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
 	var list []*models.PatientInformation
-	list,err = service.FindMedicationList(orgid,drug_id,stime,etime,is_medicine)
-	if err != nil{
+	list, err = service.FindMedicationList(orgid, drug_id, stime, etime, is_medicine)
+	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -445,25 +451,24 @@ func (this *PharmacyController)GetPatientsWithDrugs(){
 	})
 	return
 }
+
 //药品管理发药按钮点击
-func (this *PharmacyController)MedicineDeparture(){
+func (this *PharmacyController) MedicineDeparture() {
 	var err error
 	defer func() {
-		if err != nil{
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
-	creater,_ := this.GetInt64("creater",0)//领药人
-	ids := this.GetString("ids","")//发药的数据
+	creater, _ := this.GetInt64("creater", 0) //领药人
+	ids := this.GetString("ids", "")          //发药的数据
 	orgid := this.GetAdminUserInfo().CurrentOrgId
-	orgid = 9675
-	creater = 809
-	if ids == ""{
+	if ids == "" {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数不足")
 		return
 	}
-	err = service.MedicineDeparture(ids,creater,orgid)
-	if err != nil{
+	err = service.MedicineDeparture(ids, creater, orgid)
+	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
 	}

controllers/supply_order_api_contorller.go

@@ -123,6 +123,12 @@ func CheckParams(this *SupplyOrderApiController, m *map[string][]string) (map[st
 
 //获取供应商列表GetSupplyList
 func (this *SupplyOrderApiController) GetSupplyList() {
+	var err error
+	defer func() {
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
+		}
+	}()
 	ctype, _ := this.GetInt64("ctype") //供应商类别
 	page, _ := this.GetInt64("page")   //页码
 	limit, _ := this.GetInt64("limit") //每一页查出来的条数
@@ -130,14 +136,16 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 		"page":  {"must", "string", "page"},
 		"limit": {"must", "string", "limit"},
 	}
-	_, err := CheckParams(this, &check)
+	_, err = CheckParams(this, &check)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 	}
 	keyword := this.GetString("keyword") //供应商编号\供应商名称\联系人名字
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//获取分页的数据
-	list, total, err := service.GetSupplyList(ctype, page, limit, keyword, orgId)
+	var list []*models.SpSupplierName
+	var total int64
+	list, total, err = service.GetSupplyList(ctype, page, limit, keyword, orgId)
 	//获取供应商类别
 	costClassify := "供应商类别"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, costClassify)