历史排班

controllers/dialysis_api_controller.go

@@ -2115,7 +2115,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
 	assessment.Ktv = data.Ktv
-
+	fmt.Println("data.wooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo", data.Urr)
 	assessment.Urr = data.Urr
 	assessment.Hypertenison = data.Hypertenison
 	assessment.Hypopiesia = data.Hypopiesia

controllers/gobal_config_api_controller.go

@@ -1837,6 +1837,7 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	page, _ := c.GetInt64("page")
 	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
+	patientsList, _ := service.GetAllpatient(adminInfo.CurrentOrgId)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
@@ -1849,6 +1850,7 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 		"total":        total,
 		"drugTypeList": drugTypeList,
 		"houseList":    houseList,
+		"patientsList": patientsList,
 	})
 }
 
@@ -1893,6 +1895,7 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+	patientsList, _ := service.GetAllpatient(adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1905,6 +1908,7 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 		"houseList":        houseList,
 		"dealerList":       dealerList,
 		"manufacturerList": manufacturerList,
+		"patientsList":     patientsList,
 	})
 }
 

controllers/stock_in_api_controller.go

@@ -3163,6 +3163,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	patientsList, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)
 	if types == 1 {
 		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
@@ -3175,6 +3176,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"houseList":        houseList,
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
+				"patientsList":     patientsList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3191,6 +3193,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"houseList":        houseList,
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
+				"patientsList":     patientsList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3204,6 +3207,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"total":            total,
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
+				"patientsList":     patientsList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3219,6 +3223,7 @@ func (this *StockManagerApiController) GetDetailInfo() {
 				"houseList":        houseList,
 				"manufacturerList": manufacturerList,
 				"dealerList":       dealerList,
+				"patientsList":     patientsList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/drug.go

@@ -1,84 +1,84 @@
 package models
 
 type BaseDrugLib struct {
-	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                      string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                        string  `gorm:"column:code" json:"code" form:"code"`
-	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	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"`
-	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
-	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
-	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
-	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
-	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
-	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"`
-	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugDay               string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
-	IsUse                 int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	BatchRetaiPrice       float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
-	SumCount              int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
-	SumInCount            int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
-	IsPharmacy            int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
-	TotalCount            int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
-	DrugStockLimitCount   int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
-	SumOutCount           int64                  `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
-	SumCancelCount        int64                  `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	ID                          int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string                 `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string                 `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string                 `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string                 `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string                 `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string                 `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64                  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64                  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice                    float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	UnitMatrixing               string                 `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64                  `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string                 `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string                 `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string                 `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	Manufacturer                int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64                  `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64                  `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string                 `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64                  `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                  `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string                 `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string                 `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string                 `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string                 `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64                `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64                  `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64                  `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64                  `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64                  `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64                  `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                  `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64                  `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64                  `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string                 `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string                 `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string                 `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64                  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	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"`
+	DrugDay                     string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugWarehouseInfo           []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	LastDrugWarehouseInfo       XtDrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"first_drug_warehouse_info"`
+	IsUse                       int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice             float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount                    int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount                  int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	IsPharmacy                  int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	TotalCount                  int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	DrugStockLimitCount         int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	SumOutCount                 int64                  `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount              int64                  `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
 
 	ZuobiaoId string `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 	Bck01b    string `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`

models/drug_stock.go

@@ -302,6 +302,7 @@ type DrugCancelStockInfo struct {
 	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	DrugWarehouseInfo []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId"json:"drug_warehouse_info" `
 	OrderId           int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	PatientId         int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {

models/good_models.go

@@ -152,6 +152,85 @@ func (GoodInfo) TableName() string {
 	return "xt_good_information"
 }
 
+type GoodInfoSevenThirty struct {
+	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string               `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64                `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64                `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string               `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64                `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string               `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64                `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64                `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64                `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string               `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string               `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	FirstLetter                 string               `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string               `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64                `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64                `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64                `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64                `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64                `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64                `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64                `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string               `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	GoodsType                   GoodsType            `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
+	CommdityCode                string               `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string               `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string               `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string               `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64                `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string               `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
+	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	LaStWarehousingInfo         StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"first_xt_warehouse_info"`
+	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string               `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	SumCount                    int64                `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	Bbx01                       string               `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	Bby01                       string               `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	ZuobiaoId                   string               `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	SumOutCount                 int64                `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount              int64                `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	TotalCount                  int64                `gorm:"column:total_count" json:"total_count" form:"total_count"`
+}
+
+func (GoodInfoSevenThirty) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodInfoSeven struct {
 	ID         int64  `gorm:"column:id" json:"id" form:"id"`
 	GoodName   string `gorm:"column:good_name" json:"good_name" form:"good_name"`

models/self_drug_models.go

@@ -521,6 +521,7 @@ type BloodDrugCancelStockInfo struct {
 	DoseUnit         string  `json:"dose_unit"`
 	Unit             string  `json:"unit"`
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 type BloodDrugSalesReturnInfo struct {
@@ -588,6 +589,7 @@ type BloodDrugWarehouseOutInfo struct {
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	InPrice                 float64 `gorm:"column:price" json:"in_price" form:"price"`
 	WarehousingInfoId       int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 type XtMonitorConfig struct {

service/gobal_config_service.go

@@ -396,9 +396,9 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	db = db.Joins("left join sgj_xt.xt_drug_warehouse_info as p on p.id =x.warehouse_info_id")
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,x.patient_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err
@@ -468,9 +468,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,x.patient_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,x.patient_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err

service/manage_center_service.go

@@ -584,6 +584,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				BatchNumberId:    info.WarehouseInfoId,
 				StorehouseId:     storeHouseConfig.DrugStorehouseOut,
 				IsCheck:          1,
+				PatientId:        advice.PatientId,
 			}
 
 			//查询剩余库存

service/stock_service.go

@@ -3838,11 +3838,11 @@ func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (dr
 
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0) and storehouse_id = ?", orgid, storehouse_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
 		}).Find(&drug).Error
 	} else {
-		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		err = db.Preload("LastDrugWarehouseInfo", "org_id=? and status = 1 and (stock_max_number > 0 or stock_min_number>0) and storehouse_id = ?", orgid, storehouse_id).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id).Group("id")
 		}).Find(&drug).Error
 	}
@@ -3865,16 +3865,16 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 	return
 }
 
-func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (good []*models.GoodInfo, err error) {
+func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (good []*models.GoodInfoSevenThirty, err error) {
 
 	db := XTReadDB().Model(&good).Where("org_id =? and status = 1  AND find_in_set('停用',good_status) = 0", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		err = db.Where("(good_name Like ?)", likekey).Preload("LaStWarehousingInfo", "org_id=? and status = 1 and stock_count <> 0 and storehouse_id =?", orgid, storehouse_id).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id =?", orgid, storehouse_id)
 		}).Find(&good).Error
 	} else {
-		err = db.Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		err = db.Preload("LaStWarehousingInfo", "org_id=? and status = 1 and stock_count <> 0 and storehouse_id =?", orgid, storehouse_id).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0 and storehouse_id = ?", orgid, storehouse_id)
 		}).Find(&good).Error
 	}

service/warhouse_service.go

@@ -625,6 +625,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 			if orgID == 10188 || orgID == 10217 || orgID == 10344 {
 				//查询这个患者今日用过的总数量
 				listDrugFlow, _ := GetDrugFlowByWatch(advice.PatientId, advice.DrugId, advice.AdviceDate, advice.UserOrgId)
+				fmt.Println("000000000000000000000000000000000000000", listDrugFlow)
 				for _, item := range listDrugFlow {
 
 					outInfor, _ := GetDrugWarehouseOutInfor(item.WarehouseOutDetailId, item.UserOrgId)
@@ -655,7 +656,7 @@ func GetDrugFlowByWatch(patient_id int64, drug_id int64, advice_date int64, user
 func GetDrugWarehouseOutInfor(id int64, user_org_id int64) (models.DrugWarehouseOutInfo, error) {
 
 	outInfo := models.DrugWarehouseOutInfo{}
-	err := XTReadDB().Where("id = ? and user_org_id = ?", id, user_org_id).Find(&outInfo).Error
+	err := XTReadDB().Where("id = ? and org_id = ?", id, user_org_id).Find(&outInfo).Error
 	return outInfo, err
 }