耗材参数

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -627,7 +627,7 @@ func (this *NewDialysisApiController) GetDoctorAdvices() {
 	fmt.Println("病人ID", newPatientInfo.BloodId)
 	advice, _, err := service.GetNewDoctorAdvice(newPatientInfo.BloodId, doctor_type, startime, endtime, limit, page, orgid)
 	one, total, err := service.GetNewDoctorAdviceOne(newPatientInfo.BloodId, doctor_type, startime, endtime, limit, page, orgid)
-	fmt.Println("err------------------------", err)
+	fmt.Println("err", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

controllers/stock_in_api_controller.go

@@ -1851,11 +1851,13 @@ func (this *StockManagerApiController) GetAllSalesReturnConfig() {
 }
 
 func (this *StockManagerApiController) GetDetailInfo() {
+
 	page, _ := this.GetInt64("page", 0)
 	limit, _ := this.GetInt64("limit", 0)
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	types, _ := this.GetInt64("type", 0)
+
 	keywords := this.GetString("keywords")
 	manufacturer, _ := this.GetInt64("manufacturer", 0)
 	order_type, _ := this.GetInt64("order_type", 0)

models/dialysis.go

@@ -304,52 +304,57 @@ func (PredialysisEvaluationList) TableName() string {
 
 //更改的地方
 type DoctorAdvices struct {
-	ID                    int64           `gorm:"column:id" json:"id" form:"id"`
-	GroupNo               int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	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"`
-	AdviceType            int64           `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64           `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string          `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string          `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64           `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string          `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	DrugSpec              float64         `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string          `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	PrescribingNumber     float64         `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string          `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string          `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string          `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64           `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	Status                int64           `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime           int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	AdviceAffirm          string          `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string          `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64           `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string          `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64           `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64           `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64           `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	ExecutionTime         int64           `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff        int64           `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState        int64           `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	Checker               int64           `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64           `gorm:"column:record_date" json:"record_date"`
-	DialysisOrderId       int64           `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	CheckTime             int64           `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64           `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	AdviceId              int64           `gorm:"-"`
-	RemindType            int64           `gorm:"column:remind_type" json:"remind_type"`
-	FrequencyType         int64           `gorm:"column:frequency_type" json:"frequency_type"`
-	DayCount              int64           `gorm:"column:day_count" json:"day_count"`
-	WeekDay               string          `gorm:"column:week_day" json:"week_day"`
-	ChildDoctorAdvice     []*DoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
-	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
-	UserName              string          `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Name                  string          `gorm:"column:name" json:"name" form:"name"`
+	ID                         int64           `gorm:"column:id" json:"id" form:"id"`
+	GroupNo                    int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	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"`
+	AdviceType                 int64           `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate                 int64           `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime                  int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName                 string          `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc                 string          `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate               int64           `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose                 float64         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit             string          `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	DrugSpec                   float64         `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit               string          `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescribingNumber          float64         `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit      string          `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay                string          `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency         string          `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor               int64           `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                     int64           `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm               string          `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                     string          `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime                   int64           `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason                 string          `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor                 int64           `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState                  int64           `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId                   int64           `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime              int64           `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff             int64           `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState             int64           `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker                    int64           `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate                 int64           `gorm:"column:record_date" json:"record_date"`
+	DialysisOrderId            int64           `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	CheckTime                  int64           `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState                 int64           `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	AdviceId                   int64           `gorm:"-"`
+	RemindType                 int64           `gorm:"column:remind_type" json:"remind_type"`
+	FrequencyType              int64           `gorm:"column:frequency_type" json:"frequency_type"`
+	DayCount                   int64           `gorm:"column:day_count" json:"day_count"`
+	WeekDay                    string          `gorm:"column:week_day" json:"week_day"`
+	ChildDoctorAdvice          []*DoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	TemplateId                 string          `gorm:"column:template_id" json:"template_id"`
+	UserName                   string          `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Name                       string          `gorm:"column:name" json:"name" form:"name"`
+	DialyzerPerfusionApparatus string          `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	Anticoagulant              int64           `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji        float64         `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi        float64         `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64         `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
 }
 
 type DoctorAdvice struct {

models/stock_models.go

@@ -193,6 +193,7 @@ type SalesReturnInfo struct {
 	SalesReturn   SalesReturn `ForeignKey:SalesReturnId json:"SalesReturn"`
 	Dealer        int64       `gorm:"column:dealer" json:"dealer"`
 	Manufacturer  int64       `gorm:"column:manufacturer" json:"manufacturer"`
+	GoodInfo      GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (SalesReturnInfo) TableName() string {
@@ -218,6 +219,7 @@ type CancelStockInfo struct {
 	CancelStock   CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
 	Dealer        int64       `gorm:"column:dealer" json:"dealer"`
 	Manufacturer  int64       `gorm:"column:manufacturer" json:"manufacturer"`
+	GoodInfo      GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (CancelStockInfo) TableName() string {

service/patient_service.go

@@ -775,6 +775,9 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 	if advice_type == 3 && advice_type > 0 {
 		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
 	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
+	}
 	if stop == 1 {
 		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
 	} else if stop == 2 {
@@ -811,8 +814,11 @@ func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, sto
 	if advice_type == 1 {
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
-	if advice_type == 3 {
-		db = db.Where("x.advice_type <> 1")
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
 	}
 
 	if stop == 1 {

service/patientmanage_service.go

@@ -503,7 +503,8 @@ func GetLastNewSlowPatient(phone string, orgid int64) (*models.XtPatientsNew, er
 func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvices, total int64, err error) {
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
-	fmt.Print("table", table)
+	tabletwo := readDb.Table("xt_dialysis_prescription as s").Where("s.status = 1")
+	fmt.Print("table", table, tabletwo)
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -514,7 +515,10 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
 	if advice_type == 3 {
-		db = db.Where("x.advice_type <> 1")
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if advice_type == 4 {
+		db = db.Where("x.advice_type = ?", advice_type)
 	}
 	if start > 0 {
 		db = db.Where("x.start_time>=?", start)
@@ -523,7 +527,7 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 		db = db.Where("x.start_time<=?", end)
 	}
 	//offset := (page - 1) * limit
-	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
+	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
 	fmt.Print("err", err)
 	return
 
@@ -533,6 +537,8 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
+	tabletwo := readDb.Table("xt_dialysis_prescription as s").Where("s.status = 1")
+	fmt.Print("table", table, tabletwo)
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -543,7 +549,10 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
 	if advice_type == 3 {
-		db = db.Where("x.advice_type <> 1")
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if advice_type == 4 {
+		db = db.Where("x.advice_type = ?", advice_type)
 	}
 
 	if start > 0 {
@@ -553,7 +562,7 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("x.start_time<=?", end)
 	}
 	offset := (page - 1) * limit
-	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&doctoradvice).Error
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Scan(&doctoradvice).Error
 	fmt.Print("错误是什么", err)
 	return
 }

service/stock_service.go

@@ -1719,6 +1719,7 @@ type StockDetailModel struct {
 }
 
 func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64) (list []*models.WarehousingInfo, total int64, err error) {
+
 	db := readDb.Model(&models.WarehousingInfo{})
 	db = db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId)
 	if len(keywords) > 0 {
@@ -1744,6 +1745,7 @@ func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64
 	}
 
 	db = db.Preload("Warehousing", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_info.ctime desc").Find(&list).Error
@@ -1812,6 +1814,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 	}
 
 	db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out_info.ctime desc").Find(&list).Error
@@ -1878,6 +1881,7 @@ func FindSalesReturnDetailList(orgId int64, page int64, limit int64, startTime i
 	}
 
 	db = db.Preload("SalesReturn", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	offset := (page - 1) * limit
 	db = db.Count(&total)
 
@@ -1909,6 +1913,7 @@ func FindCancelDetailList(orgId int64, page int64, limit int64, startTime int64,
 	}
 
 	db = db.Preload("CancelStock", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_cancel_stock_info.ctime desc").Find(&list).Error