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

controllers/print_data_api_controller.go

@@ -38,7 +38,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 || this.GetAdminUserInfo().CurrentOrgId == 10307 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -144,7 +144,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 && this.GetAdminUserInfo().CurrentOrgId != 10307 {
 
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {

controllers/self_drug_api_congtroller.go

@@ -6433,6 +6433,9 @@ func (c *SelfDrugApiController) GetDrugInventoryModePrintList() {
 	//查询本月出库
 	outList, _ := service.GetDrugWarhouseHouseOutInfo(orgId, startTime, endTime)
 
+	//查询本月退库
+	cancelOutInfo, _ := service.GetDrugWarehouseCancelOutInfo(orgId, startTime, endTime)
+
 	drugList, _ := service.GetAllDrugList(orgId)
 
 	warehouseInfoFlow, _ := service.GetDrugMonthWarehouseInfo(orgId, startTime)
@@ -6450,5 +6453,6 @@ func (c *SelfDrugApiController) GetDrugInventoryModePrintList() {
 		"warehouseInfoFlow": warehouseInfoFlow,
 		"warehouseOutFlow":  warehouseOutFlow,
 		"cancelFlow":        cancelFlow,
+		"cancelOutInfo":     cancelOutInfo,
 	})
 }

controllers/stock_in_api_controller.go

@@ -8420,6 +8420,9 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 	//获取盘亏的数据
 	flowNoProList, _ := service.GetGoodStockFlowNoProList(startTime, endTime, orgId)
 
+	//获取盘点退库
+	CancelFlowList, _ := service.GetCancelStockFlowList(startTime, endTime, orgId)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
 	//获取期初结余数量
@@ -8441,6 +8444,7 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 		"warehouseinfo":    warehouseinfo,
 		"warehouseOutInfo": warehouseOutInfo,
 		"cancelInfo":       cancelInfo,
+		"CancelFlowList":   CancelFlowList,
 	})
 
 }

models/self_drug_models.go

@@ -986,22 +986,23 @@ func (SgjDrugWarehouseOutInfo) TableName() string {
 }
 
 type PatientDrugWarehouseInfo struct {
-	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number         string `gorm:"column:number" json:"number" form:"number"`
-	ProductDate    int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate     int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	MinNumber      int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose           string `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit       string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer         int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	SumCount       int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	DrugId           int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number           string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate      int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	StockMaxNumber   int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber   int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber      string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit          string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinNumber        int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose             string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit         string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer           int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	SumCount         int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 }
 
 type NewGoodInformation struct {

models/stock_models.go

@@ -1344,6 +1344,7 @@ type PatientWarehouseInfo struct {
 	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
 	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	StockCount        int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingCount  int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 }
 
 func (PatientWarehouseInfo) TableName() string {

service/pharmacy_service.go

@@ -563,6 +563,8 @@ func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDru
 // 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
+
+	fmt.Println("startime==========================", stime)
 	var tmp []*models.TmpLLL
 	if is_medicine == 0 {
 		if keyword != "" {

service/self_drug_service.go

@@ -1244,7 +1244,7 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 
 func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.stock_max_number>0 or x.stock_min_number>0)")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {
@@ -5293,6 +5293,27 @@ func GetDrugWarhouseHouseOutInfo(org_id int64, start_time int64, end_time int64)
 
 }
 
+func GetDrugWarehouseCancelOutInfo(org_id int64, start_time int64, end_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type= 7)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
 func GetDrugMonthWarehouseInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=1 or consumable_type=10)")

service/stock_service.go

@@ -6932,7 +6932,7 @@ func UpdatedGoodInfo(info models.GoodInfo, goodid int64) error {
 
 func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.stock_count>0")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.warehousing_count>0")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {
@@ -9673,6 +9673,24 @@ func GetGoodStockFlowNoProList(startTime int64, endTime int64, orgId int64) (flo
 	return flow, err
 }
 
+func GetCancelStockFlowList(startTime int64, endTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 7")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
 func GetLastMonthCount(startTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type = 1 or consumable_type = 10)")