医保对接

controllers/dialysis_api_controller.go

@@ -1547,9 +1547,11 @@ func (c *DialysisApiController) GetDeviceList() {
 func (c *DialysisApiController) GetAllDeviceZone() {
 	adminUserInfo := c.GetAdminUserInfo()
 	err, zone := service.GetAllDeviceZone(adminUserInfo.CurrentOrgId)
+	dics, _, err := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"zone": zone,
+			"dics": dics,
 		})
 	}
 

controllers/doctors_api_controller.go

@@ -33,7 +33,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	schedualDate := c.GetString("date")
 	adviceType, _ := c.GetInt("advice_type")
 	patientType, _ := c.GetInt("patient_type")
-
+	delivery_way := c.GetString("delivery_way")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -52,8 +52,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id)
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix())
+	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way)
+	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -19,7 +19,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	schedualDate := this.GetString("date")
 	adviceType, _ := this.GetInt("advice_type")
 	patientType, _ := this.GetInt("patient_type")
-
+	delivery_way := this.GetString("delivery_way")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -38,10 +38,10 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id)
+	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 	//获取his医嘱数据
 	fmt.Println("date.un222222", date.Unix())
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix())
+	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 	if err != nil {

models/good_models.go

@@ -1,7 +1,5 @@
 package models
 
-import "XT/models"
-
 type GoodsType struct {
 	ID             int64  `gorm:"column:id" json:"id"`
 	TypeCode       string `gorm:"column:type_code" json:"type_code"`
@@ -75,21 +73,21 @@ func (GoodInfo) TableName() string {
 }
 
 type GoodsTypeOne struct {
-	ID             int64              `gorm:"column:id" json:"id"`
-	TypeCode       string             `gorm:"column:type_code" json:"type_code"`
-	TypeName       string             `gorm:"column:type_name" json:"type_name"`
-	Remark         string             `gorm:"column:remark" json:"remark"`
-	Ctime          int64              `gorm:"column:ctime" json:"ctime"`
-	Mtime          int64              `gorm:"column:mtime" json:"mtime"`
-	Creater        int64              `gorm:"column:creater" json:"creater"`
-	Modifier       int64              `gorm:"column:modifier" json:"modifier"`
-	OrgId          int64              `gorm:"column:org_id" json:"org_id"`
-	Status         int64              `gorm:"column:status" json:"status"`
-	Type           int64              `gorm:"column:type" json:"type"`
-	Number         int64              `gorm:"column:number" json:"number"`
-	OutStock       int64              `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
-	StockAttribute int64              `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
-	GoodInfo       []*models.GoodInfo `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
+	ID             int64       `gorm:"column:id" json:"id"`
+	TypeCode       string      `gorm:"column:type_code" json:"type_code"`
+	TypeName       string      `gorm:"column:type_name" json:"type_name"`
+	Remark         string      `gorm:"column:remark" json:"remark"`
+	Ctime          int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime          int64       `gorm:"column:mtime" json:"mtime"`
+	Creater        int64       `gorm:"column:creater" json:"creater"`
+	Modifier       int64       `gorm:"column:modifier" json:"modifier"`
+	OrgId          int64       `gorm:"column:org_id" json:"org_id"`
+	Status         int64       `gorm:"column:status" json:"status"`
+	Type           int64       `gorm:"column:type" json:"type"`
+	Number         int64       `gorm:"column:number" json:"number"`
+	OutStock       int64       `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
+	StockAttribute int64       `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
+	GoodInfo       []*GoodInfo `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
 }
 
 func (GoodsTypeOne) TableName() string {

models/service/mobile_dialysis_service.go

@@ -30,13 +30,13 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2", orgID).
+		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
+		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
 
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
@@ -115,13 +115,13 @@ type MDialysisScheduleVM struct {
 
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
-	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
-	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
-	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_after_dislysis"`
+	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
 
-	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
-	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
+	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -290,6 +290,8 @@ type VMDoctorAdvice struct {
 	Status         int64 `gorm:"column:status" json:"status" form:"status"`
 	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
 	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
 }
 
 func (VMDoctorAdvice) TableName() string {
@@ -489,7 +491,7 @@ func MobileGetDoctorAdvices(orgID int64, patientID int64, recordDate int64) ([]*
 	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)", patientID, orgID, recordDate).
-		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,IF(parent_id>0, parent_id, id) as advice_order,groupno").
+		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,drug_name_id,IF(parent_id>0, parent_id, id) as advice_order,groupno").
 		Order("start_time asc, groupno desc, advice_order desc, id").
 		Scan(&records).Error
 
@@ -506,7 +508,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and advice_type = 2", patientID, orgID, recordDate).
-		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
 		Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Scan(&records).Error
 
@@ -637,6 +639,19 @@ func MobileGetDialysisPrescribe(orgID int64, patientID int64, recordDate int64)
 	return &record, nil
 }
 
+func MobileGetDialysisSchedual(orgID int64, patientID int64, scheduleDate int64) (*models.XtSchedule, error) {
+	var schedule models.XtSchedule
+	err := readDb.Model(&models.XtSchedule{}).Where("patient_id = ? and user_org_id = ? and status = 1 and schedule_date = ?", patientID, orgID, scheduleDate).First(&schedule).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &schedule, nil
+}
+
 // 透析方案
 func MobileGetDialysisSolution(orgID int64, patientID int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution
@@ -692,19 +707,20 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID              int64               `gorm:"column:id" json:"id"`
-	UserOrgId       int64               `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId     int64               `gorm:"column:partition_id" json:"partition_id"`
-	BedId           int64               `gorm:"column:bed_id" json:"bed_id"`
-	PatientId       int64               `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate    int64               `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType    int64               `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId          int64               `gorm:"column:mode_id" json:"mode_id"`
-	Status          int64               `gorm:"column:status" json:"status"`
-	DialysisOrder   *MDialysisOrderVM   `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	SchedualPatient *MSchedualPatientVM `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber    *MDeviceNumberVM    `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices   []*MDoctorAdviceVM  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	ID              int64                            `gorm:"column:id" json:"id"`
+	UserOrgId       int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder   *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber    *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices   []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription    *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 }
 
 func (MScheduleDoctorAdviceVM) TableName() string {
@@ -761,7 +777,7 @@ func (MDoctorAdviceVM) TableName() string {
 	return "xt_doctor_advice"
 }
 
-func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64) ([]*MScheduleDoctorAdviceVM, error) {
+func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	fmt.Println("advicetype", adviceType)
@@ -810,13 +826,26 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
-	} else if adviceType == 2 {
+	} else if adviceType == 2 && len(deliverWay) > 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) <= 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?  "
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? "
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
@@ -833,6 +862,7 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 		}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("DoctorAdvices", adviceCondition...).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
@@ -1056,7 +1086,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -1173,6 +1203,19 @@ func GetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDate int6
 	return &record, nil
 }
 
+func GetLastTimeOrder(orgID int64, patientID int64, maxDate int64) (*models.DialysisOrder, error) {
+	var record models.DialysisOrder
+	err := readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? and user_org_id = ? and status = 1 and dialysis_date < ?", patientID, orgID, maxDate).Order("dialysis_date desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func GetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64) (*models.MonitoringRecord, error) {
 	var record models.MonitoringRecord
 	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
@@ -1301,7 +1344,7 @@ func GetDialysisCountByPatientId(startime int64, endtime int64, patientid int64,
 }
 
 func FindConsumablesByDate(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error) {
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 	AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 AND count<>0", orgID, patient_id, recordDate).Find(&consumables).Error
 	return
 }
 
@@ -1392,7 +1435,7 @@ type MDialysisGoodsVM struct {
 
 	DeviceNumber              *MDeviceNumberVM         `gorm:"ForeignKey:BedId" json:"device_number"`
 	SchedualPatient           *MSchedualPatientVMList  `gorm:"ForeignKey:PatientId" json:"patient"`
-	AutomaticReduceDetail     []*AutomaticReduceDetail `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordTime" json:"good_user"`
+	AutomaticReduceDetail     []*AutomaticReduceDetail `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"good_user"`
 	LastAutomaticReduceDetail []*AutomaticReduceDetail `gorm:"-" json:"last_good_user"`
 	DialysisBeforePrepare     []*DialysisBeforePrepare `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordDate" json:"good_user_detail"`
 	LastDialysisBeforePrepare []*DialysisBeforePrepare `gorm:"-" json:"last_good_user_detail"`
@@ -1433,7 +1476,7 @@ type DialysisGoodsDetailDate struct {
 	RecordTime int64
 }
 
-func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string) ([]*MDialysisGoodsVM, error, int64) {
+func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string, end_time int64) ([]*MDialysisGoodsVM, error, int64) {
 	var vms []*MDialysisGoodsVM
 	var total int64
 
@@ -1446,7 +1489,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time = ? AND count > 0 ", orgID, scheduleDate)
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time)
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -1470,9 +1513,12 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 }
 
 func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goodUser []*AutomaticReduceDetail, err error) {
+
 	var Id []*DialysisGoodsDetailDate
+
 	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
+
 		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
 	}
 	return
@@ -1492,14 +1538,14 @@ func MobileGetGoodsStatistics(orgID int64, start_time int64, end_time int64) (li
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgID)
 	db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgID).Group("xt_good_information.id")
 	db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgID).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.org_id = ? ", start_time, end_time, orgID)
