库存调拨修改

controllers/dialysis_api_controller.go

@@ -3120,7 +3120,6 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 }
 
-//
 func (c *DialysisApiController) GetLongAdvice() {
 	patient_id, _ := c.GetInt64("patient_id")
 	adminUserInfo := c.GetAdminUserInfo()
@@ -3862,7 +3861,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			//长沙南雅
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4349,7 +4348,7 @@ func (c *DialysisApiController) GetInitPrintDataOne() {
 	}
 }
 
-//新接口
+// 新接口
 func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	keyword := this.GetString("keywords")

controllers/dialysis_record_api_controller.go

@@ -1181,6 +1181,12 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.BreathingRate = "20"
 			}
 
+			//针对蓬安济民
+			if adminUserInfo.CurrentOrgId == 9829 {
+				record.Temperature = 36.5
+				record.PulseFrequency = 80
+			}
+
 			//针对兰溪人民医院的需求
 			if adminUserInfo.CurrentOrgId == 10432 {
 				befor, _ := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
@@ -1375,6 +1381,12 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		if adminUserInfo.CurrentOrgId == 10447 || adminUserInfo.CurrentOrgId == 9675 {
 			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		}
+
+		//针对蓬安
+		if adminUserInfo.CurrentOrgId == 9829 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		}
 	}
 
 	if adminUserInfo.CurrentOrgId == 9583 {
@@ -1458,7 +1470,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 {
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {

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 {
+	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 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1995,6 +1995,11 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 9829 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+	}
+
 	if lastAssessmentAfterDislysis != nil {
 		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
 
@@ -2548,6 +2553,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
 			record.BreathingRate = befor.BreathingRate
 		}
+
+		if adminUserInfo.Org.Id == 9829 {
+			record.PulseFrequency = 80
+			record.Temperature = 36.5
+		}
 		err := service.CreateMonitor(&record)
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
@@ -3164,7 +3174,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3402,11 +3412,9 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		ScheduleRemark:         schedule_remark,
 	}
 
+	//修改床位号需要重新消毒
 	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10445 {
-
-		if tempDialysisRecord.BedID != bedID {
-			service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
-		}
+		service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
@@ -4790,6 +4798,10 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				for _, item := range consumables {
 					//出库
 					err := service.ConsumablesGoodDelivery(item.UserOrgId, patient_id, record_time, item, &warehouseOut, item.Count)
+
+					//err := service.ConsumableMobileDelivery(item.UserOrgId, patient_id, record_time, item, &warehouseOut, adminInfo.AdminUser.Id, item.Count)
+					//fmt.Println("item----------------------------------count", item.Count)
+
 					if err == nil {
 						goodErrcode := models.XtGoodErrcode{
 							UserOrgId:      adminInfo.Org.Id,
@@ -4940,6 +4952,8 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 			for _, item := range consumables {
 				//出库
 				err := service.ConsumablesGoodDelivery(item.UserOrgId, patient_id, record_time, item, &out, item.Count)
+				//err := service.ConsumableMobileDelivery(item.UserOrgId, patient_id, record_time, item, &out, adminInfo.AdminUser.Id, item.Count)
+				//fmt.Println("item----------------------------------count", item.Count)
 				if err != nil {
 					goodErrcode := models.XtGoodErrcode{
 						UserOrgId:      adminInfo.Org.Id,
@@ -5213,6 +5227,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				fmt.Println("退库长度", len(cancelbefor))
 				fmt.Println("出库长度", len(outbefor))
+
 				//退库
 				for _, item := range cancelbefor {
 					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
@@ -5258,7 +5273,6 @@ func (c *DialysisAPIController) EditConsumables() {
 					warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
 					warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
 					//查找当天是否存在出库记录
-
 					_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
 
 					if errcod == gorm.ErrRecordNotFound {
@@ -5358,6 +5372,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+
 						if errflows == gorm.ErrRecordNotFound {
 							//创建流水表
 							service.CreateStockFlowOne(stockFlow)
@@ -5478,8 +5493,6 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					}
 
-					//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
-
 					//查询该耗材的总库存
 					wareinfo, _ := service.GetStockGoodCount(item.GoodId)
 					// 如果库存差大于剩余库存则提示库存不足