历史排班

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1,15 +1,16 @@
 package mobile_api_controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"math"
+	"strings"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/jinzhu/gorm"
-	"math"
-	"strings"
 
 	// "fmt"
 	"reflect"
@@ -1665,22 +1666,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//
-				//if config.IsOpen == 1 && item.UserOrgId == 10210 {
-				//
-				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-				//	//更新字典里面的库存
-				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				//	var sum_count int64
-				//	for _, its := range stockInfo {
-				//		if its.MaxUnit == medical.MaxUnit {
-				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-				//		}
-				//		sum_count += its.StockMaxNumber + its.StockMinNumber
-				//	}
-				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-				//	//剩余库存
-				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				//}
+				if config.IsOpen == 1 && item.UserOrgId == 10188 {
+
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					var sum_count int64
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//剩余库存
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
 
 			}
 		}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -399,14 +399,19 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 		}
 	}
 
+	timenow := time.Now().Format("2006-01-02")
+	timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timenow)
 	//针对百霖和贝尔
 	if orgid == 10138 || orgid == 10278 || orgid == 3877 {
 		//获取今日的排班数据
 		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
 		for _, item := range list {
-			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
-			var str = solution.DialysisDialyszers + "/" + solution.DialysisIrrigation
-			service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+			if item.ScheduleDate >= timeNewDate.Unix() {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				var str = solution.DialysisDialyszers + "/" + solution.DialysisIrrigation
+				service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+			}
+
 		}
 	}
 
@@ -414,9 +419,12 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 		//获取今日的排班数据
 		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
 		for _, item := range list {
-			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
-			var str = solution.DialyzerPerfusionApparatus
-			service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+			if item.ScheduleDate >= timeNewDate.Unix() {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				var str = solution.DialyzerPerfusionApparatus
+				service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, str, item.ScheduleType)
+			}
+
 		}
 	}
 
@@ -426,20 +434,23 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
 
 		for _, item := range schedulesFive {
-			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
-			var DialysisMachineName string
-			if len(solution.DialysisDialyszers) > 0 {
-				DialysisMachineName = solution.DialysisDialyszers
-			}
-			if len(solution.DialyzerPerfusionApparatus) > 0 {
-				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
-			}
+			if item.ScheduleDate >= timeNewDate.Unix() {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				var DialysisMachineName string
+				if len(solution.DialysisDialyszers) > 0 {
+					DialysisMachineName = solution.DialysisDialyszers
+				}
+				if len(solution.DialyzerPerfusionApparatus) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+				}
 
-			if len(solution.DialysisIrrigation) > 0 {
-				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+				if len(solution.DialysisIrrigation) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+				}
+				item.DialysisMachineName = DialysisMachineName
+				service.UpdateSchOne(item.ID, item.DialysisMachineName)
 			}
-			item.DialysisMachineName = DialysisMachineName
-			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+
 		}
 
 	}

controllers/patient_api_controller.go

@@ -1,13 +1,7 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
-	"github.com/jinzhu/gorm"
-	"github.com/mozillazg/go-pinyin"
 	"math"
 	"math/rand"
 	"reflect"
@@ -16,6 +10,13 @@ import (
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
+
 	"fmt"
 
 	"github.com/astaxie/beego"
@@ -951,12 +952,18 @@ func (c *PatientApiController) EditLapseto() {
 	err = service.EditPatientLapseto(&patient, &lapseto)
 
 	if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
-		timeStr := time.Now().Format("2006-01-02")
-		timeLayout := "2006-01-02 15:04:05"
-		timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
-		timenow := timeStringToTime.Unix()
-		service.UpdateScheduleByDeathTime(id, timenow)
-		service.UpdateScheduleItemByPatientId(id)
+		fmt.Println("lapsetoTimeUnix.Unix()", lapsetoTimeUnix.Unix())
+		if adminUserInfo.CurrentOrgId == 10340 {
+			service.UpdateScheduleByDeathTime(id, lapsetoTimeUnix.Unix())
+			service.UpdateScheduleItemByPatientId(id)
+		} else {
+			timeStr := time.Now().Format("2006-01-02")
+			timeLayout := "2006-01-02 15:04:05"
+			timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+			timenow := timeStringToTime.Unix()
+			service.UpdateScheduleByDeathTime(id, timenow)
+			service.UpdateScheduleItemByPatientId(id)
+		}
 	}
 
 	allergic := models.XtPatientAllergic{

controllers/schedule_api_controller.go

@@ -4741,14 +4741,18 @@ func (c *ScheduleApiController) GetScheduleOne() {
 		weekEndPoint = theEndTime.Unix()
 	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
-
+	timenow := time.Now().Format("2006-01-02")
+	timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timenow)
 	if adminInfo.CurrentOrgId == 10346 || adminInfo.CurrentOrgId == 10585 {
 
 		if len(schdules) > 0 {
 			//获取长期医嘱里面的透析器灌流器
 			for _, item := range schdules {
-				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
-				service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, solution.DialyzerPerfusionApparatus, item.ScheduleType)
+				if item.ScheduleDate >= timeNewDate.Unix() {
+					solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+					service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, solution.DialyzerPerfusionApparatus, item.ScheduleType)
+				}
+
 			}
 
 		}
@@ -4760,20 +4764,23 @@ func (c *ScheduleApiController) GetScheduleOne() {
 		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 
 		for _, item := range schedulesFive {
-			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
-			var DialysisMachineName string
-			if len(solution.DialysisDialyszers) > 0 {
-				DialysisMachineName = solution.DialysisDialyszers
-			}
-			if len(solution.DialyzerPerfusionApparatus) > 0 {
-				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
-			}
+			if item.ScheduleDate >= timeNewDate.Unix() {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				var DialysisMachineName string
+				if len(solution.DialysisDialyszers) > 0 {
+					DialysisMachineName = solution.DialysisDialyszers
+				}
+				if len(solution.DialyzerPerfusionApparatus) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+				}
 
-			if len(solution.DialysisIrrigation) > 0 {
-				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+				if len(solution.DialysisIrrigation) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+				}
+				item.DialysisMachineName = DialysisMachineName
+				service.UpdateSchOne(item.ID, item.DialysisMachineName)
 			}
-			item.DialysisMachineName = DialysisMachineName
-			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+
 		}
 
 	}