2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10567 //机构id
+		subscibe.OrgId = 10644 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 10697 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10567 //机构id小英9675或4
+		subscibe.OrgId = 10644 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10567 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 16787 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2573,7 +2573,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {

controllers/drug_stock_api_contorller.go

@@ -3470,6 +3470,8 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	end_time := c.GetString("end_time")
 
 	order_type, _ := c.GetInt64("order_type")
+
+	storehouse_id, _ := c.GetInt64("storehouse_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -3496,7 +3498,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 1 {
-		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId)
+		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId, storehouse_id)
 		manufacturerList, _ := service.GetAllManufacturerList(orgId)
 		dealerList, _ := service.GetAllDealerList(orgId)
 		if err == nil {

controllers/his_api_controller.go

@@ -106,6 +106,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
 	beego.Router("/api/hisorder/listtwo", &HisApiController{}, "get:GetHisOrderListTwo")
 
+	beego.Router("/api/getallgoodinforlist", &HisApiController{}, "Get:GetAllGoodInforList")
+
 }
 
 func (c *HisApiController) CheckHisPatient() {
@@ -14174,3 +14176,14 @@ func GetCompareData(dataBody map[string]interface{}) (editCustomData EditCustomD
 
 	return
 }
+
+func (c *HisApiController) GetAllGoodInforList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	goodList, _ := service.GetAllGoodList(orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"goodList": goodList,
+	})
+	return
+}

controllers/manager_center_api_controller.go

@@ -165,7 +165,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_show, _ := c.GetInt64("is_show")
 	adminInfo := c.GetAdminUserInfo()
 	is_self_drug, _ := c.GetInt64("is_self_drug")
-
+	specification_name := c.GetString("specification_name")
 	hans := drug_name // 要转换的汉字字符串
 
 	// 创建一个拼音转换器
@@ -256,6 +256,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		IsProject:                   is_project,
 		IsShow:                      is_show,
 		IsSelfDrug:                  is_self_drug,
+		SpecificationName:           specification_name,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -272,6 +273,16 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 
 			drugLib.DrugSpec = drugLib.Dose + drugLib.DoseUnit + "*" + string(drugLib.MinNumber) + drugLib.MinUnit + "/" + drugLib.MaxUnit
 		}
+		if drugLib.IsSpecialDiseases == 0 {
+			drugLib.IsSpecialDiseases = 1
+		}
+		if drugLib.IsSelfDrug == 0 {
+			drugLib.IsSelfDrug = 2
+		}
+
+		if drugLib.SpecificationName == "" || len(drugLib.SpecificationName) == 0 {
+			drugLib.SpecificationName = drugLib.Dose + drugLib.DoseUnit + "*" + string(drugLib.MinNumber) + drugLib.MinUnit + "/" + drugLib.MaxUnit
+		}
 		err := service.CreateBaseDrugLib(drugLib)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -369,6 +380,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_project, _ := c.GetInt64("is_project")
 	is_show, _ := c.GetInt64("is_show")
 	is_self_drug, _ := c.GetInt64("is_self_drug")
+	specification_name := c.GetString("specification_name")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -465,12 +477,36 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		FirstLetter:                 firstLetter,
 		IsShow:                      is_show,
 		IsSelfDrug:                  is_self_drug,
+		SpecificationName:           specification_name,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
 		drugLib.DrugSpec = drugLib.Dose + drugLib.DoseUnit + "*" + string(drugLib.MinNumber) + drugLib.MinUnit + "/" + drugLib.MaxUnit
 	}
 
