11月8日库存管理

controllers/drug_pharmacy_management_controller.go

@@ -2,10 +2,13 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
+	"math"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -16,9 +19,18 @@ type PharmacyApiController struct {
 
 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")
+
+	//获取今日已发药的数据
+	beego.Router("api/advice/getpharmacybasedruglist", &PharmacyApiController{}, "Get:GetPharmacyBaseDrugList")
+	//退药流程
+	beego.Router("/api/advice/getreturnpharmacybasedrug", &PharmacyApiController{}, "Get:GetReturnPharmacyBaseDrug")
+
 }
 
 func (this *PharmacyApiController) GetTodayAdviceList() {
@@ -105,139 +117,348 @@ func (this *PharmacyApiController) UpdatePharmacyBaseDrug() {
 	adviceList, _ := service.GetPharmacyAdviceList(idArray, orgId)
 
 	hisAdviceList, _ := service.GetPharmacyHisAdviceList(idArray, orgId)
-	fmt.Print(hisAdviceList)
+
 	//查询是否通过药房出库
 	pharmacyConfig, _ := service.FindPharmacyConfig(orgId)
-
-	medical, _ := service.GetBaseDrugMedical(orgId)
-	fmt.Print(medical)
+	creater := this.GetAdminUserInfo().AdminUser.Id
 	if pharmacyConfig.IsOpen == 1 {
+		var total int64
+		var prescribing_number_total int64
+		//创建流水
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		totals, _ := service.FindAllPharmacyDrugWarehouseOut(orgId)
+		totals = totals + 1
+		warehousing_out_order := strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		number = number + totals
+		warehousing_out_order = "FY" + strconv.FormatInt(number, 10)
 
+		//血透
 		for _, item := range adviceList {
-			fmt.Print(item)
-			//houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+
+			pharmacy := models.Pharmacy{
+				UserOrgId:         item.UserOrgId,
+				PatientId:         item.PatientId,
+				HisPrescriptionId: 0,
+				XtAdviceId:        item.ID,
+				HisOrXt:           1,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				HisAdviceId:       0,
+				DrugId:            item.DrugId,
+				RecordDate:        item.AdviceDate,
+				OrdreNumber:       warehousing_out_order,
+				Creater:           creater,
+			}
+
+			service.CreatePharmacy(pharmacy)
+
+			lastPharmacy, _ := service.GetLastPharmary(item.UserOrgId, item.ID, item.AdviceDate)
+
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 			////查询该药品是否有库存
-			//list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 			//
 			////查询改药品信息
-			//medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			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
-			//      }
-			//    }
+			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 (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "3",
+					"medical": medical,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "2",
+					"medical": medical,
+				})
+				return
+			}
+
+			if prescribing_number_total <= total {
+
+				//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+				adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+				if adviceSetting.IsAdviceOpen == 1 {
+					if medical.IsUse == 2 {
+						service.PharmacyDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmacy.ID)
+						//查询默认仓库
+						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
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg": "1",
+						})
+						return
+					}
+
+				} else {
+					if medical.IsUse == 2 {
+						service.PharmacyDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmacy.ID)
+						//查询默认仓库
+						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)
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+				}
+			}
+		}
+
+		//血透
+		for _, item := range hisAdviceList {
+
+			pharmacy := models.Pharmacy{
+				UserOrgId:         item.UserOrgId,
+				PatientId:         item.PatientId,
+				HisPrescriptionId: 0,
+				XtAdviceId:        0,
+				HisOrXt:           2,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				HisAdviceId:       item.ID,
+				DrugId:            item.DrugId,
+				RecordDate:        item.AdviceDate,
+				OrdreNumber:       warehousing_out_order,
+				Creater:           creater,
+			}
+
+			service.CreatePharmacy(pharmacy)
+
+			lastPharmary, _ := service.GetLastHisPharmary(item.UserOrgId, item.ID, item.AdviceDate)
+
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			////查询该药品是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 			//
-			//  } 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
-			//    }
-			//  }
-			//}
+			////查询改药品信息
+			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 (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "3",
+					"medical": medical,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "2",
+					"medical": medical,
+				})
+				return
+			}
+
+			if prescribing_number_total <= total {
+
+				//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+				adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+				if adviceSetting.IsAdviceOpen == 1 {
+					if medical.IsUse == 2 {
+						service.PharmacyHisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmary.ID)
+						//查询默认仓库
+						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
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg": "1",
+						})
+						return
+					}
+
+				} else {
+					if medical.IsUse == 2 {
+						service.PharmacyHisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item, lastPharmary.ID)
+						//查询默认仓库
+						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)
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						this.ServeSuccessJSON(map[string]interface{}{
+							"msg":     "1",
+							"medical": medical,
+						})
+						return
+					}
+				}
+			}
 		}
 	}
