2024/6/17

controllers/base_api_controller.go

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

controllers/dialysis_api_controller.go

@@ -5614,7 +5614,7 @@ func (c *DialysisApiController) UploadDryWeight() {
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
 
 		//康桥
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10721 {
 			timeNowStr := time.Now().Format("2006-01-02")
 			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 
@@ -6177,6 +6177,7 @@ func (this *DialysisApiController) SaveDialysisSetting() {
 	gansuna_set, _ := this.GetInt64("gansuna_set")
 	zhetangtie_set, _ := this.GetInt64("zhetangtie_set")
 	niaojimei_set, _ := this.GetInt64("niaojimei_set")
+	dialysis_strainer_set, _ := this.GetInt64("dialysis_strainer_set")
 	dialysisSetting := models.XtDialysisSetting{
 		Sodium:                     sodium_set,
 		Calcium:                    calcium_set,
@@ -6215,6 +6216,7 @@ func (this *DialysisApiController) SaveDialysisSetting() {
 		GansunaSet:                 gansuna_set,
 		ZhetangtieSet:              zhetangtie_set,
 		NiaojimeiSet:               niaojimei_set,
+		DialysisStrainerSet:        dialysis_strainer_set,
 	}
 	err := service.SaveDialysisSetting(dialysisSetting)
 	if err == nil {

controllers/doctors_api_controller.go

@@ -353,7 +353,7 @@ func (c *DoctorsApiController) UpdatedDryWeightData() {
 	}
 
 	//康桥
-	if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10721 {
 		timeNowStr := time.Now().Format("2006-01-02")
 		timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 

controllers/his_api_controller.go

@@ -3197,7 +3197,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -118,6 +118,7 @@ func (this *DialysisAPIController) Scheduals() {
 				dobulecheck, _ := service.GetAllDobuleCheckList(orgID, date.Unix())
 
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
+
 				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
 
 				//monitor, _ := service.GetMonitorByListSix(orgID, date.Unix())
@@ -561,8 +562,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
 
-	fmt.Print("projectOne------------------------", projectsOne)
-
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
@@ -2803,6 +2802,11 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
 		}
 
+		if adminUserInfo.Org.Id == 10721 {
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+		}
+
 		if adminUserInfo.Org.Id == 10697 {
 			lastWeightAfter, _ := service.GetLastWeightAfter(tempassessmentAfterDislysis.PatientId, tempassessmentAfterDislysis.AssessmentDate, adminUserInfo.Org.Id)
 			floatAfeter := strconv.FormatFloat(lastWeightAfter.WeightAfter, 'f', -1, 64)
@@ -3080,6 +3084,11 @@ func (c *DialysisAPIController) Finish() {
 		lastWeightAfter.LastAfterWeight = floatAfeter
 	}
 
+	if adminUserInfo.Org.Id == 10721 {
+		tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		tempassessmentAfterDislysis.SystolicBloodPressure = 0
+	}
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
@@ -3630,6 +3639,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	var ultrafiltration_rate float64
 	var ultrafiltration_rate_one string
+	var replacement_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
 	//后期预增脱水量
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
@@ -3751,6 +3761,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			if adminUserInfo.Org.Id == 10721 {
+				replacement_rate = math.Floor(prescription.ReplacementTotal * 1000 / float64(totalMin) * 60 * 1000)
+				replacement_rate = replacement_rate / 1000
+			}
+
 		}
 	}
 
@@ -3769,6 +3784,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		CreatedTime:            time.Now().Unix(),
 		UpdatedTime:            time.Now().Unix(),
 		UltrafiltrationRateOne: ultrafiltration_rate_one,
+		ReplacementRate:        replacement_rate,
 	}
 
 	//只针对广慈医院
@@ -4834,6 +4850,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if adminInfo.Org.Id == 10721 {
+				fmt.Println("prescription.PrescriptionWater-------------------", prescription.PrescriptionWater)
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
@@ -6164,7 +6181,7 @@ func (c *DialysisAPIController) UploadDryWeight() {
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
 
 		//康桥
-		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10164 {
+		if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10721 {
 			timeNowStr := time.Now().Format("2006-01-02")
 			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
 

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -46,9 +46,13 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 		var vlist []interface{}
 		var elist []interface{}
+
 		for _, item := range patient {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
+			solution, _ := service.GetDialysisSolution(orgid, item.PatientId, item.ModeId)
+			item.DialysisSolution = solution
 			vlist = append(vlist, prescription)
+
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
 
 			elist = append(elist, dialysis)
@@ -68,14 +72,19 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
+
 		var vlist []interface{}
 		var elist []interface{}
+
 		for _, item := range patient {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
 			vlist = append(vlist, prescription)
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
-			fmt.Println("dialysis-------------------------------------------", dialysis)
 			elist = append(elist, dialysis)
+
+			solution, _ := service.GetDialysisSolution(orgid, item.PatientId, item.ModeId)
+			item.DialysisSolution = solution
+
 		}
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{

controllers/patient_api_controller.go

@@ -231,6 +231,7 @@ func (c *PatientApiController) GetPatientsList() {
 	isscheduling, _ := c.GetInt64("isscheduling", 0)
 	isprescription, _ := c.GetInt64("isprescription", 0)
 	patientSoureType, _ := c.GetInt64("patientSoureType")
+	patient_type, _ := c.GetInt64("patient_type")
 	nurse, _ := c.GetInt64("nurse")
 	if page <= 0 {
 		page = 1
@@ -270,7 +271,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -4689,12 +4690,14 @@ func (c *PatientApiController) GetPatientDialysisRecords() {
 
 	adminInfo := c.GetAdminUserInfo()
 	records, total, _ := service.GetPatientDialysisRecord(adminInfo.CurrentOrgId, patientID, page, limit, theStartTIme, theEndtTIme, mode_id)
-
+	fmt.Println("长度", len(records))
 	if len(records) == 0 {
-		list, _ := service.GetAllDialysisOrder(patientID)
+		list, _ := service.GetAllDialysisOrder(patientID, theStartTIme, theEndtTIme)
 		for _, item := range list {
 			schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType)
-			service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+			prescribeOne, _ := service.GetDialysisPrescribeOne(adminInfo.CurrentOrgId, item.PatientId, item.DialysisDate)
+
+			service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, adminInfo.CurrentOrgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID, prescribeOne.ModeId)
 		}
 	}
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/sign_api_controller.go

@@ -1227,7 +1227,7 @@ func (this *SignApiController) ToAutoDrug() {
 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
@@ -1242,12 +1242,12 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrderTwo(10892)
-	fmt.Println("list=============", list)
-	for _, item := range list {
-		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
-	}
+	//list, _ := service.GetAllDialysisOrderTwo(10340)
+	//
+	//for _, item := range list {
+	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+	//}
 
 	//drugList, _ := service.GetAllBaseDrugList(10318)
 	//for _, item := range drugList {
@@ -1261,6 +1261,12 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
 	//}
 
+	list, _ := service.GetAllDialysisPrescription(29190)
+
+	for _, item := range list {
+		service.UpdateSchedulePrescrition(item.PatientId, item.RecordDate, item.UserOrgId, item.ModeId)
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

models/dialysis_parameter_models.go

@@ -104,10 +104,11 @@ func (BloodAutomaticReduceDetail) TableName() string {
 }
 
 type XtScheduleTwo struct {
-	ID        int64  `gorm:"column:id" json:"id" form:"id"`
-	ModeId    int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Name      string `gorm:"column:name" json:"name" form:"name"`
+	ID               int64            `gorm:"column:id" json:"id" form:"id"`
+	ModeId           int64            `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	PatientId        int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Name             string           `gorm:"column:name" json:"name" form:"name"`
+	DialysisSolution DialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (XtScheduleTwo) TableName() string {

models/new_stock_models.go

@@ -220,6 +220,7 @@ type XtDialysisSetting struct {
 	GansunaSet                 int64 `gorm:"column:gansuna_set" json:"gansuna_set" form:"gansuna_set"`
 	ZhetangtieSet              int64 `gorm:"column:zhetangtie_set" json:"zhetangtie_set" form:"zhetangtie_set"`
 	NiaojimeiSet               int64 `gorm:"column:niaojimei_set" json:"niaojimei_set" form:"niaojimei_set"`
+	DialysisStrainerSet        int64 `gorm:"column:dialysis_strainer_set" json:"dialysis_strainer_set" form:"dialysis_strainer_set"`
 }
 
 func (XtDialysisSetting) TableName() string {

service/dialysis_parameter_service.go

@@ -1,8 +1,9 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
+
+	"XT_New/models"
 	"github.com/jinzhu/gorm"
 )
 
@@ -63,6 +64,7 @@ type MonitorDialysisSchedule struct {
 	AssessmentBeforeDislysis models.PredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  models.AssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
 	MonitoringRecord         []models.MonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	DialysisSolution         models.DialysisSolution        `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
 }
 
 func (MonitorDialysisSchedule) TableName() string {
@@ -70,7 +72,7 @@ func (MonitorDialysisSchedule) TableName() string {
 }
 
 func GetDialysisParametersByKeyword(orgID int64, keyword string, schedulType int64, partitionType int64, page int64, limit int64, schedulDate int64) ([]*VMDialysisSchedule, error, int64) {
-	fmt.Println("scheduletye ======================", schedulType)
+
 	var patients []*models.Patients
 	getPatientErr := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? AND (name like ? OR dialysis_no like ?)", orgID, "%"+keyword+"%", "%"+keyword+"%").Find(&patients).Error
 	if getPatientErr != nil {
@@ -118,7 +120,8 @@ func GetDialysisParameter(orgID int64, schedulDate int64, schedulType int64, par
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, schedulDate).
 		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, schedulDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, schedulDate).
-		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
+		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisSolution", "status=1 and user_org_id = ? and solution_status = 1", orgID)
 	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
 	if schedulDate > 0 {
 		db = db.Where("schedule_date = ?", schedulDate)

service/mobile_dialysis_service.go

@@ -2754,6 +2754,13 @@ func GetDialysisPrescribe(orgID int64, patientID int64, recordDate int64) (*mode
 	return &record, nil
 }
 
+func GetDialysisPrescribeOne(orgID int64, patientID int64, recordDate int64) (models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+
+	return record, err
+}
+
 // 透析方案
 func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
 	var record models.DialysisSolution
@@ -3279,33 +3286,67 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientid, 10) + ":" + strconv.FormatInt(recorddate, 10) + ":his_doctor_advice"
 	his_doctor_advice_str, _ := redis.Get(key).Result()
 	redis.Set(key, "", time.Second)
-	if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(his) <= 0 {
+	if orgid != 10721 {
+		if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(his) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return his, nil
+				} else {
+					return his, err
+				}
+			} else {
+				if len(his) > 0 {
+					//缓存数据
+					his_doctor_advice_str, err := json.Marshal(his)
+					if err == nil {
+						redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+					}
+				} else {
 					redis.Set(key, "null", time.Second*60*60*18)
 				}
 				return his, nil
-			} else {
-				return his, err
 			}
-		} else {
-			if len(his) > 0 {
-				//缓存数据
-				his_doctor_advice_str, err := json.Marshal(his)
-				if err == nil {
-					redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			json.Unmarshal([]byte(his_doctor_advice_str), &his)
+			return his, nil
+		}
+	}
+
+	if orgid == 10721 {
+		if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? and execution_frequency!='上机前' and delivery_way!='口服' ", patientid, orgid, recorddate).Order("created_time asc").Find(&his).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(his) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return his, nil
+				} else {
+					return his, err
 				}
 			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
+				if len(his) > 0 {
+					//缓存数据
+					his_doctor_advice_str, err := json.Marshal(his)
+					if err == nil {
+						redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
+					}
+				} else {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return his, nil
 			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			json.Unmarshal([]byte(his_doctor_advice_str), &his)
 			return his, nil
 		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_doctor_advice_str), &his)
-		return his, nil
 	}
+
+	return his, nil
 }
 
 func GetLastDialysisPrescriptionByPatientId(orgid int64, patientid int64, recorddate int64) (*models.DialysisPrescription, error) {

service/patient_service.go

@@ -14,7 +14,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -73,6 +73,9 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 	if nurse > 0 {
 		db = db.Where("p.head_nurse_id = ?", nurse)
 	}
+	if patient_type > 0 {
+		db = db.Where("p.patient_type = ?", patient_type)
+	}
 
 	offset := (page - 1) * limit
 	if lapseto == 2 || lapseto == 3 {
@@ -472,39 +475,79 @@ func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHis
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":his_advices_list_all"
 	his_advices_all, _ := redis.Get(key).Result()
-
-	if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(hisAdvices) <= 0 {
+	redis.Set(key, "", time.Second)
+	if orgID != 10721 {
+		if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(hisAdvices) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return nil, nil
+				} else {
+					return nil, err
+				}
+			} else {
+				if len(hisAdvices) > 0 {
+					//缓存数据
+					his_advices_all, err := json.Marshal(&hisAdvices)
+					if err == nil {
+						redis.Set(key, his_advices_all, time.Second*60*60*18)
+					}
+				} else {
 					redis.Set(key, "null", time.Second*60*60*18)
 				}
+				return hisAdvices, nil
+			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			if his_advices_all == "null" {
 				return nil, nil
 			} else {
-				return nil, err
+				json.Unmarshal([]byte(his_advices_all), &hisAdvices)
+				return hisAdvices, nil
 			}
-		} else {
-			if len(hisAdvices) > 0 {
-				//缓存数据
-				his_advices_all, err := json.Marshal(&hisAdvices)
-				if err == nil {
-					redis.Set(key, his_advices_all, time.Second*60*60*18)
+
+		}
+	}
+
+	if orgID == 10721 {
+
+		if len(his_advices_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+			err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ? and execution_frequency !='上机前' and delivery_way!='口服' ", orgID, scheduleDate).Find(&hisAdvices).Error
+			if err != nil {
+				if err == gorm.ErrRecordNotFound {
+					if len(hisAdvices) <= 0 {
+						redis.Set(key, "null", time.Second*60*60*18)
+					}
+					return nil, nil
+				} else {
+					return nil, err
 				}
 			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
+				if len(hisAdvices) > 0 {
+					//缓存数据
+					his_advices_all, err := json.Marshal(&hisAdvices)
+					if err == nil {
+						redis.Set(key, his_advices_all, time.Second*60*60*18)
+					}
+				} else {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return hisAdvices, nil
+			}
+		} else { //缓存数据了数据，将redis缓存的json字符串转为map
+			if his_advices_all == "null" {
+				return nil, nil
+			} else {
+				json.Unmarshal([]byte(his_advices_all), &hisAdvices)
+				return hisAdvices, nil
 			}
-			return hisAdvices, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if his_advices_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(his_advices_all), &hisAdvices)
-			return hisAdvices, nil
-		}
 
+		}
 	}
+
+	return hisAdvices, nil
 }
 
 func GetPatientListByUpdateTime(orgID int64, syncTime int64) (patients []*models.PatientListForFaceList, total int64, err error) {

service/sign_service.go

@@ -2110,16 +2110,31 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 	return err
 }
 
-func GetAllDialysisOrderTwo(patient_id int64) (list []*models.XtDialysisOrder, err error) {
+func GetAllDialysisOrderTwo(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=1696089600", patient_id).Find(&list).Error
+	err = XTReadDB().Where("user_org_id = ? and status =1 and dialysis_date=1730736000", user_org_id).Find(&list).Error
 
 	return list, err
 }
 
-func GetAllDialysisOrder(patient_id int64) (list []*models.XtDialysisOrder, err error) {
+func GetAllDialysisPrescription(patient_id int64) (list []*models.XtDialysisPrescription, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", patient_id).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status=1", patient_id).Find(&list).Error
+
+	return list, err
+}
+func UpdateSchedulePrescrition(patient_id int64, record_date int64, user_org_id int64, mode_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and status=1 and user_org_id =?", patient_id, record_date, user_org_id).Updates(map[string]interface{}{"mode_id": mode_id}).Error
+
+	return schedule, err
+}
+
+func GetAllDialysisOrder(patient_id int64, start_time int64, end_time int64) (list []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and status =1 and dialysis_date>=? and dialysis_date<=?", patient_id, start_time, end_time).Find(&list).Error
 
 	return list, err
 }
@@ -2127,14 +2142,14 @@ func GetAllDialysisOrder(patient_id int64) (list []*models.XtDialysisOrder, err
 func GetLastScheduleByUserOrg(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) (models.Schedule, error) {
 
 	schedule := models.Schedule{}
-	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and status=0", patient_id, schedule_date).First(&schedule).Error
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ?", patient_id, schedule_date).First(&schedule).Error
 
 	return schedule, err
 }
 
-func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64) error {
+func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64, mode_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1, "mode_id": mode_id}).Error
 	return err
 }