11月8日库存管理

controllers/dialysis_record_api_controller.go

@@ -1549,9 +1549,31 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
 	redis := service.RedisClient()
-	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(startDate.Unix(), 10) + ":dialysis_orders_list_all"
+	key := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":dialysis_order"
 	redis.Set(key, "", time.Second)
-	redis.Close()
+	keyOne := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":dialysis_orders_list_all"
+
+	//清空key 值
+	redis.Set(keyOne, "", time.Second)
+	scheduleDateStartOne := startDate.Format("2006-01-02")
+	keyTwo := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(tempDialysisRecord.UserOrgId, 10)
+
+	redis.Set(keyTwo, "", time.Second)
+
+	keyThree := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":doctor_advices"
+	redis.Set(keyThree, "", time.Second)
+	keyFour := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":monitor_records"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":patient_info"
+	redis.Set(keyFive, "", time.Second)
+
+	keySix := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":his_doctor_advice"
+	redis.Set(keySix, "", time.Second)
+
+	keySeven := strconv.FormatInt(tempDialysisRecord.UserOrgId, 10) + ":" + ":device_list_all"
+	redis.Set(keySeven, "", time.Second)
+
 	if updateErr != nil {
 		this.ErrorLog("修改上机失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/drug_pharmacy_management_controller.go

@@ -0,0 +1,243 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/service"
+	"XT_New/utils"
+	"fmt"
+	"github.com/astaxie/beego"
+	"strings"
+	"time"
+)
+
+type PharmacyApiController struct {
+	BaseAuthAPIController
+}
+
+func PharmacyApiControllersRegisterRouters() {
+
+	beego.Router("/api/advice/gettodayadvicelist", &PharmacyApiController{}, "Get:GetTodayAdviceList")
+	beego.Router("api/advice/getpharmacybasedrug", &PharmacyApiController{}, "Get:GetPharyMacyBaseDrug")
+	beego.Router("/api/advice/updatepharmacybasedrug", &PharmacyApiController{}, "Get:UpdatePharmacyBaseDrug")
+}
+
+func (this *PharmacyApiController) GetTodayAdviceList() {
+
+	keywords := this.GetString("keywords")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	//获取药房发药药品库数据
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	list, err := service.GetPharmacyDrugList(houseConfig.DrugStorehouseOut, orgId, keywords)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *PharmacyApiController) GetPharyMacyBaseDrug() {
+
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取血透医嘱
+	advicelist, _ := service.GetBloodAdviceList(theStartTime, drug_id, orgId)
+
+	//获取医保医嘱
+	hisAdviceList, err := service.GetHisAdviceList(theStartTime, drug_id, orgId)
+
+	patient, _ := service.GetAllPatientListSix(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"advicelist":    advicelist,
+			"hisAdviceList": hisAdviceList,
+			"patient":       patient,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
+
+	bloodStr := this.GetString("bloodStr")
+
+	hisStr := this.GetString("hisStr")
+
+	if len(bloodStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	idArray := strings.Split(bloodStr, ",")
+
+	if len(hisStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	idArrayOne := strings.Split(hisStr, ",")
+
+	fmt.Println("idArray23332233223", idArray)
+	fmt.Println("idArrayOne23332233223", idArrayOne)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	service.UpdatePharmacyAdviceBaseDrug(idArray, orgId)
+	service.UpdatePharmacyHisAdviceBaseDrug(idArray, orgId)
+
+	//出库逻辑
+	adviceList, _ := service.GetPharmacyAdviceList(idArray, orgId)
+
+	hisAdviceList, _ := service.GetPharmacyHisAdviceList(idArray, orgId)
+	fmt.Print(hisAdviceList)
+	//查询是否通过药房出库
+	pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
+
+	medical, _ := service.GetBaseDrugMedical(orgId)
+	fmt.Print(medical)
+	if pharmacyConfig.IsOpen == 1 {
+
+		for _, item := range adviceList {
+			fmt.Print(item)
+			//houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+			////查询该药品是否有库存
+			//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(advice.PrescribingNumber), 'f', 0, 64)
+			//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+			//  total = list.Count*medical.MinNumber + list.StockMinNumber
+			//  prescribing_number_total = count
+			//}
+			//
+			//if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+			//  c.ServeSuccessJSON(map[string]interface{}{
+			//    "msg":    "3",
+			//    "advice": advice,
+			//  })
+			//  return
+			//}
+			//if prescribing_number_total > total {
+			//  c.ServeSuccessJSON(map[string]interface{}{
+			//    "msg":    "2",
+			//    "advice": advice,
+			//  })
+			//  return
+			//}
+			//if prescribing_number_total <= total {
+			//
+			//  //查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+			//
+			//  adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+			//  if adviceSetting.IsAdviceOpen == 1 {
+			//
+			//    //查询是否出库按钮开启
+			//    prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+			//    if prescriptionConfig.IsOpen == 1 {
+			//      if medical.IsUse == 2 {
+			//        service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+			//        //查询默认仓库
+			//        houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+			//        //查询默认仓库剩余多少库存
+			//        list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, 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
+			//        }
+			//        service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+			//        break
+			//        c.ServeSuccessJSON(map[string]interface{}{
+			//          "msg":    "1",
+			//          "advice": advice,
+			//        })
+			//        return
+			//      }
+			//      if medical.IsUse == 1 {
+			//        c.ServeSuccessJSON(map[string]interface{}{
+			//          "msg":    "1",
+			//          "advice": advice,
+			//        })
+			//        return
+			//      }
+			//    } else {
+			//      if medical.IsUse == 1 {
+			//        c.ServeSuccessJSON(map[string]interface{}{
+			//          "msg":    "1",
+			//          "advice": advice,
+			//        })
+			//        return
+			//      }
+			//    }
+			//
+			//  } else {
+			//    if medical.IsUse == 2 {
+			//      service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+			//      //查询默认仓库
+			//      houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+			//      //查询默认仓库剩余多少库存
+			//      list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, 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
+			//      }
+			//      service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+			//      break
+			//      c.ServeSuccessJSON(map[string]interface{}{
+			//        "msg":    "1",
+			//        "advice": advice,
+			//      })
+			//      return
+			//    }
+			//    if medical.IsUse == 1 {
+			//      c.ServeSuccessJSON(map[string]interface{}{
+			//        "msg":    "1",
+			//        "advice": advice,
+			//      })
+			//      return
+			//    }
+			//  }
+			//}
+		}
+	}
+
+}

controllers/drug_stock_api_contorller.go

@@ -935,6 +935,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 			}
 
+			// 如果当前的入库数量 等于 历史入库数量
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
 
 				item.OrgId = item.OrgId
@@ -985,7 +986,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						fmt.Println(parseDateErr)
 					}
 				}
-				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
+				errs = service.UpDateDrugWarehousingInfoSix(item.ID, warehouseinfo)
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存

controllers/his_api_controller.go

@@ -830,8 +830,10 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	adminInfo := c.GetAdminUserInfo()
 	//获取医嘱模版
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
+
+	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 	//获取所有基础药
-	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	drugs, _ := service.GetAllDrugLibListSix(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
 
 	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
 	if config.ID > 0 && config.IsOpen == 1 {

controllers/his_project_api_controller.go

@@ -828,7 +828,8 @@ func (this *HisProjectApiController) GetHisProject() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	project, err := service.GetHisProject(orgId)
-	good_info, err := service.GetGoodInfoMation(orgId)
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	good_info, err := service.GetGoodInfoMationSix(orgId, houseConfig.StorehouseOutInfo)
 	_, config := service.FindHisStockPriceRecordByOrgId(orgId)
 	if config.ID > 0 && config.IsOpen == 1 {
 		//处理耗材不同批号价格问题

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3800,9 +3800,10 @@ func (c *DialysisAPIController) GetSchedule() {
 	//scheduleTime := theStartTime.Unix()
 	scheduleTime, _ := c.GetInt64("record_date")
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.Org.Id, scheduleTime, schedual_type)
-
+	list, _ := service.GetAllBedNumberSeven(adminUserInfo.Org.Id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"number": deviceNumber,
+		"list":   list,
 	})
 
 }

models/device_models.go

@@ -1135,3 +1135,20 @@ type ScheduleDeviceNumber struct {
 func (ScheduleDeviceNumber) TableName() string {
 	return "xt_device_number"
 }
+
+type SgjDeviceNumber struct {
+	ID      int64       `gorm:"column:id" json:"id" form:"id"`
+	OrgId   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number  string      `gorm:"column:number" json:"number" form:"number"`
+	GroupId int64       `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId  int64       `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status  int64       `gorm:"column:status" json:"status" form:"status"`
+	Ctime   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort    int64       `gorm:"column:sort" json:"sort" form:"sort"`
+	Zone    *DeviceZone `gorm:"ForeignKey:ZoneId" json:"zone"`
+}
+
+func (SgjDeviceNumber) TableName() string {
+	return "xt_device_number"
+}

models/drug_pharmacy_management_models.go

@@ -0,0 +1,215 @@
+package models
+
+type PharmacyBaseDrug struct {
+	ID                          int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string                 `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string                 `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string                 `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string                 `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string                 `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string                 `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64                  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64                  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                     string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	UnitMatrixing               string                 `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64                  `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string                 `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string                 `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Manufacturer                int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64                  `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64                  `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string                 `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64                  `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                  `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string                 `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string                 `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string                 `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string                 `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64                `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64                  `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64                  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64                  `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64                  `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64                  `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                  `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64                  `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	Status                      int64                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                       int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                       int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	DoseCode                    string                 `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	RecordDate                  int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string                 `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string                 `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	IsMark                      int64                  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	PrescriptionMark            int64                  `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	HospApprFlag                int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                       float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	MinNumber                   int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose                        float64                `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay                     string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice                    float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	ProvincesCode               string                 `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	IsUser                      int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	SumCount                    int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	BatchRetaiPrice             float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumInCount                  int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	IsPharmacy                  int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	DrugWarehouseInfo           []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+}
+
+func (PharmacyBaseDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type PharmacyDoctorAdvice struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	SyncAdviceId          int64   `gorm:"column:sync_advice_id" json:"sync_advice_id" form:"sync_advice_id"`
+	IsSync                int64   `gorm:"column:is_sync" json:"is_sync" form:"is_sync"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (PharmacyDoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
+type PharmacyHisDoctorAdviceInfo struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+}
+
+func (PharmacyHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type PharmacyConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (PharmacyConfig) TableName() string {
+	return "xt_pharmacy_config"
+}

routers/router.go

@@ -82,4 +82,5 @@ func init() {
 	controllers.SecondaryOrderApiRegistRouters()
 	controllers.HisDepositApiRegistRouters()
 	controllers.HisSummaryApiRegistRouters()
+	controllers.PharmacyApiControllersRegisterRouters()
 }

service/device_service.go

@@ -767,3 +767,9 @@ func GetAllBedNumberSix(orgId int64) (devicenumber []*models.ScheduleDeviceNumbe
 	err = XTReadDB().Where("org_id = ? and status = 1", orgId).Find(&devicenumber).Error
 	return devicenumber, err
 }
+
+func GetAllBedNumberSeven(orgId int64) (devicenumber []*models.SgjDeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status= 1", orgId).Preload("Zone", "status = 1").Find(&devicenumber).Error
+	return devicenumber, err
+}

service/dialysis_service.go

@@ -1382,6 +1382,13 @@ func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 	return goodinfo, err
 }
 
+func GetGoodInfoMationSix(orgid int64, storehouse_id int64) (goodinfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1 and storehouse_id = ?", storehouse_id).Find(&goodinfo).Error
+	//err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
+	return goodinfo, err
+}
+
 func GetDialysisBeforePrepare(goodTypeId int64, goodId int64, orgid int64, patientId int64) (*models.DialysisBeforePrepare, error) {
 
 	prepare := models.DialysisBeforePrepare{}

service/drug_pharmacy_management_service.go

@@ -0,0 +1,69 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
+
+func GetPharmacyDrugList(storehouse_id int64, orgid int64, keywords string) (drug []*models.PharmacyBaseDrug, err error) {
+
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用  and is_pharmacy = 1'", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
+		}).Find(&drug).Error
+	} else {
+		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
+		}).Find(&drug).Error
+	}
+	return
+}
+
+func GetBloodAdviceList(advice_date int64, drug_id int64, org_id int64) (advice []*models.PharmacyDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("advice_date = ? and drug_id = ? and user_org_id = ? and status = 1 and advice_type =2 and is_medicine= 0", advice_date, drug_id, org_id).Find(&advice).Error
+	return advice, err
+}
+
+func GetHisAdviceList(advice_date int64, drug_id int64, org_id int64) (advice []*models.PharmacyHisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("advice_date = ? and drug_id =? and user_org_id =? and status = 1 and is_medicine = 0", advice_date, drug_id, org_id).Order("prescription_id asc").Find(&advice).Error
+	return advice, err
+}
+
+func UpdatePharmacyAdviceBaseDrug(ids []string, orgid int64) (models.PharmacyDoctorAdvice, error) {
+
+	drug := models.PharmacyDoctorAdvice{}
+
+	err := XTWriteDB().Where("id in(?) and user_org_id = ? and status = 1", ids, orgid).Update(map[string]interface{}{"is_medicine": 1}).Error
+
+	return drug, err
+}
+
+func UpdatePharmacyHisAdviceBaseDrug(ids []string, orgid int64) (models.PharmacyHisDoctorAdviceInfo, error) {
+
+	info := models.PharmacyHisDoctorAdviceInfo{}
+	err := XTWriteDB().Where("id in(?) and user_org_id = ? and status = 1", ids, orgid).Update(map[string]interface{}{"is_medicine": 1}).Error
+	return info, err
+}
+
+func GetPharmacyAdviceList(ids []string, orgid int64) (advice []*models.PharmacyDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("id in(?) and user_org_id = ?", ids, orgid).Find(&advice).Error
+	return advice, err
+}
+
+func GetPharmacyHisAdviceList(ids []string, orgid int64) (advice []*models.PharmacyHisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("id in(?) and user_org_id = ?", ids, orgid).Find(&advice).Error
+	return advice, err
+}
+
+func FindPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
+
+	config := models.PharmacyConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}

service/his_service.go

@@ -797,6 +797,15 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 	return
 }
 
+func GetAllDrugLibListSix(org_id int64, storehouse_id int64) (list []*BaseDrugLib, err error) {
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("(status = 1 and stock_max_number > 0 and  storehouse_id = ? )  or  (status = 1  AND stock_min_number >0 and  storehouse_id = ?)", storehouse_id, storehouse_id)
+	}).Find(&list).Error
+
+	//err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
+	return
+}
+
 func GetAllDrugLibs(org_id int64) (drugs []*Drugs, err error) {
 	db := readDb.Model(&models.BaseDrugLib{}).Preload("Drugs", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Where("org_id = ?  AND status = 1 AND find_in_set('停用',drug_status) = 0", org_id).Group("drug_name")
 	err = db.Find(&drugs).Error

service/stock_service.go

@@ -2239,6 +2239,11 @@ func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err
 	return err
 }
 
+func UpDateDrugWarehousingInfoSix(id int64, info *models.DrugWarehouseInfo) (err error) {
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "retail_price": info.RetailPrice, "storehouse_id": info.StorehouseId}).Error
+	return err
+}
+
 func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo, error) {
 
 	info := models.DrugWarehouseInfo{}

service/warhouse_service.go

@@ -1215,7 +1215,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
 	//开事务
-	tx := XTWriteDB().Begin()
+	//tx := XTWriteDB().Begin()
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -1458,11 +1458,14 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		ModifyGoodReduceInformationSix(goods.GoodId, goods.Count, orgID, warehouse.PackingPrice)
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
+			return errThree
 		}
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		return nil
 	} else {
@@ -1650,11 +1653,14 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		warehouse.Mtime = time.Now().Unix()
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
+			return errThree
 		}
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
@@ -1787,8 +1793,8 @@ func GetWarehouseById(id int64) (models.WarehouseOut, error) {
 //耗材出库
 func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.WarehouseOutInfo, warehouseOut *models.WarehouseOut, count int64, creator int64) (err error) {
 
-	//开事务
-	tx := XTWriteDB().Begin()
+	////开事务
+	//tx := XTWriteDB().Begin()
 
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -1894,12 +1900,13 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		//扣减库存
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		fmt.Println(errThree)
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		//查询该机构默认仓库
 		storeConfig, _ := GetAllStoreHouseConfig(goods.OrgId)
@@ -2016,13 +2023,13 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		warehouse.Mtime = time.Now().Unix()
 
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		fmt.Println(errThree)
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", errThree.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
 		ConsumablesDeliveryOne(orgID, record_time, goods, warehouseOut, count, creator)
@@ -2034,8 +2041,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 //退库逻辑
 func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count int64) (err error) {
 
-	//开事务
-	tx := XTWriteDB().Begin()
+	////开事务
+	//tx := XTWriteDB().Begin()
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -2095,13 +2102,13 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 			return errors.New("库存数量不足")
 		}
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		fmt.Println(errThree)
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		return
 	} else {
@@ -2138,13 +2145,14 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 		warehouse.StockCount = 0
 		warehouse.Mtime = time.Now().Unix()
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
+		fmt.Println(errThree)
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
 
@@ -4559,7 +4567,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
 	//开事务
-	tx := XTWriteDB().Begin()
+	//tx := XTWriteDB().Begin()
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -4727,13 +4735,13 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		fmt.Println(errThree)
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		//查询默认仓库
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
@@ -4833,12 +4841,13 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		warehouse.Mtime = time.Now().Unix()
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		if errThree != nil {
-			utils.ErrorLog("事务失败,原因为: %v", err.Error())
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
+		fmt.Println(errThree)
+		//if errThree != nil {
+		//	utils.ErrorLog("事务失败,原因为: %v", err.Error())
+		//	tx.Rollback()
+		//} else {
+		//	tx.Commit()
+		//}
 
 		//查询默认仓库
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)