+}
+
+func (this *PharmacyApiController) GetPharmacyBaseDrugList() {
+
+	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.GetUseredBloodAdviceList(theStartTime, drug_id, orgId)
+
+	//获取医保医嘱
+	hisAdviceList, err := service.GetUseredHisAdviceList(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) GetReturnPharmacyBaseDrug() {
+
+	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.UpdateReturnPharmacyAdviceBaseDrug(idArray, orgId)
+	service.UpdateReturnPharmacyHisAdviceBaseDrug(idArray, orgId)
 }

controllers/drug_stock_api_contorller.go

@@ -71,6 +71,8 @@ func DrugStockManagerApiRegistRouters() {
 	beego.Router("/api/drug/getdrugwarehouseinfoprint", &StockDrugApiController{}, "get:GetDrugWarehouseInfoPrint")
 	beego.Router("/api/drug/getdrugoutorderprint", &StockDrugApiController{}, "get:GetDrugOutOrderPrint")
 
+	beego.Router("/api/drugstock/config/list", &StockDrugApiController{}, "get:GetConfigList")
+
 }
 
 func (c *StockDrugApiController) CreateDrugWarehouse() {
@@ -986,7 +988,10 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						fmt.Println(parseDateErr)
 					}
 				}
-				errs = service.UpDateDrugWarehousingInfoSix(item.ID, warehouseinfo)
+				if item.MaxUnit == warehouseInfo.MaxUnit {
+					errs = service.UpDateDrugWarehousingInfoSix(item.ID, warehouseinfo)
+				}
+
 				//查询默认仓库
 				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询默认仓库剩余多少库存
@@ -3865,3 +3870,22 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	}
 
 }
+
+func (c *StockDrugApiController) GetConfigList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	manufacturer, _ := service.FindAllManufacturer(adminUserInfo.CurrentOrgId)
+	dealer, _ := service.FindAllDealer(adminUserInfo.CurrentOrgId)
+	stockIns, _ := service.FindStockInNumber(adminUserInfo.CurrentOrgId)
+	list, _ := service.GetAllStoreHouseListThree(adminUserInfo.CurrentOrgId)
+	configlist, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+	appId := c.GetAdminUserInfo().CurrentAppId
+	doctorList, _ := service.GetAllDoctorListSix(adminUserInfo.CurrentOrgId, appId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"manufacturer": manufacturer,
+		"dealer":       dealer,
+		"numbers":      stockIns,
+		"list":         list,
+		"configlist":   configlist,
+		"doctorList":   doctorList,
+	})
+}

controllers/manager_center_api_controller.go

