11月8日库存管理

controllers/dialysis_api_controller.go

@@ -3452,6 +3452,11 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if template.TemplateId == 47 { //adminInfo.CurrentOrgId == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -3471,7 +3476,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 

controllers/dialysis_record_api_controller.go

@@ -1663,7 +1663,8 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 		tempMinute, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", b), 64)
 		hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 		minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", tempMinute*60), 10, 64)
-		updateAssessmentErr := service.UpdateAssessmentAfterDate(tempDialysisRecords.PatientId, tempDialysisRecords.UserOrgId, tempDialysisRecords.DialysisDate, hour, minute)
+		monitor, _ := service.GetLastMonitorRecord(tempDialysisRecords.UserOrgId, tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate)
+		updateAssessmentErr := service.UpdateAssessmentAfterDateOne(tempDialysisRecords.PatientId, tempDialysisRecords.UserOrgId, tempDialysisRecords.DialysisDate, hour, minute, monitor.BreathingRate)
 		if updateAssessmentErr != nil {
 			utils.ErrorLog("%v", updateAssessmentErr)
 		}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -264,7 +264,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 47 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2907,7 +2907,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -5350,6 +5350,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 删除出库完成后，要增加对应批次的库存数量
 	fmt.Println("deletecount2323232323232323232323232323", delete_count)
 	errThree := service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count)
+	service.ModifyGoodAddInformation(good_yc.GoodId, delete_count, good_yc.GoodId)
 	errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
 	fmt.Println("erron2332323232323232232323", errOne)
 	if errThree != nil {
@@ -5510,14 +5511,13 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		}
 
 		// 删除出库完成后，要增加对应批次的库存数量
-		fmt.Println("时间人秘股呢换药2232323223323223322323232323232323232323232323", delete_count)
 
 		// 删除出库完成后，要改变流水库存
 		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
 
 		fmt.Println("erron2332323232323232232323", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
-
+		service.ModifyGoodAddInformation(good_yc.GoodId, delete_count, good_yc.OrgId)
 		if errThree != nil {
 			return errThree
 		}

service/dialysis_service.go

@@ -706,7 +706,7 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time asc")
+			return db.Where("status = 1 AND user_org_id = ? ", orgID).Order("operate_time asc")
 		}).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
@@ -1238,6 +1238,10 @@ func UpdateAssessmentAfterDate(patient_id int64, org_id int64, date int64, actua
 	err = writeDb.Model(&models.AssessmentAfterDislysis{}).Where("status =1 AND user_org_id = ? AND patient_id = ? AND assessment_date = ?", org_id, patient_id, date).Updates(map[string]interface{}{"actual_treatment_hour": actual_treatment_hour, "actual_treatment_minute": actual_treatment_minute}).Error
 	return
 }
+func UpdateAssessmentAfterDateOne(patient_id int64, org_id int64, date int64, actual_treatment_hour int64, actual_treatment_minute int64, BreathingRate float64) (err error) {
+	err = writeDb.Model(&models.AssessmentAfterDislysis{}).Where("status =1 AND user_org_id = ? AND patient_id = ? AND assessment_date = ?", org_id, patient_id, date).Updates(map[string]interface{}{"actual_treatment_hour": actual_treatment_hour, "actual_treatment_minute": actual_treatment_minute, "breathing_rate": BreathingRate}).Error
+	return
+}
 
 func CreateDialysisBeforePrepare(beforePrepares []*models.DialysisBeforePrepare) (err error) {
 	if len(beforePrepares) > 0 {