+		return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.sys_record_time >=  ? AND  xt_warehouse_out_info.sys_record_time <= ?", orgID, start_time, end_time)
 	})
 	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgID)
 	err = db.Order("ctime desc").Find(&list).Error
 	return
 }
 
-func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string) ([]*MDialysisGoodsVM, error, int64) {
+func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string, end_time int64) ([]*MDialysisGoodsVM, error, int64) {
 	var vms []*MDialysisGoodsVM
 	var total int64
 
@@ -1512,7 +1558,7 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?   ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ? AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time = ?  AND count > 0", orgID, scheduleDate)
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time >= ? AND record_time <=?  AND count > 0", orgID, scheduleDate, end_time)
 		}).Where("xt_schedule.status = 1 AND xt_schedule.user_org_id = ?", orgID)
 
 	if scheduleDate != 0 {
@@ -1543,3 +1589,84 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 
 	return vms, err, total
 }
+
+func GetLastDialysisGoodsTwo(patient_id int64, orgID int64, record_time int64) (goodUser []*AutomaticReduceDetail, err error) {
+
+	var Id []*DialysisGoodsDetailDate
+
+	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
+	if len(Id) > 0 {
+
+		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
+	}
+	return
+}
+
+func GetLastDialysisBeforePrepareTwo(patient_id int64, orgID int64, record_time int64) (goodUser []*DialysisBeforePrepare, err error) {
+	var Id []*DialysisGoodsDate
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ? AND count > 0", patient_id, orgID, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+	if len(Id) > 0 {
+		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordDate).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Find(&goodUser).Error
+	}
+	return
+}
+
+func GetAssessmentBefor(orgid int64, patientid int64, recorddate int64) (*models.PredialysisEvaluation, error) {
+
+	evaluation := models.PredialysisEvaluation{}
+
+	err := XTReadDB().Model(&evaluation).Where("user_org_id = ? and patient_id = ? and assessment_date = ? and status = 1", orgid, patientid, recorddate).Find(&evaluation).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &evaluation, nil
+}
+
+func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
+	return
+
+}
+
+func GetLastDialysisPrescriptionByPatientId(orgid int64, patientid int64, recorddate int64) (*models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+	err := readDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patientid, recorddate).Find(&prescription).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &prescription, nil
+}
+
+type HisMScheduleDoctorAdviceVM struct {
+	ID                  int64                            `gorm:"column:id" json:"id"`
+	UserOrgId           int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId         int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId               int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId           int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate        int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType        int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId              int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status              int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder       *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient     *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber        *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription        *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisDoctorAdviceInfo []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+}
+
+func (HisMScheduleDoctorAdviceVM) TableName() string {
+	return "xt_schedule"
+}
+
+func GetHisDoctorConfig(orgid int64) (models.XtHisConfig, error) {
+	config := models.XtHisConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status =1", orgid).Find(&config).Error
+	return config, err
+}

