11月9日库存管理

controllers/his_api_controller.go

@@ -5407,10 +5407,13 @@ func (c *HisApiController) GetUploadInfo() {
 
 				}
 			}
-			for _, item := range infos {
-				service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+			if adminUser.CurrentOrgId == 9671 {
+				for _, item := range infos {
+					service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
+				}
+				service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
 			}
-			service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
+
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "结算成功",
 			})
@@ -5545,15 +5548,16 @@ func (c *HisApiController) Refund() {
 			}
 		}
 	}
-	fmt.Println("infos2323232332233232323232w", infos)
-	for _, item := range infos {
+	if adminUser.CurrentOrgId == 9671 {
+		for _, item := range infos {
 
-		service.DrugAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+			service.DrugAutoAddCancelInfo(item, adminUser.AdminUser.Id)
 
-	}
+		}
 
-	for _, item := range newGoods {
-		service.GoodAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+		for _, item := range newGoods {
+			service.GoodAutoAddCancelInfo(item, adminUser.AdminUser.Id)
+		}
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -659,6 +659,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10318 {
 					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
 				}
+				if adminUserInfo.Org.Id == 10340 {
+					evaluation.BreathingRate = "20"
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/stock_in_api_controller.go

@@ -151,8 +151,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getwarehouseinfolist", &StockManagerApiController{}, "Get:GetInvetoryWarehouseInfoList")
 
 	//结算成功后调用操作库存相关接口
-	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
-	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
+	//beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
+	//beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 }
 
 func (c *StockManagerApiController) HandleRefundStock() {

service/mobile_dialysis_service.go

@@ -37,7 +37,9 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		db = db.Where("schedule_type = ?", scheduleType)
 	}
 
-	err := db.Preload("DialysisSolution", "status = 1 and user_org_id = ? and solution_status = 1", orgID).Find(&vms).Error
+	err := db.Preload("DialysisLastOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Order("dialysis_date desc").Where("status = 1 AND user_org_id = ? and dialysis_date < ?", orgID, scheduleDate)
+	}).Preload("DialysisSolution", "status = 1 and user_org_id = ? and solution_status = 1", orgID).Find(&vms).Error
 	return vms, err
 }
 
@@ -129,6 +131,7 @@ type MDialysisScheduleVMForList struct {
 	SchedualPatient          *models.MSchedualPatientList      `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *models.MDeviceNumberForList      `gorm:"ForeignKey:BedId" json:"device_number"`
 	DialysisOrder            *models.MDialysisOrderForList     `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	DialysisLastOrder        *models.MDialysisOrderForList     `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"last_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  *models.VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
@@ -258,19 +261,21 @@ type MDialysisOrderVM struct {
 	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
 	Stage int64 `gorm:"column:stage" json:"stage"`
 	// Remark         string `gorm:"column:remark" json:"remark"`
-	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"`
-	Status            int64                      `gorm:"column:status" json:"status"`
-	PunctureNurse     int64                      `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber      *MDeviceNumberVM           `gorm:"ForeignKey:BedID" json:"device_number"`
-	MonitoringRecords []*models.MonitoringRecord `gorm:"ForeignKey:DialysisOrderId" json:"monitoring_records"`
-	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"`
+	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"`
+	Status             int64                      `gorm:"column:status" json:"status"`
+	PunctureNurse      int64                      `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	DeviceNumber       *MDeviceNumberVM           `gorm:"ForeignKey:BedID" json:"device_number"`
+	MonitoringRecords  []*models.MonitoringRecord `gorm:"ForeignKey:DialysisOrderId" json:"monitoring_records"`
+	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"`
+	DialysisIrrigation string                     `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string                     `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 }
 
 func (MDialysisOrderVM) TableName() string {

service/patient_service.go

@@ -2267,7 +2267,13 @@ func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrd
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
+	//fmt.Println("hhhahdfhadhfhahfhahfh",scheduleDate)
+	//fmt.Println("hhhahdfhadhfhahfhahfh",key)
+	//if (scheduleDate==1669132800){
+	//  redis.Set(key, "", time.Second)
+	//}
+	//
+	//fmt.Println("hhhahdfhadhfhahfhahfh",dialysis_orders_list_all)
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 		if err != nil {

service/stock_service.go

@@ -4237,7 +4237,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 
 	return out, err
 }