医嘱

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -163,7 +163,7 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
 
-	beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
+	//beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
 
 	beego.Router("/m/api/getrolelist", &DialysisAPIController{}, "Get:GetRoleList")
 

controllers/self_drug_api_congtroller.go

@@ -2722,9 +2722,9 @@ func (this *SelfDrugApiController) GetStorehouseList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetAllStoreHouseList(orgId)
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-	goodType, _ := service.GetAllGoodType(orgId)
-	patientList, _ := service.GetAllpatient(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
+	goodType, _ := service.GetAllNewGoodType(orgId)
+	patientList, _ := service.GetAllpatientThirty(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取仓库失败")
 		return
@@ -2761,16 +2761,16 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	}
 
 	var ids []int64
-	var goodIds []int64
+	//var goodIds []int64
 	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
 	for _, it := range manufacturerList {
 		ids = append(ids, it.ID)
 	}
 
-	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
-	for _, it := range infoList {
-		goodIds = append(goodIds, it.GoodId)
-	}
+	//infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
+	//for _, it := range infoList {
+	//	goodIds = append(goodIds, it.GoodId)
+	//}
 
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
 
@@ -3262,7 +3262,7 @@ func (this *SelfDrugApiController) GetPurchaseDrugQuery() {
 	for _, it := range infoList {
 		infoIds = append(infoIds, it.DrugId)
 	}
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 	list, total, err := service.GetDrugPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
 
 	for _, item := range list {
@@ -3428,7 +3428,6 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range infoList {
 		goodIds = append(goodIds, it.DrugId)
 	}
-	//list, total, err := service.GetDrugNewQuery(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
 
 	countList, total, err := service.GetDrugStockCountList(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
 
@@ -3441,8 +3440,7 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total": total,
-		//"list":  list,
+		"total":        total,
 		"drugTypeList": drugTypeList,
 		"countList":    countList,
 	})
@@ -3665,7 +3663,7 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	for _, it := range manufacturers {
 		ids = append(ids, it.ID)
 	}
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 	list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
 	for _, item := range list {
@@ -3680,18 +3678,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 
 		item.GoodEndFlowInfo = flow
 
-		//获取期初结余数量
-		//infoList, _ := service.GetStartGoodWarehouseInfoList(item.ID, orgId, startTime)
-		//for _, it := range infoList {
-		//  item.WarehousingInfoStart = append(item.WarehousingInfoStart, it)
-		//}
-		//
-		////获取期末结余数量
-		//warehouseInfoList, _ := service.GetEndGoodWarehouseInfoList(item.ID, orgId, endTime)
-		//for _, it := range warehouseInfoList {
-		//  item.WarehousingInfoEnd = append(item.WarehousingInfoEnd, it)
-		//}
-
 		//获取期间增加
 		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
 		for _, it := range goodWarehouseInfoList {
@@ -3720,63 +3706,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 		}
 
-		////获取期初结余
-		//info, _ := service.FindeStartFlowInfo(item.ID, orgId, startTime)
-		//for _, it := range info {
-		//  item.StartFlowInfo = append(item.StartFlowInfo, it)
-		//}
-		////获取期初结余
-		//flowOutInfo, _ := service.FindeStartFlowOutInfo(item.ID, orgId, startTime)
-		//for _, it := range flowOutInfo {
-		//  item.StartOutFlowInfo = append(item.StartOutFlowInfo, it)
-		//}
-		//
-		////获取期初退库
-		//cancelInfo, _ := service.FindeStartCancelInfo(item.ID, orgId, startTime)
-		//for _, it := range cancelInfo {
-		//  item.StartCancelFlowInfo = append(item.StartCancelFlowInfo, it)
-		//}
-
-		////获取期末结余
-		//flowInfo, _ := service.FindEndStartFlowInfo(item.ID, orgId, endTime)
-		//for _, it := range flowInfo {
-		//  item.EndFlowInfo = append(item.EndFlowInfo, it)
-		//}
-		//
-		////获取期末出库
-		//lowOutInfo, _ := service.FindeEndFLowOutInfo(item.ID, orgId, endTime)
-		//for _, it := range lowOutInfo {
-		//  item.EndFlowOutInfo = append(item.EndFlowOutInfo, it)
-		//}
-		//
-		////获取期末退库
-		//endCancelInfo, _ := service.FindEndCancelInfo(item.ID, orgId, endTime)
-		//for _, it := range endCancelInfo {
-		//  item.EndCancelFLowInfo = append(item.EndCancelFLowInfo, it)
-		//}
-
-		////期初盘赢
-		//inventory, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, startTime)
-		//for _, it := range inventory {
-		//  item.WareStartStockInventoryProfit = append(item.WareStartStockInventoryProfit, it)
-		//}
-		////期初盘亏
-		//stockInventory, _ := service.FindStartStockInventoryLosses(item.ID, orgId, startTime)
-		//for _, it := range stockInventory {
-		//  item.WareStartStockInventoryLosses = append(item.WareStartStockInventoryLosses, it)
-		//}
-
-		////期末盘盈
-		//inventoryProfit, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, endTime)
-		//for _, it := range inventoryProfit {
-		//  item.WareEndStockInventoryProfit = append(item.WareEndStockInventoryProfit, it)
-		//}
-		////期末盘亏
-		//inventoryLosses, _ := service.FindStartStockInventoryLosses(item.ID, orgId, endTime)
-		//for _, it := range inventoryLosses {
-		//  item.WareEndStockInventoryLosses = append(item.WareEndStockInventoryLosses, it)
-		//}
-
 		//期中盘盈
 		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
 		for _, it := range profit {

models/drug.go

@@ -100,6 +100,18 @@ func (BaseDrugLibSeven) TableName() string {
 	return "xt_base_drug"
 }
 
+type BaseDrugLibTen struct {
+	ID                  int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId               int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	TotalCount          int64 `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	DrugStockLimitCount int64 `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	Status              int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (BaseDrugLibTen) TableName() string {
+	return "xt_base_drug"
+}
+
 type DrugUnitSafeguard struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`

models/drug_stock.go

@@ -94,6 +94,19 @@ func (DrugWarehouseInfo) TableName() string {
 	return "xt_drug_warehouse_info"
 }
 
+type DrugWarehouseInfoTen struct {
+	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"`
+	StorehouseId   int64 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck        int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId          int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (DrugWarehouseInfoTen) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
 type DrugWarehouseInfoSeven struct {
 	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"`

models/good_models.go

@@ -22,6 +22,18 @@ func (GoodsType) TableName() string {
 	return "xt_goods_type"
 }
 
+type NewGoodsType struct {
+	ID       int64  `gorm:"column:id" json:"id"`
+	TypeName string `gorm:"column:type_name" json:"type_name"`
+	Remark   string `gorm:"column:remark" json:"remark"`
+	OrgId    int64  `gorm:"column:org_id" json:"org_id"`
+	Status   int64  `gorm:"column:status" json:"status"`
+}
+
+func (NewGoodsType) TableName() string {
+	return "xt_goods_type"
+}
+
 type GoodInfo struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
@@ -146,6 +158,17 @@ func (GoodInfoSeven) TableName() string {
 	return "xt_good_information"
 }
 
+type GoodInfoTen struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	TotalCount int64 `gorm:"column:total_count" json:"total_count" form:"total_count"`
+}
+
+func (GoodInfoTen) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodsTypeOne struct {
 	ID             int64                    `gorm:"column:id" json:"id"`
 	TypeCode       string                   `gorm:"column:type_code" json:"type_code"`

models/new_stock_models.go

@@ -144,6 +144,37 @@ func (NewBaseDrug) TableName() string {
 	return "xt_base_drug"
 }
 
+type NewBaseDrugOne struct {
+	ID                  int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName            string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec            string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugStockLimit      string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	MaxUnit             string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber           int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit             string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit            string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice         float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice            float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice           float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	Number              string                 `gorm:"column:number" json:"number" form:"number"`
+	OrgId               int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugWarehouseInfo   []*VsDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	XtDrugStockCount    []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_count"`
+	DrugStockCount      []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_info"`
+	TotalCount          int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	IsUser              int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice     float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	DrugStockLimitCount int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	SumCount            int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	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"`
+}
+
+func (NewBaseDrugOne) TableName() string {
+	return "xt_base_drug"
+}
+
 type XtDialysisSetting 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"`
@@ -184,28 +215,50 @@ func (XtDialysisSetting) TableName() string {
 }
 
 type VmStockFlowTwenty struct {
-	ID                  int64           `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId       int64           `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	GoodId              int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Count               int64           `gorm:"column:count" json:"count" form:"count"`
-	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"`
-	SystemTime          int64           `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType      int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys               int64           `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	Price               float64         `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId int64           `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	BuyPrice            float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	IsRead              int64           `gorm:"column:is_read" json:"is_read" form:"is_read"`
-	OverCount           int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	Ctime               int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	WarehousingInfo     WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
+	ID                  int64              `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId       int64              `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId              int64              `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count               int64              `gorm:"column:count" json:"count" form:"count"`
+	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"`
+	SystemTime          int64              `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType      int64              `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys               int64              `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Price               float64            `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId int64              `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	BuyPrice            float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	IsRead              int64              `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount           int64              `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	Ctime               int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	WarehousingInfo     NewWarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
 }
 
 func (VmStockFlowTwenty) TableName() string {
 	return "xt_stock_flow"
 }
 
+type VmNewStockFlowTwenty struct {
+	ID                  int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId       int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId              int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count               int64   `gorm:"column:count" json:"count" form:"count"`
+	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"`
+	SystemTime          int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType      int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys               int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Price               float64 `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	BuyPrice            float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	IsRead              int64   `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount           int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	Ctime               int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+}
+
+func (VmNewStockFlowTwenty) TableName() string {
+	return "xt_stock_flow"
+}
+
 type GoodInfoTwenty struct {
 	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
 	SpecificationName      string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
@@ -216,7 +269,6 @@ type GoodInfoTwenty struct {
 	OrgId                  int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	GoodName               string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	RetailPrice            float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	Ctime                  int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	PackingUnit            string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice           float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	StWarehousingInfo      []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`

models/stock_models.go

@@ -1614,3 +1614,44 @@ type GoodWarehousingInfo struct {
 func (GoodWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type BloodManufacturer struct {
+	ID               int64  `gorm:"column:id" json:"id"`
+	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id"`
+	Status           int64  `gorm:"column:status" json:"status"`
+}
+
+func (BloodManufacturer) TableName() string {
+	return "xt_manufacturer"
+}
+
+type GoodQueryNewWarehousingInfo struct {
+	ID      int64 `gorm:"column:id" json:"id"`
+	GoodId  int64 `gorm:"column:good_id" json:"good_id"`
+	Status  int64 `gorm:"column:status" json:"status"`
+	OrgId   int64 `gorm:"column:org_id" json:"org_id"`
+	IsCheck int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (GoodQueryNewWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type NewWarehousingInfo struct {
+	ID               int64   `gorm:"column:id" json:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId           int64   `gorm:"column:good_id" json:"good_id"`
+	Price            float64 `gorm:"column:price" json:"price"`
+	Status           int64   `gorm:"column:status" json:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
+	WarehouseInfoId  int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice     float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	StockCount       int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+}
+
+func (NewWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/dialysis_service.go

@@ -1480,7 +1480,7 @@ func GetDialysisBeforePrepare(goodTypeId int64, goodId int64, orgid int64, patie
 
 func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error {
 
-	err := XTReadDB().Create(&prepare).Error
+	err := XTWriteDB().Create(&prepare).Error
 	return err
 }
 

service/doctor_schedule_service.go

@@ -58,7 +58,7 @@ func GetClassNameIsExsit(classname string, orgid int64, id int64) (schedule mode
 
 func UpdateScheduleList(id int64, schedules *models.DoctorSchedules) error {
 
-	err := XTReadDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "minute": schedules.Minute, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "minute": schedules.Minute, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -129,7 +129,7 @@ func AddSchedule(schedule *models.StaffSchedule) error {
 }
 
 func UpdateStaffList(schedule *models.StaffSchedule, id int64) error {
-	err := XTReadDB().Model(&schedule).Where("id=?", id).Updates(map[string]interface{}{"doctor_id": schedule.DoctorId, "doctor_type": schedule.DoctorType, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "schedule_date": schedule.ScheduleDate, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&schedule).Where("id=?", id).Updates(map[string]interface{}{"doctor_id": schedule.DoctorId, "doctor_type": schedule.DoctorType, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "schedule_date": schedule.ScheduleDate, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -768,14 +768,14 @@ func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64
 
 func CreateDialysisPrescription(prescription *models.DialysisPrescription) error {
 
-	err := XTReadDB().Create(&prescription).Error
+	err := XTWriteDB().Create(&prescription).Error
 
 	return err
 }
 
 func CreateDialysisSolution(solution models.DialysisSolution) error {
 
-	err := XTReadDB().Create(&solution).Error
+	err := XTWriteDB().Create(&solution).Error
 	return err
 }
 

service/his_project_service.go

@@ -149,7 +149,7 @@ func UpdatedDepartment(id int64, department *models.XtHisDepartment) error {
 
 func DeleteDepartment(id int64) error {
 	department := models.XtHisDepartment{}
-	err := XTReadDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -1839,7 +1839,7 @@ func DeleteSummary(ids []string) error {
 
 func CreateHisSummary(summary *models.XtHospitalSummary) error {
 
-	err := XTReadDB().Create(&summary).Error
+	err := XTWriteDB().Create(&summary).Error
 	return err
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -85,26 +85,31 @@ func (PatientVM) TableName() string {
 }
 
 type DialysisOrderVM struct {
-	ID             int64           `gorm:"column:id" json:"id"`
-	DialysisDate   int64           `gorm:"column:dialysis_date" json:"dialysis_date"`
-	PatientID      int64           `gorm:"column:patient_id" json:"patient_id"`
-	Stage          int64           `gorm:"column:stage" json:"stage"`
-	BedID          int64           `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64           `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64           `gorm:"column:finish_nurse" json:"finish_nurse"`
-	StartTime      int64           `gorm:"column:start_time" json:"start_time"`
-	EndTime        int64           `gorm:"column:end_time" json:"end_time"`
-	PunctureNurse  int64           `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber   *DeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator        int64           `gorm:"column:creator" json:"creator"`
-	Modifier       int64           `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64           `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
-	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
-	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
-	Url            string          `gorm:"column:url" json:"url" form:"url"`
+	ID                 int64           `gorm:"column:id" json:"id"`
+	DialysisDate       int64           `gorm:"column:dialysis_date" json:"dialysis_date"`
+	PatientID          int64           `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64           `gorm:"column:stage" json:"stage"`
+	BedID              int64           `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse         int64           `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse        int64           `gorm:"column:finish_nurse" json:"finish_nurse"`
+	StartTime          int64           `gorm:"column:start_time" json:"start_time"`
+	EndTime            int64           `gorm:"column:end_time" json:"end_time"`
+	PunctureNurse      int64           `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	DeviceNumber       *DeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator            int64           `gorm:"column:creator" json:"creator"`
+	Modifier           int64           `gorm:"column:modifier" json:"modifier"`
+	FinishCreator      int64           `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier     int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
+	SchedualType       int64           `gorm:"column:schedual_type" json:"schedual_type"`
+	WashpipeNurse      int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	UserOrgId          int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	QualityNurseId     int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	Url                string          `gorm:"column:url" json:"url" form:"url"`
+	BloodAccessId      int64           `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	DialysisIrrigation string          `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	PunctureWay        string          `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
+	PunctureNeedle     string          `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 }
 
 func (DialysisOrderVM) TableName() string {

service/schedule_service.go

@@ -1186,7 +1186,7 @@ func GetSettingById(id int64) (*models.XtRemindPrintSetting, error) {
 
 func CreateSetting(setting *models.XtRemindPrintSetting) error {
 
-	err := XTReadDB().Create(&setting).Error
+	err := XTWriteDB().Create(&setting).Error
 	return err
 }
 

service/self_drug_service.go

@@ -1196,7 +1196,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 	return info, err
 }
 
-func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.Manufacturer, err error) {
+func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.BloodManufacturer, err error) {
 
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Model(&list).Where("status = 1")
@@ -1249,7 +1249,7 @@ func GetGoodWarehouseInfoByOrgId(orgid int64, storehouse_id int64) (info []*mode
 	return info, err
 }
 
-func GetGoodWarehouseInfoByOrgIdTwo(orgid int64) (info []*models.WarehousingInfo, err error) {
+func GetGoodWarehouseInfoByOrgIdTwo(orgid int64) (info []*models.GoodQueryNewWarehousingInfo, err error) {
 	db := XTReadDB().Model(&info).Where("is_check =1 and status =1")
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
@@ -1805,7 +1805,7 @@ func GetDrugNewQuery(orgId int64, storehouse_id int64, good_type int64, keyword
 	return drug, total, err
 }
 
-func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, goodIds []int64, startime int64, endtime int64) (drug []*models.NewBaseDrug, total int64, err error) {
+func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, goodIds []int64, startime int64, endtime int64) (drug []*models.NewBaseDrugOne, total int64, err error) {
 
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
@@ -1894,7 +1894,7 @@ func GetGoodInformationWarehouseInfo(good_id int64, orgid int64) (info []*models
 
 func UpdateGoodInformation(id int64, orgid int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.GoodInfoTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"total_count": total_count}).Error
 	return err
 }
 
@@ -1904,7 +1904,7 @@ func GetBaseDrugName(orgid int64) (drug []*models.BaseDrugLibTwenty, err error)
 	return drug, err
 }
 
-func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWarehouseInfoTen, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id = ? and is_check = 1 and (stock_max_number >0 or stock_min_number > 0) and status = 1", drugid, orgid).Find(&info).Error
 	return info, err
@@ -1912,7 +1912,7 @@ func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWar
 
 func UpdateDrugById(id int64, orgid int64, limit_count int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
 	return err
 }
 

service/stock_service.go

@@ -3594,11 +3594,10 @@ func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error
 	return list, err
 }
 
-//func GetAllManufacturerListTX(orgid int64,tx *gorm.DB) (list []*models.Manufacturer, err error) {
-//
-//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
-//	return list, err
-//}
+func GetNewAllManufacturerList(orgid int64) (list []*models.BloodManufacturer, err error) {
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
 
 func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 
@@ -3706,6 +3705,12 @@ func GetAllGoodType(orgid int64) (goodsType []*models.GoodsType, err error) {
 	return goodsType, err
 }
 
+func GetAllNewGoodType(orgid int64) (goodsType []*models.NewGoodsType, err error) {
+
+	err = XTReadDB().Model(&goodsType).Where("org_id = ? and status = 1", orgid).Find(&goodsType).Error
+	return goodsType, err
+}
+
 func GetDepartMentByName(name string, orgid int64) (*models.XtHisDepartment, error) {
 
 	var department models.XtHisDepartment
@@ -5642,7 +5647,7 @@ func GetLastGoodWarehouseOut(orgid int64) (models.WarehouseOut, error) {
 
 func CreateWarehouseInfo(info models.WarehousingInfo) error {
 
-	err := XTReadDB().Create(&info).Error
+	err := XTWriteDB().Create(&info).Error
 	return err
 }
 
@@ -8225,7 +8230,7 @@ func GetSettleOpenConfig(user_org_id int64) (*models.HisSettleStockConfig, error
 
 func CreateSettleOpenConfig(config models.HisSettleStockConfig) error {
 
-	err := XTReadDB().Create(&config).Error
+	err := XTWriteDB().Create(&config).Error
 	return err
 }