service/gdyb_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	//"/models"
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"

service/his_service.go

@@ -581,10 +581,9 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 }
 
 func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
-	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
-	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 4, "mtime": time.Now().Unix()}).Error
-	err = writeDb.Model(&models.HisAdditionalCharge{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 
 	return
 

service/mobile_dialysis_service.go

@@ -777,7 +777,7 @@ func (MDoctorAdviceVM) TableName() string {
 	return "xt_doctor_advice"
 }
 
-func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64) ([]*MScheduleDoctorAdviceVM, error) {
+func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	fmt.Println("advicetype", adviceType)
@@ -826,13 +826,26 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 		}
 
-	} else if adviceType == 2 {
+	} else if adviceType == 2 && len(deliverWay) > 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?  "
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) <= 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? "
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
@@ -860,26 +873,43 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 	return vms, err
 }
 
-func GetHisDoctorAdvices(orgID int64, scheduleDate int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
-
-	db := readDb.
-		Table("xt_schedule").
-		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-		}).
-		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
-		Where("status = 1 AND user_org_id = ?", orgID)
-	if scheduleDate != 0 {
-		db = db.Where("schedule_date = ?", scheduleDate)
+	if len(deliverWay) > 0 {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	} else {
+		db := readDb.
+			Table("xt_schedule").
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
 	}
 
-	err := db.Find(&vms).Error
 	return vms, err
 }