+	if len(drugLib.SpecificationName) == 0 || drugLib.SpecificationName == "" {
+
+		drugLib.SpecificationName = drugLib.Dose + drugLib.DoseUnit + "*" + string(drugLib.MinNumber) + drugLib.MinUnit + "/" + drugLib.MaxUnit
+	}
+
+	//查询该药品信息
+	baseDrugMedical, _ := service.GetBaseDrugMedical(id)
+
+	var specificationName = ""
+	var specificationNameOne = ""
+	specificationName = drugLib.Dose + drugLib.DoseUnit + "*" + string(drugLib.MinNumber) + drugLib.MinUnit + "/" + drugLib.MaxUnit
+
+	specificationNameOne = baseDrugMedical.Dose + baseDrugMedical.DoseUnit + "*" + string(baseDrugMedical.MinNumber) + baseDrugMedical.MinUnit + "/" + baseDrugMedical.MaxUnit
+
+	if specificationName != specificationNameOne {
+		//查询是否入库
+		drugInfo, _ := service.GetDrugWarehosueInfoById(id, adminInfo.CurrentOrgId)
+		if len(drugInfo) > 0 {
+			c.ServeDynamicFailJsonSend(baseDrugMedical.DrugName + "该药品已经入库,不能修改规格换算单位,请联系工作人员!")
+			return
+		}
+	}
+
 	err := service.UpdateBaseDrugLib(drugLib)
 
 	//查下医嘱模板
@@ -575,7 +611,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	_, errSix := service.GetDoctorAdviceIsExist(id, adminInfo.CurrentOrgId)
 	if errSix == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗5")
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -597,7 +632,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	_, errSeven := service.GetDoctorAdviceTemplateIsExist(id, adminInfo.CurrentOrgId)
 
 	if errSeven == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗6")
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1418,14 +1418,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											//查询今日是否出库
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+												if item.UserOrgId != 10644 {
+													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+												}
+
 											}
 
 										}
 										if pharmacyConfig.IsOpen != 1 {
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+												if item.UserOrgId != 10644 {
+													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+												}
+
 											}
 										}
 
@@ -1449,7 +1455,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											if item.UserOrgId != 10644 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
+
 										}
 									}
 									if pharmacyConfig.IsOpen != 1 {
@@ -1470,8 +1479,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.CreateDrugError(drugError)
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
+											if item.UserOrgId != 10644 {
+												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											}
 
-											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 									}
 
@@ -1580,14 +1591,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										if item.UserOrgId != 10644 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
+
 									}
 								}
 								if pharmacyConfig.IsOpen != 1 {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										if item.UserOrgId != 10644 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										}
+
 									}
 								}
 
@@ -2203,8 +2220,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 										newadviceInfo.PrescribingNumber = float64(cha_count)
 										newadviceInfo.PrescribingNumberUnit = medical.MinUnit
-
-										service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+										if advice.UserOrgId != 10644 {
+											service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+										}
 
 									}
 
@@ -2219,7 +2237,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 									if prescribing_number_total == out_count {
 										if out_count == 0 {
-											service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+											if advice.UserOrgId != 10644 {
+												service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+											}
+
 										}
 
 									}
@@ -3465,7 +3486,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 {
 
 			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 {
 				dewater_amount = dewater_amount * 1000

controllers/patient_api_controller.go

@@ -2252,14 +2252,20 @@ func (c *PatientApiController) ExecGroupAdvice() {
 					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 						if drugOutInfo.ID == 0 {
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							if item.UserOrgId != 10644 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							}
+
 						}
 
 					}
 					if pharmacyConfig.IsOpen != 1 {
 						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 						if drugOutInfo.ID == 0 {
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							if item.UserOrgId != 10644 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							}
+
 						}
 					}
 
@@ -2605,7 +2611,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+										if item.UserOrgId != 10644 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+										}
+
 									}
 								}
 								//不通过药房发药
@@ -2614,7 +2623,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+										if item.UserOrgId != 10644 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+										}
+
 									}
 								}
 
@@ -2667,7 +2679,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 								if drugOutInfo.ID == 0 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									if item.UserOrgId != 10644 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
+
 								}
 							}
 							//不通过药房发药
@@ -2675,7 +2690,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 								if drugOutInfo.ID == 0 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									if item.UserOrgId != 10644 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
+
 								}
 							}
 							//更新字典里面的库存

