历史排班

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id 10344
+		subscibe.OrgId = 10537 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英10344或4
+		subscibe.OrgId = 10537 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -9161,7 +9161,7 @@ func ConsumablesDeliveryDeleteNew(orgID int64, record_time int64, good_yc *model
 		Total:           0,
 		ProductDate:     stockInInfo.ProductDate,
 		ExpiryDate:      stockInInfo.ExpiryDate,
-		Ctime:           time.Now().Unix(),
+		Ctime:           record_time,
 		Status:          1,
 		OrgId:           orgID,
 		OrderNumber:     cancel.OrderNumber,

controllers/patient_api_controller.go

@@ -1078,6 +1078,10 @@ func (c *PatientApiController) CreateDialysisSolution() {
 		if len(solution.DialysisIrrigation) > 0 {
 			DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
 		}
+
+		if len(solution.DialysisStrainer) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialysisStrainer
+		}
 		sch.DialysisMachineName = DialysisMachineName
 		service.UpdateSch(sch)
 	}
@@ -1180,6 +1184,10 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		if len(solution.DialysisIrrigation) > 0 {
 			DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
 		}
+
+		if len(solution.DialysisStrainer) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + solution.DialysisStrainer
+		}
 		sch.DialysisMachineName = DialysisMachineName
 		service.UpdateSch(sch)
 	}

controllers/stock_in_api_controller.go

@@ -163,6 +163,10 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/stock/getgoodpatientname", &StockManagerApiController{}, "Get:GetGoodPatientName")
 
+	beego.Router("/api/drug/updatebasedruglisbyuserorgid", &StockManagerApiController{}, "Get:UpdateBaseDrugListByUserOrgID")
+
+	beego.Router("/api/good/updategoodinfobyuserorgid", &StockManagerApiController{}, "Get:UpdateGoodInfoByUserOrgId")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -8193,3 +8197,120 @@ func (this *StockManagerApiController) GetGoodPatientName() {
 		"outList":     outList,
 	})
 }
+
+func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetAllBaseDrugList(orgId)
+	//
+
+	for _, item := range list {
+		var sum_in_count int64
+		var sum_out_count int64
+		var flush_out_count int64
+		//var str = ""
+		//str = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit
+		//service.UpdateBaseDrugById(item.ID, drug_dosage_form_str)
+
+		//drug_dosage_form_str := service.GetDosageFormListById(item.DrugDosageForm, orgId)
+		//service.UpdateDosageFormListById(drug_dosage_form_str, item.ID)
+
+		warehouseinfo, _ := service.GetDrugWarehouseInfoByItemId(item.ID)
+		if len(warehouseinfo) > 0 {
+			for _, it := range warehouseinfo {
+				if item.MaxUnit == it.MaxUnit && item.MaxUnit != item.MinUnit {
+					it.WarehousingCount = it.WarehousingCount * item.MinNumber
+				}
+
+				if item.MaxUnit == it.MinUnit && item.MaxUnit != item.MinUnit {
+					it.WarehousingCount = it.WarehousingCount
+				}
+
+				if item.MaxUnit == it.MinUnit && item.MaxUnit == item.MinUnit {
+					it.WarehousingCount = it.WarehousingCount
+				}
+
+				sum_in_count += it.WarehousingCount
+			}
+
+		}
+
+		outList, _ := service.GetDrugWarehosueOutInfoByItemId(item.ID)
+		if len(outList) > 0 {
+			for _, it := range outList {
+				if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
+					it.Count = it.Count * item.MinNumber
+				}
+
+				if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
+					it.Count = it.Count
+				}
+
+				if item.MaxUnit == it.CountUnit && item.MaxUnit == item.MinUnit {
+					it.Count = it.Count
+				}
+
+				sum_out_count += it.Count
+			}
+		}
+
+		flush_out_count = sum_in_count - sum_out_count
+
+		service.UpdateBaseDrugByIdCount(item.ID, flush_out_count)
+	}
+
+	//info, _ := service.GetDrugAllInfo(orgId)
+	//
+	//for _, item := range info {
+	//
+	//	dealer, _ := service.GetDealerById(item.Dealer)
+	//
+	//	manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//
+	//	service.UpdateDealerManufacturer(item.ID, dealer.DealerName, manufacturer.ManufacturerName)
+	//}
+
+}
+
+func (this *StockManagerApiController) UpdateGoodInfoByUserOrgId() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	//info, _ := service.GetAllWareHouseInforByUserOrg(orgId)
+	//
+	//if len(info) > 0 {
+	//	for _, item := range info {
+	//		dealer, _ := service.GetDealerById(item.Dealer)
+	//
+	//		manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//
+	//		service.UpdateGoodInfoByUserOrgId(item.ID, dealer.DealerName, manufacturer.ManufacturerName)
+	//	}
+	//}
+
+	goodList, _ := service.GetAllGoodList(orgId)
+
+	for _, item := range goodList {
+
+		var sum_in_count int64
+		var sum_out_count int64
+		var flush_out_count int64
+		infor, _ := service.GetAllWarehouseSumInCount(item.ID)
+
+		for _, item := range infor {
+			sum_in_count += item.WarehousingCount
+		}
+
+		outInfo, _ := service.GetAllWarehouseSumOutCount(item.ID)
+
+		for _, item := range outInfo {
+			sum_out_count += item.Count
+		}
+
+		flush_out_count = sum_in_count - sum_out_count
+
+		service.UpdateGoodInfoById(item.ID, flush_out_count)
+	}
+
+}