@@ -2285,8 +2285,9 @@ func (c *ManagerCenterApiController) GetAllDrugList() {
 func (c *ManagerCenterApiController) GetSearchDrugList() {
 	keyword := c.GetString("keyword")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	config, _ := service.GetAllStoreHouseConfig(orgId)
-	list, err := service.GetSearchDrugListSix(keyword, orgId, config.DrugStorehouseOut)
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	list, err := service.GetSearchDrugListSix(keyword, orgId, storehouse_id)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	if err == nil {

controllers/stock_in_api_controller.go

@@ -4382,36 +4382,36 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Dealer = dealer_id
 
 		delivery_way := goodNameM["delivery_way"].(string)
-		if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
+		//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
+		//	err_log := models.ExportErrLog{
+		//		LogType:    4,
+		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+		//		Status:     1,
+		//		CreateTime: time.Now().Unix(),
+		//		UpdateTime: time.Now().Unix(),
+		//		ExportTime: time.Now().Unix(),
+		//	}
+		//	service.CreateExportErrLog(&err_log)
+		//	continue
+		//}
 
 		drug.DeliveryWay = delivery_way
 
 		execution_frequency := goodNameM["execution_frequency"].(string)
-		if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
+		//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
+		//	err_log := models.ExportErrLog{
+		//		LogType:    4,
+		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
+		//		Status:     1,
+		//		CreateTime: time.Now().Unix(),
+		//		UpdateTime: time.Now().Unix(),
+		//		ExportTime: time.Now().Unix(),
+		//	}
+		//	service.CreateExportErrLog(&err_log)
+		//	continue
+		//}
 
 		drug.ExecutionFrequency = execution_frequency
 
@@ -4419,74 +4419,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.LmtUsedFlag = lmt_used_flags
 
-		//medical_insurance_level := goodNameM["medical_insurance_level"].(string)
-		//var medical_insurance_level_id int64
-		//if len(medical_insurance_level) == 0 { //名字为空则生成一条导入错误日志
-		//  err_log := models.ExportErrLog{
-		//    LogType:    4,
-		//    UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//    ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的医保等级不能为空",
-		//    Status:     1,
-		//    CreateTime: time.Now().Unix(),
-		//    UpdateTime: time.Now().Unix(),
-		//    ExportTime: time.Now().Unix(),
-		//  }
-		//  service.CreateExportErrLog(&err_log)
-		//  continue
-		//}
-		//var medicalInsuranceName = "医保等级"
-		//medicalInsuranceConfig, _ := service.GetDrugDataConfig(0, medicalInsuranceName)
-		//if len(medical_insurance_level) != 0 {
-		//  _, errcodemedical := service.IsExistDicConfig(medicalInsuranceConfig.ID, medical_insurance_level, orgId)
-		//  if errcodemedical == gorm.ErrRecordNotFound {
-		//    medConfig, _ := service.GetLastDicConfig(medicalInsuranceConfig.ID, orgId)
-		//    dataconfig := models.DictDataconfig{
-		//      ParentId:       medicalInsuranceConfig.ID,
-		//      Module:         "system",
-		//      OrgId:          orgId,
-		//      Name:           medical_insurance_level,
-		//      FieldName:      "",
-		//      Value:          medConfig.Value + 1,
-		//      CreatedTime:    "",
-		//      UpdatedTime:    "",
-		//      CreateUserId:   adminUser.AdminUser.Id,
-		//      Status:         1,
-		//      Remark:         "",
-		//      DeleteIdSystem: 0,
-		//      Title:          "",
-		//      Content:        "",
-		//      Order:          0,
-		//      Code:           "",
-		//    }
-		//    service.CreatedDicConfig(&dataconfig)
-		//  }
-		//}
-
-		//medicalInsuranceList, _ := service.GetParentDataConfig(medicalInsuranceConfig.ID, orgId)
-		//for _, it := range medicalInsuranceList {
-		//  if medical_insurance_level == it.Name {
-		//    medical_insurance_level_id = int64(it.Value)
-		//  }
-		//}
-		//drug.MedicalInsuranceLevel = medical_insurance_level_id
-
-		//unit_matrixing := goodNameM["unit_matrixing"].(string)
-		//if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
-		//  err_log := models.ExportErrLog{
-		//    LogType:    4,
-		//    UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//    ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的单位换算不能为空",
-		//    Status:     1,
-		//    CreateTime: time.Now().Unix(),
-		//    UpdateTime: time.Now().Unix(),
-		//    ExportTime: time.Now().Unix(),
-		//  }
-		//  service.CreateExportErrLog(&err_log)
-		//  continue
-		//}
-		//
-		//drug.UnitMatrixing = unit_matrixing
-
 		dataConfig, _ := service.GetDataConfigIsExist(0, units)
 		if len(drugDoseUnit) != 0 {
 			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
@@ -5045,36 +4977,36 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			drug.Dealer = dealer_id
 
 			delivery_way := goodNameM["delivery_way"].(string)
-			if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
+			//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
+			//	err_log := models.ExportErrLog{
+			//		LogType:    4,
+			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+			//		Status:     1,
+			//		CreateTime: time.Now().Unix(),
+			//		UpdateTime: time.Now().Unix(),
+			//		ExportTime: time.Now().Unix(),
+			//	}
+			//	service.CreateExportErrLog(&err_log)
+			//	continue
+			//}
 
 			drug.DeliveryWay = delivery_way
 
 			execution_frequency := goodNameM["execution_frequency"].(string)
-			if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
+			//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
+			//	err_log := models.ExportErrLog{
+			//		LogType:    4,
+			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
+			//		Status:     1,
+			//		CreateTime: time.Now().Unix(),
+			//		UpdateTime: time.Now().Unix(),
+			//		ExportTime: time.Now().Unix(),
+			//	}
+			//	service.CreateExportErrLog(&err_log)
+			//	continue
+			//}
 
 			drug.ExecutionFrequency = execution_frequency
 
@@ -5379,6 +5311,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 					DoseUnit:                    item.DoseUnit,
 					Dose:                        item.Dose,
 					MinNumber:                   item.MinNumber,
+					IsUse:                       2,
 				}
 
 				//查询同种药品同种规格是否存在
@@ -5510,8 +5443,8 @@ func (this *StockManagerApiController) PostSearchGoodList() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
-	config, _ := service.GetAllStoreHouseConfig(orgId)
-	list, _ := service.GetSearchGoodListSix(keyword, orgId, config.StorehouseOutInfo)
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	list, _ := service.GetSearchGoodListSix(keyword, orgId, storehouse_id)
 
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)

models/drug_pharmacy_management_models.go

@@ -213,3 +213,24 @@ type PharmacyConfig struct {
 func (PharmacyConfig) TableName() string {
 	return "xt_pharmacy_config"
 }
+
+type Pharmacy 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"`
+	HisPrescriptionId int64  `gorm:"column:his_prescription_id" json:"his_prescription_id" form:"his_prescription_id"`
+	XtAdviceId        int64  `gorm:"column:xt_advice_id" json:"xt_advice_id" form:"xt_advice_id"`
+	HisOrXt           int64  `gorm:"column:his_or_xt" json:"his_or_xt" form:"his_or_xt"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	HisAdviceId       int64  `gorm:"column:his_advice_id" json:"his_advice_id" form:"his_advice_id"`
+	DrugId            int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	OrdreNumber       string `gorm:"column:ordre_number" json:"ordre_number" form:"ordre_number"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+}
+
+func (Pharmacy) TableName() string {
+	return "xt_pharmacy"
+}

models/drug_stock.go

@@ -167,6 +167,7 @@ type DrugWarehouseOutInfo struct {
 	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -414,6 +415,7 @@ type DrugFlow struct {
 	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	LastPrice                 float64              `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	StockCount                string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64                `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
 }
 
 func (DrugFlow) TableName() string {