历史排班

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id 10344
+		subscibe.OrgId = 10344 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id小英10344或4
+		subscibe.OrgId = 10344 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/sign_api_controller.go

@@ -1148,13 +1148,38 @@ func (this *SignApiController) ToCheckInformation() {
 
 func (this *SignApiController) ToAutoDrug() {
 
-	advice, _ := service.GetAutoDrugList(9919)
+	//advice, _ := service.GetAutoDrugList(9919)
+	//
+	//for _, item := range advice {
+	//	//查找该患者是否出库过
+	//	outList, _ := service.GetDrugAutoWarehouseOutList(item.PatientId, item.UserOrgId, item.DrugId, item.AdviceDate)
+	//	if outList.ID == 0 {
+	//		service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+	//	}
+	//}
 
-	for _, item := range advice {
-		//查找该患者是否出库过
-		outList, _ := service.GetDrugAutoWarehouseOutList(item.PatientId, item.UserOrgId, item.DrugId, item.AdviceDate)
-		if outList.ID == 0 {
-			service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+	prescriptionList, _ := service.GetAllPrescriptionList(10579)
+
+	for _, item := range prescriptionList {
+		var DialysisMachineName string
+		if len(item.DialysisDialyszers) > 0 {
+			DialysisMachineName = item.DialysisDialyszers
+		}
+		if len(item.DialyzerPerfusionApparatus) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialyzerPerfusionApparatus
 		}
+
+		if len(item.DialysisIrrigation) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisIrrigation
+		}
+
+		if len(item.DialysisStrainer) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + item.DialysisStrainer
+		}
+		DialysisMachineName = DialysisMachineName
+		service.UpdateSchPatient(item.PatientId, item.RecordDate, item.UserOrgId, DialysisMachineName)
 	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
 }

service/patient_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -2931,17 +2932,30 @@ func UpdateDialysisBefor(dislysis models.XtAssessmentBeforeDislysis, id int64) e
 
 func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64) ([]Schedule, error) {
 	var record []Schedule
-	loc, _ := time.LoadLocation("Local")
-	date, _ := time.ParseInLocation("2006-01-02 15:04:05", time.Now().Format("2006-01-02")+" 00:00:00", loc)
-
-	err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >= ? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", date, patient_id, org_id, mode_id).Find(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
+	if org_id == 10597 {
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+		err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", timeNewDate.Unix(), patient_id, org_id, mode_id).Find(&record).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		}
+	} else {
+		timeNowStr := time.Now().Format("2006-01-02")
+		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+		err := readDb.Model(&Schedule{}).Where("status = 1 AND schedule_date >= ? AND patient_id = ? AND user_org_id = ? AND mode_id= ?", timeNewDate.Unix(), patient_id, org_id, mode_id).Find(&record).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
 		}
 	}
+
 	return record, nil
 }
 
@@ -3291,3 +3305,10 @@ func GetPatientDetailInformedConsent(patient_id int64, org_id int64) (models.XtP
 	err := XTReadDB().Where("id = ? and status=1 and user_org_id =?", patient_id, org_id).Find(&patients).Error
 	return patients, err
 }
+
+func GetAllPrescriptionList(org_id int64) (prescription []*models.DialysisPrescription, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1", org_id).Find(&prescription).Error
+
+	return prescription, err
+}

service/sign_service.go

@@ -2090,3 +2090,9 @@ func GetDrugAutoWarehouseOutList(patient_id int64, user_org_id int64, drug_id in
 
 	return info, err2
 }
+
+func UpdateSchPatient(patient_id int64, schedule_date int64, user_org_id int64, DialysisMachineName string) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("patient_id =? and schedule_date =? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"dialysis_machine_name": DialysisMachineName}).Error
+	return err
+}