库存调拨修改

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -379,7 +379,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
-			newprescribe.Remark = dialysisSolution.Remark
+			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
+				newprescribe.Remark = dialysisSolution.Remark
+			}
+
 			if adminUserInfo.Org.Id == 10340 {
 				newprescribe.TargetUltrafiltration = 0
 				newprescribe.Sodium = 138

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1898,7 +1898,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2000,6 +2000,11 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10432 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+	}
+
 	if lastAssessmentAfterDislysis != nil {
 		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
 
@@ -2087,85 +2092,6 @@ func (c *DialysisAPIController) Finish() {
 		return
 	}
 
-	//下机完自动消毒,针对长沙南雅
-	if dialysisOrder.Stage == 1 {
-		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
-			//根据床位号获取设备型号
-			unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
-			//查询使用消毒最后一条消毒记录
-			_, err := service.GetLaseDeviceInfomation(dialysisOrder.UserOrgId, dialysisOrder.BedID, dialysisOrder.DialysisDate, dialysisOrder.SchedualType)
-			fmt.Println("err", err)
-			if err == gorm.ErrRecordNotFound {
-				//查找排班
-				scheduleByPatient, _ := service.GetScheduleByPatient(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
-				//查询改设备是否有消毒计划
-				plan, errcode := service.GetDisInfectionTime(dialysisOrder.UserOrgId, unitType.UnitType, dialysisOrder.SchedualType, scheduleByPatient.ScheduleWeek)
-
-				//根据床位号获取设备id
-				addmacher, _ := service.GetEquimentIDTwo(dialysisOrder.BedID, dialysisOrder.UserOrgId)
-
-				//查询病人信息
-				patients, _ := service.GetPatientInfoMation(dialysisOrder.PatientId)
-				var con = ""
-				if patients.IsInfectious == 0 {
-					con = ""
-				}
-				if patients.IsInfectious == 1 {
-					con = "无"
-				}
-				if patients.IsInfectious == 2 {
-					con = "有"
-				}
-
-				//如果没有消毒计划，去查询该设备的上次消毒时间
-				if errcode == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
-				}
-				if errcode == nil {
-					var end_time int64
-					end_time = endDate.Unix() + plan.DisinfecTime*60
-					//新增消毒
-					information := models.DeviceInformation{
-						Date:                  dialysisOrder.DialysisDate,
-						Zone:                  dialysisOrder.ZoneId,
-						Class:                 dialysisOrder.SchedualType,
-						BedNumber:             dialysisOrder.BedID,
-						PatientId:             dialysisOrder.PatientId,
-						DialysisMode:          scheduleByPatient.ModeId,
-						LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
-						Disinfection:          1,
-						DialysisConcentration: 1,
-						DisinfectionStatus:    1,
-						Move:                  1,
-						UserOrgId:             dialysisOrder.UserOrgId,
-						DisinfectType:         plan.Way,
-						DisinfectantType:      plan.MachineDisinfectant,
-						FluidPath:             plan.DisinfectanWay, //液路消毒方式
-						Disinfectant:          plan.Disinfectant,
-						Ctime:                 time.Now().Unix(),
-						Status:                1,
-						SignName:              dialysisOrder.FinishNurse,
-						EquimentId:            addmacher.ID,
-						DisinfectionResidue:   2,
-						Bed:                   addmacher.BedNumber,
-						StartTime:             dialysisOrder.StartTime,
-						EndTime:               dialysisOrder.EndTime,
-						Contagion:             con,
-						WeightLoss:            0,
-						Hyperfiltratio:        0,
-						DialysisHour:          "",
-						MachineRun:            1,
-						DisinfecStartime:      endDate.Unix(),
-						DisinfecEndtime:       end_time,
-					}
-					err := service.CreateInformationTwo(&information)
-					fmt.Println("报错", err)
-				}
-			}
-		}
-	}
-
 	if dialysisOrder.Stage == 1 {
 		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
 
@@ -2180,6 +2106,80 @@ func (c *DialysisAPIController) Finish() {
 		//结束时候透析次数加1
 		service.UpdateSolutionByPatientId(id)
 
+		//下机完自动消毒,针对长沙南雅
+		if dialysisOrder.Stage == 1 {
+			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+				//根据床位号获取设备型号
+				unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+				//查询使用消毒最后一条消毒记录
+				_, err := service.GetLaseDeviceInfomation(dialysisOrder.UserOrgId, dialysisOrder.BedID, dialysisOrder.DialysisDate, dialysisOrder.SchedualType)
+				fmt.Println("err", err)
+				if err == gorm.ErrRecordNotFound {
+					//查找排班
+					scheduleByPatient, _ := service.GetScheduleByPatient(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
+					//查询改设备是否有消毒计划
+					plan, errcode := service.GetDisInfectionTime(dialysisOrder.UserOrgId, unitType.UnitType, dialysisOrder.SchedualType, scheduleByPatient.ScheduleWeek)
+
+					//根据床位号获取设备id
+					addmacher, _ := service.GetEquimentIDTwo(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+
+					//查询病人信息
+					patients, _ := service.GetPatientInfoMation(dialysisOrder.PatientId)
+					var con = ""
+					if patients.IsInfectious == 0 {
+						con = ""
+					}
+					if patients.IsInfectious == 1 {
+						con = "无"
+					}
+					if patients.IsInfectious == 2 {
+						con = "有"
+					}
+
+					if errcode == nil {
+						var end_time int64
+						end_time = endDate.Unix() + plan.DisinfecTime*60
+						//新增消毒
+						information := models.DeviceInformation{
+							Date:                  dialysisOrder.DialysisDate,
+							Zone:                  dialysisOrder.ZoneId,
+							Class:                 dialysisOrder.SchedualType,
+							BedNumber:             dialysisOrder.BedID,
+							PatientId:             dialysisOrder.PatientId,
+							DialysisMode:          scheduleByPatient.ModeId,
+							LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
+							Disinfection:          1,
+							DialysisConcentration: 1,
+							DisinfectionStatus:    1,
+							Move:                  1,
+							UserOrgId:             dialysisOrder.UserOrgId,
+							DisinfectType:         plan.Way,
+							DisinfectantType:      plan.MachineDisinfectant,
+							FluidPath:             plan.DisinfectanWay, //液路消毒方式
+							Disinfectant:          plan.Disinfectant,
+							Ctime:                 time.Now().Unix(),
+							Status:                1,
+							SignName:              nurseID,
+							EquimentId:            addmacher.ID,
+							DisinfectionResidue:   2,
+							Bed:                   addmacher.BedNumber,
+							StartTime:             dialysisOrder.StartTime,
+							EndTime:               dialysisOrder.EndTime,
+							Contagion:             con,
+							WeightLoss:            0,
+							Hyperfiltratio:        0,
+							DialysisHour:          "",
+							MachineRun:            1,
+							DisinfecStartime:      endDate.Unix(),
+							DisinfecEndtime:       end_time,
+						}
+						err := service.CreateInformationTwo(&information)
+						fmt.Println("报错", err)
+					}
+				}
+			}
+		}
+
 		dialysisOrder.Stage = 2
 		dialysisOrder.FinishNurse = nurseID
 		dialysisOrder.FinishCreator = adminUserInfo.AdminUser.Id
@@ -2596,8 +2596,9 @@ func (this *DialysisAPIController) StartDialysis() {
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
-
-			record.BreathingRate = befor.BreathingRate
+			if adminUserInfo.Org.Id != 10445 {
+				record.BreathingRate = befor.BreathingRate
+			}
 			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature
 		}

controllers/print_data_api_controller.go

@@ -141,7 +141,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
-				item.Count = list.Count
+				if this.GetAdminUserInfo().CurrentOrgId == 10445 {
+					listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
+					item.Count = listOrder.DialysisTotal
+				}
+				if this.GetAdminUserInfo().CurrentOrgId != 10445 {
+					item.Count = list.Count
+				}
+
 			}
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
 				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)

models/dialysis.go

@@ -792,12 +792,13 @@ type DialysisOrders struct {
 }
 
 type VmDialysisOrder struct {
-	Count        int64
-	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"`
-	Stage        int64 `gorm:"column:stage" json:"stage"`
-	Status       int64 `gorm:"column:status" json:"status"`
+	Count         int64
+	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"`
+	Stage         int64 `gorm:"column:stage" json:"stage"`
+	Status        int64 `gorm:"column:status" json:"status"`
+	DialysisTotal int64 `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 }
 
 func (VmDialysisOrder) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -207,7 +207,13 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 
 func GetDialysisOrderCountSeven(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ?", recordDate, patient_id).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date,dialysis_total from xt_dialysis_order where dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ?", recordDate, patient_id).Scan(&order).Error
+	return order, err
+}
+
+func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Where("patient_id = ? and dialysis_date = ? and status = 1", patient_id, recordDate).Last(&order).Error
 	return order, err
 }