库存调拨修改

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -840,6 +840,30 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.Modifier = modifier
 
 		err := service.AddSigleDoubleCheck(&doubleCheck)
+
+		//针对长沙南雅
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			if len(doctorList) > 0 && modifier > 0 {
+				for _, advice := range doctorList {
+					service.UpdateDoctorAdviceList(advice.ID, modifier)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
 

models/schedule_models.go

@@ -631,3 +631,19 @@ type ScheduleNewPatients struct {
 func (ScheduleNewPatients) TableName() string {
 	return "xt_schedule"
 }
+
+type MySchedule struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	Count        int64
+}
+
+func (MySchedule) TableName() string {
+	return "xt_schedule"
+}

service/dialysis_service.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, partitionType int64, keywords string, page int64, limit int64) (schedule []*models.DialysisSchedule, err error) {
 	var total int64
 	//if len(keywords) > 0 {
@@ -62,7 +62,7 @@ func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, p
 	return schedule, errors
 }
 
-//用户基本信息
+// 用户基本信息
 func FindPatientInfoById(orgID int64, id int64, time int64) (patient models.SchedualPatient2, err error) {
 	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).Where("patient_id = ? AND user_org_id = ? AND schedule_date = ? ", id, orgID, time)
@@ -70,31 +70,31 @@ func FindPatientInfoById(orgID int64, id int64, time int64) (patient models.Sche
 	return
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescription, err error) {
 	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id=? and status=1 and  record_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析方案中的透析处方
+// 透析方案中的透析处方
 func FindDialysisSolution(orgID int64, patientsId int64) (patient models.DialysisSolution, err error) {
 	err = readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id=? and status=1", patientsId, orgID).Last(&patient).Error
 	return
 }
 
-//透析方案中的透析模式
+// 透析方案中的透析模式
 func FindTreatmentModeById(modeId int64) (mode models.TreatmentMode, err error) {
 	err = readDb.Model(&models.TreatmentMode{}).Where("id = ? AND status=1", modeId).First(&mode).Error
 	return
 }
 
-//接诊评估
+// 接诊评估
 func FindReceiverTreatmentAccessRecordById(orgID int64, patientsId int64, recordDate int64) (receiveTreatmentAsses models.ReceiveTreatmentAsses, err error) {
 	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ?", patientsId, orgID, recordDate).First(&receiveTreatmentAsses).Error
 	return
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationById(orgID int64, patientsId int64, recordDate int64) (patient models.PredialysisEvaluation, err error) {
 	err = readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ?", patientsId, orgID, recordDate).First(&patient).Error
 	return
@@ -106,7 +106,7 @@ func FindPredialysisName(id int64, orgid int64) (models.Dataconfig, error) {
 	return dataconfig, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? AND  advice_type = 2", patientsId, orgID, recordDate).Find(&patient).Error
 	return
@@ -128,7 +128,7 @@ func GetTotalDialysisCout(orgid int64, patientid int64) (order []*models.Dialysi
 	return order, total, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientsId, orgID, recordDate).
@@ -137,13 +137,13 @@ func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64)
 	return
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckById(orgID int64, patientsId int64, recordDate int64) (patient models.DoubleCheck, err error) {
 	err = readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id=? and status=1 and check_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析监测
+// 透析监测
 func FindAllMonitorRecord(orgID int64, patientsId int64, recordDate int64) (record []*models.MonitoringRecord, err error) {
 	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id=? and status=1 and monitoring_date = ?", patientsId, orgID, recordDate).Order("operate_time ASC").Find(&record).Error
 	return
@@ -154,37 +154,37 @@ func FindAllMonitor(orgID int64, patientsId int64, recordDate int64) (record []*
 	return
 }
 
-//透后评估
+// 透后评估
 func FindAssessmentAfterDislysisById(orgID int64, patientsId int64, recordDate int64) (patient models.AssessmentAfterDislysis, err error) {
 	err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date =?", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//治疗小结
+// 治疗小结
 func FindTreatmentSummaryById(orgID int64, patientsId int64, recordDate int64) (patient models.TreatmentSummary, err error) {
 	err = readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//机构叫号配置
+// 机构叫号配置
 func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err error) {
 	err = readDb.Model(&models.QueueCallConfig{}).Where("org_id=? ", orgID).First(&queueConfig).Error
 	return
 }
 
-//修改机构叫号配置
+// 修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
 	return err
 }
 
-//所有设备信息
+// 所有设备信息
 func FindAllDeviceInfo(orgID int64) (device []*models.Device, err error) {
 	err = readDb.Model(&models.Device{}).Where("org_id=? and status=1 and device_type = 1", orgID).Find(&device).Error
 	return device, err
 }
 
-//所有设备区域
+// 所有设备区域
 func GetAllDeviceZone(orgId int64) (error, []*models.DeviceZone) {
 	var zone []*models.DeviceZone
 	err := readDb.Model(&zone).Where("org_id = ? AND status = 1", orgId).Find(&zone).Error
@@ -192,7 +192,7 @@ func GetAllDeviceZone(orgId int64) (error, []*models.DeviceZone) {
 	return err, zone
 }
 
-//获取所有子药物
+// 获取所有子药物
 func FindAllSubDoctorAdvice(id int64, parentId int64) (error, []models.DoctorAdvice) {
 	var subAdvies []models.DoctorAdvice
 	err := readDb.Model(&subAdvies).Where("patient_id = ? AND parent_id = ?", id, parentId).Find(&subAdvies).Error
@@ -272,7 +272,7 @@ func AddSigleDoubleCheck(check *models.DoubleCheck) (err error) {
 	return errors
 }
 
-//修改透析处方
+// 修改透析处方
 func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescription) error {
 	tx := writeDb.Begin()
 	err := writeDb.Save(&dialysisPrescription).Error
@@ -283,25 +283,25 @@ func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescriptio
 	return err
 }
 
-//修改接诊评估
+// 修改接诊评估
 func UpadateReceiveTreatmentAsses(receiveTreatmentAsses *models.ReceiveTreatmentAsses) error {
 	err := writeDb.Save(receiveTreatmentAsses).Error
 	return err
 }
 
-//修改透前评估
+// 修改透前评估
 func UpadatePredialysisEvaluation(predialysisEvaluation *models.PredialysisEvaluation) error {
 	err := writeDb.Save(&predialysisEvaluation).Error
 	return err
 }
 
-//修改双人核对
+// 修改双人核对
 func UpdateDoubleCheck(check *models.DoubleCheck) error {
 	err := writeDb.Save(&check).Error
 	return err
 }
 
-//修改透后评估
+// 修改透后评估
 func UpdateAssessmentAfterDislysisRecord(assessmentAfterDislysis *models.AssessmentAfterDislysis) error {
 	err := writeDb.Save(&assessmentAfterDislysis).Error
 	return err
@@ -330,21 +330,21 @@ func UpdatePredialysisEvaluationFour(predialysisevaluation *models.PredialysisEv
 	return err
 }
 
-//修改
+// 修改
 func UpdateSummeRecord(treatmentSummary *models.TreatmentSummary) error {
 	err := writeDb.Save(&treatmentSummary).Error
 	return err
 }
 
-// func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
-// 	tx := writeDb.Begin()
-// 	err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
-// 	if err != nil {
-// 		tx.Rollback()
-// 	}
-// 	tx.Commit()
-// 	return err
-// }
+//	func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
+//		tx := writeDb.Begin()
+//		err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
+//		if err != nil {
+//			tx.Rollback()
+//		}
+//		tx.Commit()
+//		return err
+//	}
 func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
@@ -412,7 +412,7 @@ func UpdateSolution(solution *models.DialysisSolution) {
 
 }
 
-//创建长期处方
+// 创建长期处方
 func CreateSolution(solution *models.DialysisSolution) {
 	writeDb.Create(&solution)
 }
@@ -442,7 +442,7 @@ func SavePrescriptionAndCreateSolution(solution *models.DialysisSolution, prescr
 	return
 }
 
-//透析处方
+// 透析处方
 func FindDialysisPrescriptionByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DialysisPrescription) {
 	dialysisPrescription := models.DialysisPrescription{}
 	err := readDb.Model(&dialysisPrescription).Where("patient_id = ? AND  record_date = ? AND status = 1 AND user_org_id = ? ", id, recordDate, orgId).Find(&dialysisPrescription).Error
@@ -455,14 +455,14 @@ func FindReceiveTreatmentAssesByReordDate(id int64, recordDate int64, orgId int6
 	return err, &receiveTreatmentAsses
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationByReordDate(id int64, recordDate int64, orgId int64) (error, *models.PredialysisEvaluation) {
 	dialysisEvaluation := models.PredialysisEvaluation{}
 	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? AND  assessment_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&dialysisEvaluation).Error
 	return err, &dialysisEvaluation
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DoubleCheck) {
 	check := models.DoubleCheck{}
 	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? AND  check_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&check).Error
@@ -571,7 +571,7 @@ func UpdateSolutionByPatientId(id int64) error {
 
 }
 
-//更新透析处方记录ID
+// 更新透析处方记录ID
 func UpDateRecordIdToDialysisPrescription(patientId int64, orgId int64, recordTime int64, recordId int64) error {
 	errors := writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patientId, recordTime).Updates(map[string]interface{}{"record_id": recordId}).Error
 	return errors
@@ -612,7 +612,7 @@ func UpDateRecordIdToDoctorAdvice(patientId int64, orgId int64, recordTime int64
 	return errors
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeWidyDevideById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescriptionAddtional, err error) {
 	err = readDb.Preload("Device", "status = 1 AND org_id = ?", orgID).
 		Model(&models.DialysisPrescriptionAddtional{}).
@@ -687,7 +687,7 @@ func FindDoctorName(adminid int64, appid int64, orgid int64) (models.App_Roles,
 	return role, err
 }
 
-/////////////// 新 18-10-22
+// ///////////// 新 18-10-22
 func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisScheduleVM, error) {
 	var vms []*MDialysisScheduleVM
 	db := readDb.
@@ -2051,3 +2051,16 @@ func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
 	err := XTReadDB().Where("filed_name = 'dialyzer_perfusion_apparatus' and org_id = ? and module =1 and is_show = 1", orgid).First(&config).Error
 	return config, err
 }
+
+func GetDoctorAdviceCheckList(patient_id int64, advice_date int64, user_org_id int64) (doctor []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and check_state= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
+	return doctor, err
+}
+
+func UpdateDoctorAdviceList(id int64, checker int64) error {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": time.Now().Unix()}).Error
+	return err
+}

service/schedule_service.go

@@ -129,6 +129,31 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.MySchedule, err error) {
+
+	db := readDb.Table("xt_schedule as s").Where("status= 1 and (mode_id = 2 or mode_id= 3)")
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	if orgID > 0 {
+		db = db.Where("s.user_org_id = ?", orgID)
+	}
+	if start > 0 {
+		db = db.Where("s.schedule_date>=?", start)
+	}
+	if end > 0 {
+		db = db.Where("s.schedule_date<=?", end)
+	}
+
+	err = db.Select("Count(id) as count,schedule_date,mode_id,user_org_id,schedule_week,schedule_type").Group("schedule_date,schedule_type,mode_id").Find(&schedules).Error
+
+	return schedules, err
+
+}
+
 func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
 
 	db := readDb.Table("xt_schedule as s")