controllers/print_data_api_controller.go

@@ -338,6 +338,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	types, _ := this.GetInt("type", 0)
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	adminUserInfo := this.GetAdminUserInfo()
 
 	timeLayout := "2006-01-02"
@@ -366,7 +367,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 
 	//入库详情
 	if types == 1 {
-		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page, storehouse_id)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

controllers/stock_in_api_controller.go

@@ -8162,7 +8162,7 @@ func (this *StockManagerApiController) GetGoodPatientName() {
 
 func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//list, _ := service.GetAllBaseDrugList(orgId)
 	//
@@ -8227,15 +8227,23 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 
 	//info, _ := service.GetDrugAllInfo(orgId)
 
-	info, _ := service.GetDrugOutAllInfo(orgId)
-
-	for _, item := range info {
+	//info, _ := service.GetDrugOutAllInfo(orgId)
+	//
+	//for _, item := range info {
+	//
+	//	//dealer, _ := service.GetDealerById(item.Dealer)
+	//
+	//	manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//
+	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
+	//}
 
-		//dealer, _ := service.GetDealerById(item.Dealer)
+	drugList, _ := service.GetAllBaseDrugListTwenty(10644)
 
-		manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	for _, item := range drugList {
+		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit
 
-		service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
+		service.UpdateBaseDrugList(item.ID, drug_spec)
 	}
 
 }

models/drug.go

@@ -90,6 +90,7 @@ type BaseDrugLib struct {
 	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
 	IsShow             int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
 	IsSelfDrug         int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	SpecificationName  string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 }
 
 func (BaseDrugLib) TableName() string {

models/self_drug_models.go

@@ -82,6 +82,7 @@ type XtBaseDrug struct {
 	IsShow                 int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
 	IsSelfDrug             int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	SumCount               int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 }
 
 func (XtBaseDrug) TableName() string {

service/drug_stock_service.go

@@ -194,7 +194,7 @@ func GetDrugCancelExportList(orderid []string, orgid int64) (info []*models.Drug
 	return info, err
 }
 
-func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info []*models.XtDrugWarehouseInfo, err error) {
+func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 	if startime > 0 {
@@ -206,6 +206,9 @@ func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id =?", storehouse_id)
+	}
 	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number,x.dealer,x.manufacturer").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
 
 	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error

service/gobal_config_service.go

@@ -1088,6 +1088,13 @@ func GetAllBaseDrugListTwenty(orgid int64) (drug []*models.BaseDrugLibTwenty, er
 	return drug, err
 }
 
+func UpdateBaseDrugList(drug_id int64, specification_name string) error {
+
+	err := XTWriteDB().Model(&models.XtBaseDrug{}).Where("id = ? and status=1", drug_id).Updates(map[string]interface{}{"specification_name": specification_name}).Error
+
+	return err
+}
+
 func GetScheduleConfigByOrgId(org_id int64) (config models.ScheduleConfig, err error) {
 	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("user_org_id = ?", org_id).First(&config).Error
 	return config, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -266,7 +266,7 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 	return goodInfo, err
 }
 
-func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64) (info []*models.VmWarehousingInfo, err error) {
+func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64, storehouse_id int64) (info []*models.VmWarehousingInfo, err error) {
 	//offset := (page - 1) * limit
 	db := p_service.XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
@@ -282,6 +282,10 @@ func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime in
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id =?", storehouse_id)
+	}
+
 	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&info).Error
 	return info, err
 }

service/self_drug_service.go

@@ -138,6 +138,13 @@ func GetBaseDrugMedical(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
+func GetDrugWarehosueInfoById(drug_id int64, org_id int64) (drugInfo []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id = ? and status =1", drug_id, org_id).Find(&drugInfo).Error
+
+	return drugInfo, err
+}
+
 func GetBaseDrugMedicalOne(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
 	drug := models.XtBaseDrug{}
 	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error