历史排班

controllers/dialysis_api_controller.go

@@ -2536,13 +2536,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if dialysisFinish.ID == 0 {
 			service.CreateDialysisFinish(finish)
 		}
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 {
 					dewater_amount = dewater_amount * 1000
 				}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2600,9 +2600,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 {
 
-			if adminUserInfo.Org.Id != 10551 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 {
 				dewater_amount = dewater_amount * 1000
 			}
 

controllers/schedule_api_controller.go

@@ -1360,7 +1360,7 @@ func (c *ScheduleApiController) GetPatients() {
 	weekEnd := theEndTime.Unix()
 
 	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.CurrentOrgId, keywords, weekStart, weekEnd, schedule, contagion)
-	fmt.Println("patinets23233232323232232322323wode", patients)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
 	})

models/schedule_models.go

@@ -342,7 +342,7 @@ type VmBloodSchedule struct {
 	DialysisPrescription       DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"dialysis_prescription"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"assessment_befor_dislysis"`
 	XtDoctorAdvice             XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_doctor_advice"`
-	XtDoctorAdviceOne          XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"advice"`
+	XtDoctorAdviceOne          []*XtDoctorAdvice          `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"advice"`
 	HisDoctorAdvice            HisDoctorAdvice            `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
 	ReceiveTreatmentAsses      ReceiveTreatmentAsses      `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_receive_treatment_asses"`
 	XtAssessmentAfterDislysis  XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`

service/patient_schedule_template_service.go

@@ -296,11 +296,11 @@ func CreatePatientScheduleTemplateThree(orgID int64) (*PatientScheduleTemplateVi
 }
 
 type PatientScheduleTemplatePatientVM struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-
-	Contagions []*PatientScheduleContagion `gorm:"ForeignKey:PatientID" json:"contagions"`
+	ID          int64                       `gorm:"column:id" json:"id" form:"id"`
+	Name        string                      `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo  string                      `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	FirstLetter string                      `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	Contagions  []*PatientScheduleContagion `gorm:"ForeignKey:PatientID" json:"contagions"`
 }
 
 func (PatientScheduleTemplatePatientVM) TableName() string {
@@ -897,6 +897,7 @@ type SchTemplatePatient struct {
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
 	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	IsInfectious int64  `gorm:"column:is_infectious" json:"is_infectious"`
+	FirstLetter  string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (SchTemplatePatient) TableName() string {

service/schedule_service.go

@@ -52,7 +52,7 @@ func GetPatientWithScheduleAndSolution(orgID int64, keywords string, weekStart,
 		Where("p.user_org_id=? and p.lapseto=1 and p.status=1", orgID)
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
-		db = db.Where("p.name LIKE ?", likeKey)
+		db = db.Where("p.name LIKE ? or p.first_letter LIKE ?", likeKey, likeKey)
 	}
 
 	if schedule == 1 {
@@ -671,7 +671,7 @@ func GetSchedualPatientsByKeywordsAndWeek(keywords string, org_id int64, start_t
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("TreatmentMode", "status = 1 ").
-		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ? OR p.first_letter LIKE ?)", likeKey, likeKey, likeKey).
 		Where("s.user_org_id=? and s.schedule_date >= ? and s.schedule_date <= ? and s.status=1", org_id, start_time, end_time).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
 		Order("schedule_date asc").