11月9日库存管理

controllers/dialysis_api_controller.go

@@ -2962,13 +2962,22 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
-	if adminUserInfo.CurrentOrgId != 10101 {
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 {
 		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 		patientInfo.TotalDialysis = dialysis_count
 	}
-	if adminUserInfo.CurrentOrgId == 10101 {
-		dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-		patientInfo.TotalDialysis = dialysis_count
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 {
+
+		if xttime <= 1640966400 {
+			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+			patientInfo.TotalDialysis = dialysis_count
+		}
+
+		if xttime >= 1672502400 {
+			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+			patientInfo.TotalDialysis = dialysis_count
+		}
+
 	}
 
 	//相关操作对应的操作人

controllers/dialysis_record_api_controller.go

@@ -1010,10 +1010,22 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	//更新患者表排班备注
 	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, patientID, schedule_remark)
 
-	//统计该患者总次数
-	dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
+	////统计该患者总次数
+	//dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
+	//
+	//service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 3877 {
+		//统计该患者总次数
+		dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
+		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+	}
 
-	service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 3877 {
+		//统计该患者总次数
+		dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.CurrentOrgId, patientID)
+		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+	}
 
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2346,9 +2346,18 @@ func (this *DialysisAPIController) StartDialysis() {
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 		service.UpdateMobilePatient(adminUserInfo.Org.Id, patientID, schedule_remark)
 
-		//统计该患者总次数
-		dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.Org.Id, patientID)
-		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
+		if adminUserInfo.Org.Id != 10101 && adminUserInfo.Org.Id != 10445 && adminUserInfo.Org.Id != 3877 {
+			//统计该患者总次数
+			dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.Org.Id, patientID)
+			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
+		}
+
+		if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 3877 {
+			//统计该患者总次数
+			dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.Org.Id, patientID)
+			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
+		}
+
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)

models/new_monitor.go

@@ -41,14 +41,15 @@ func (VMMonitorPatients) TableName() string {
 }
 
 type VMMonitorDialysisOrder struct {
-	ID           int64        `gorm:"column:id" json:"id"`
-	DialysisDate int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId    int64        `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId    int64        `gorm:"column:patient_id" json:"patient_id"`
-	BedID        int64        `gorm:"column:bed_id" json:"bed_id"`
-	Status       int64        `gorm:"column:status" json:"status"`
-	DeviceNumber DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
-	StartTime    int64        `gorm:"column:start_time" json:"start_time"`
+	ID            int64        `gorm:"column:id" json:"id"`
+	DialysisDate  int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId     int64        `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId     int64        `gorm:"column:patient_id" json:"patient_id"`
+	BedID         int64        `gorm:"column:bed_id" json:"bed_id"`
+	Status        int64        `gorm:"column:status" json:"status"`
+	DeviceNumber  DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
+	StartTime     int64        `gorm:"column:start_time" json:"start_time"`
+	DialysisTotal int64        `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 }
 
 func (VMMonitorDialysisOrder) TableName() string {

service/device_service.go

@@ -391,11 +391,13 @@ func UpdateDeviceGroup(group *models.DeviceGroup) error {
 //////// 机号 Number
 
 type DeviceNumberVM struct {
-	ID     int64  `gorm:"column:id" json:"id"`
-	OrgID  int64  `gorm:"column:org_id" json:"-"`
-	Number string `gorm:"column:number" json:"number"`
-	ZoneID int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status int64  `gorm:"column:status" json:"status" form:"status"`
+	ID      int64  `gorm:"column:id" json:"id"`
+	OrgID   int64  `gorm:"column:org_id" json:"-"`
+	Number  string `gorm:"column:number" json:"number"`
+	ZoneID  int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status  int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort    int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
 }
 
 func (DeviceNumberVM) TableName() string {

service/mobile_dialysis_service.go

@@ -2755,6 +2755,11 @@ func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (
 	return
 }
 
+func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1672502400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetFirstDateOfMonth(d time.Time) time.Time {
 	d = d.AddDate(0, 0, -d.Day()+1)
 	return GetZeroTime(d)
@@ -5199,6 +5204,16 @@ func GetDialysisTotalCount(org_id int64, patient_id int64) (models.BloodDialysis
 	return order, err
 }
 
+func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1672502400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+
+	return order, err
+}
+
 func UpdateDialysisOrder(patient_id int64, dialysis_date int64, user_org_id int64, dialysis_total int64) (models.DialysisOrder, error) {
 
 	order := models.DialysisOrder{}

service/patient_service.go

@@ -2517,7 +2517,7 @@ func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatien
 	patient_info_str, _ := redis.Get(key).Result()
 
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil