Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

models/his_models.go

@@ -2989,3 +2989,105 @@ type HisOrder10726Summary struct {
 	AcctMulaidPay       float64 `gorm:"column:acct_mulaid_pay"`
 	PsnCashPay          float64 `gorm:"column:psn_cash_pay"`
 }
+
+type NewHisDoctorAdviceInfo 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"`
+	HisPatientId          int64              `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_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"`
+	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" form:"record_date"`
+	DialysisOrderId       int64              `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"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"`
+	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"`
+	Groupno               int64              `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64              `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64              `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64              `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string             `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string             `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64            `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64              `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string             `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string             `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64              `gorm:"column:day" json:"day" form:"day"`
+	Drug                  Drug               `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Diagnosis             int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
+	HospApprFlag          int64              `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64              `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	IsMedicine            int64              `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSettle              int64              `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
+	IsSelfDrug            int64              `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	DrugWayCount          string             `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	YbSyncStatus          int64              `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
+	DrugCode              string             `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsUpload              int64              `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	ZeroFlag              int64              `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
+	NewHisPrescription    NewHisPrescription `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"pre"`
+}
+
+func (NewHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type NewHisPrescription 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"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	Type               int64  `gorm:"column:type" json:"type" form:"type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime            int64  `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Total              string `gorm:"-" json:"total" form:"total"`
+	PType              int64  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType            string `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	IsMedicine         int64  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	Diagnose           string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+}
+
+func (NewHisPrescription) TableName() string {
+	return "his_prescription"
+}

service/export_data_service.go

@@ -343,7 +343,7 @@ func GetHisOrderBy10697SummaryTwo(startTime, endTime, ins string, st_stamp, end_
             med_chrgitm_type, 
             SUM(det_item_fee_sumamt) AS det_item_fee_sumamt`).
 		Where("user_org_id = ? AND STATUS = ? AND (upload_date) >= ? AND (upload_date) <= ? AND med_chrgitm_type IN (?)",
-			10721, 1,
+			10697, 1,
 			st_stamp,
 			end_stamp,
 			medChargeTypes).
@@ -383,7 +383,7 @@ func GetHisOrderBy10697SummaryTwo(startTime, endTime, ins string, st_stamp, end_
         `).
 		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery). // 使用子查询
 		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ? AND his_order.is_medicine_insurance = ? AND his_order.insutype = ? AND his_order.STATUS = ?",
-			10721, 2, startTime+" 00:00:00", endTime+" 23:59:59", 1, ins, 1).
+			10697, 2, startTime+" 00:00:00", endTime+" 23:59:59", 1, ins, 1).
 		Group("his_order.patient_id").
 		Scan(&results).Error