models/drug.go

@@ -85,8 +85,9 @@ type BaseDrugLib struct {
 	Bby01     string `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bbx01     string `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 
-	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
-	IsProject   int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsProject          int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
 }
 
 func (BaseDrugLib) TableName() string {

models/drug_stock.go

@@ -89,6 +89,8 @@ type DrugWarehouseInfo struct {
 	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	ManafacturerName          string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 }
 
 func (DrugWarehouseInfo) TableName() string {

models/good_models.go

@@ -225,6 +225,7 @@ type GoodInfoSevenThirty struct {
 	SumOutCount                 int64                `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
 	SumCancelCount              int64                `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
 	TotalCount                  int64                `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	TotalCountOne               int64                `gorm:"column:total_count_one" json:"total_count_one" form:"total_count_one"`
 }
 
 func (GoodInfoSevenThirty) TableName() string {

models/self_drug_models.go

@@ -76,6 +76,8 @@ type XtBaseDrug struct {
 	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	IsUse                  int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	IsPharmacy             int64   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	DrugDosageFormName     string  `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
+	TotalCountOne          int64   `gorm:"column:total_count_one" json:"total_count" form:"total_count_one"`
 }
 
 func (XtBaseDrug) TableName() string {
@@ -419,6 +421,8 @@ type XtDrugWarehouseInfo struct {
 	SupplyWarehouseDetailInfo int64      `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64      `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsCheck                   int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	ManafacturerName          string     `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string     `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

models/stock_models.go

@@ -174,6 +174,8 @@ type WarehousingInfo struct {
 	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	RegisterNumber            string      `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ManafacturerName          string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string      `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 }
 
 func (WarehousingInfo) TableName() string {

service/new_warehouse_service.go

@@ -71,7 +71,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -142,7 +142,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Count:                   count - out_count + out_count_one,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -217,7 +217,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Total:           0,
 				ProductDate:     warehouse.ProductDate,
 				ExpiryDate:      warehouse.ExpiryDate,
-				Ctime:           time.Now().Unix(),
+				Ctime:           record_time,
 				Status:          1,
 				OrgId:           orgID,
 				OrderNumber:     cancel.OrderNumber,
@@ -263,7 +263,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Creator:                 warehouseOut.Creater,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				Mtime:                   0,
 				Price:                   warehouse.PackingPrice,
 				WarehousingDetailId:     warehouse.ID,
@@ -333,7 +333,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -402,7 +402,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Count:                   stock_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -473,7 +473,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Total:           0,
 				ProductDate:     warehouse.ProductDate,
 				ExpiryDate:      warehouse.ExpiryDate,
-				Ctime:           time.Now().Unix(),
+				Ctime:           record_time,
 				Status:          1,
 				OrgId:           orgID,
 				OrderNumber:     cancel.OrderNumber,
@@ -519,7 +519,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				Creator:                 warehouseOut.Creater,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				Mtime:                   0,
 				Price:                   warehouse.PackingPrice,
 				WarehousingDetailId:     warehouse.ID,
@@ -1606,8 +1606,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		//更改字典里面的价格
 		if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
+			if lastWarehouse.RetailPrice > 0 {
+				UpdateBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice)
+			}
 
-			UpdateBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice)
 		}
 
 		//查询剩余库存

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -393,6 +393,7 @@ type AssessmentAfterDislysisVM struct {
 	Consciousness                   int64   `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
 	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
 	UserOrgId                       int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DisplaceLiquiValue              string  `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {

service/self_drug_service.go

@@ -1868,7 +1868,7 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',x.drug_status) = 0")
 	if good_type == 2 {
-		db = db.Where("x.total_count<=x.drug_stock_limit")
+		db = db.Where("x.sum_count<=x.drug_stock_limit")
 	}
 	if good_type == 3 {
 		db = db.Where("x.sum_count = 0")
@@ -3299,3 +3299,106 @@ func GetWarehouseOutListBySysrecordTime(good_id int64, sys_record_time int64, us
 	err = XTReadDB().Where("good_id = ? and sys_record_time =? and org_id = ? and status=1 and is_sys=1", good_id, sys_record_time, user_org_id).Find(&out).Error
 	return out, err
 }
+
+func UpdateBaseDrugById(id int64, drug_str string) (models.XtBaseDrug, error) {
+
+	baseDrug := models.XtBaseDrug{}
+
+	err := XTWriteDB().Model(&baseDrug).Where("id = ? and status =1", id).Updates(map[string]interface{}{"drug_spec": drug_str}).Error
+
+	return baseDrug, err
+}
+
+func UpdateDosageFormListById(drug_dosage_form_name string, drug_id int64) (models.XtBaseDrug, error) {
+
+	drug := models.XtBaseDrug{}
+
+	err := XTWriteDB().Model(&drug).Where("id = ? and status =1", drug_id).Updates(map[string]interface{}{"drug_dosage_form_name": drug_dosage_form_name}).Error
+
+	return drug, err
+}
+
+func GetDosageFormListById(id int64, orgId int64) (str string) {
+
+	var drugDosageForm = "药品剂型"
+	drugDosageFormParent, _ := GetDrugDataConfig(0, drugDosageForm)
+	drugDosageFormList, _ := GetParentDataConfig(drugDosageFormParent.ID, orgId)
+
+	for _, item := range drugDosageFormList {
+		if id == int64(item.Value) {
+			str = item.Name
+		}
+	}
+	return str
+}
+
+func GetDrugAllInfo(org_id int64) (warehouseInfo []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status= 1 and ctime>=1640966400 and ctime<=1703952000", org_id).Find(&warehouseInfo).Error
+
+	return warehouseInfo, err
+}
+
+func UpdateDealerManufacturer(id int64, dealer_name string, manufactruer string) (err error) {
+
+	warehouseInfo := models.DrugWarehouseInfo{}
+	err = XTWriteDB().Model(&warehouseInfo).Where("id = ? and status =1", id).Updates(map[string]interface{}{"manafacturer_name": manufactruer, "dealer_name": dealer_name}).Error
+
+	return err
+}
+
+func GetDrugWarehouseInfoByItemId(drug_id int64) (list []*models.XtDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1640966400", drug_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetDrugWarehosueOutInfoByItemId(drug_id int64) (list []*models.XtDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1640966400", drug_id).Find(&list).Error
+
+	return list, err
+}
+
+func UpdateBaseDrugByIdCount(drug_id int64, flush_count int64) (models.XtBaseDrug, error) {
+
+	drug := models.XtBaseDrug{}
+	err := XTWriteDB().Model(&drug).Model(&drug).Where("id = ? and status=1", drug_id).Updates(map[string]interface{}{"total_count_one": flush_count}).Error
+	return drug, err
+}
+
+func GetAllWareHouseInforByUserOrg(org_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("org_id =? and status =1 and is_check=1 and ctime>=1640966400 and ctime<=1703952000", org_id).Find(&info).Error
+
+	return info, err
+}
+
+func UpdateGoodInfoByUserOrgId(id int64, dealer_name string, manufactruer string) (err error) {
+
+	warehousingInfo := models.WarehousingInfo{}
+	err = XTWriteDB().Model(&warehousingInfo).Where("id = ? and status =1", id).Updates(map[string]interface{}{"dealer_name": dealer_name, "manafacturer_name": manufactruer}).Error
+	return err
+}
+
+func GetAllWarehouseSumInCount(org_id int64) (infor []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1640966400", org_id).Find(&infor).Error
+
+	return infor, err
+}
+
+func GetAllWarehouseSumOutCount(org_id int64) (infor []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1640966400", org_id).Find(&infor).Error
+
+	return infor, err
+}
+
+func UpdateGoodInfoById(id int64, total_count_one int64) error {
+
+	err := XTWriteDB().Model(&models.GoodInfoSevenThirty{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"total_count_one": total_count_one}).Error
+
+	return err
+}