Merge branch 'master' of http://git.shengws.com/csx/gdyb

models/drug.go

@@ -1,31 +1,34 @@
 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"`
-	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	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"`
+	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"`
+	MinUnit               string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	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"`

models/good_models.go

@@ -25,51 +25,53 @@ func (GoodsType) TableName() string {
 }
 
 type GoodInfo 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"`
-	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"`
-	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"`
+	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"`
+
+	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"`
+	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"`
 }
 
 func (GoodInfo) TableName() string {

models/his_models.go

@@ -1139,54 +1139,56 @@ func (MyHisProject) TableName() string {
 }
 
 type MyGoodInformation 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"`
-	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"`
-	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"`
+	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"`
+
+	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"`
+	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"`
 }
 
 func (MyGoodInformation) TableName() string {

models/self_drug_models.go

@@ -39,33 +39,36 @@ type XtBaseDrug struct {
 	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"`
-	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"`
-	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"`
+	//ProvincesCode          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"`
+	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"`
 }
 
 func (XtBaseDrug) TableName() string {

service/his_service.go

@@ -387,33 +387,35 @@ type BaseDrugLib struct {
 	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"`
-	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"`
-	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"`
+	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"`
+	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"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`

service/jsyb_service.go

@@ -237,7 +237,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	request_url = request_url + "2203"
+	request_url = request_url + "2203A"
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
 
@@ -320,15 +320,20 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
 					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.4f", subItem.Price),
-						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
-						HospApprFlag:     subItem.HospApprFlag,
-						DoctorNumber:     doctor_id,
-						DoctorName:       new_doctor_name,
-						//ProvinceDrugMedListCodg:  subItem.BaseDrugLib.
+						DetItemFeeSumamt:        fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:                     fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+						FeedetlSn:               subItem.FeedetlSn,
+						Price:                   fmt.Sprintf("%.4f", subItem.Price),
+						MedListCodg:             subItem.BaseDrugLib.MedicalInsuranceNumber,
+						HospApprFlag:            subItem.HospApprFlag,
+						DoctorNumber:            doctor_id,
+						DoctorName:              new_doctor_name,
+						ProvinceDrugMedListCodg: "",
+						ProvinceGoodMedListCodg: "",
+					}
+
+					if subItem.BaseDrugLib.DrugClassify == "2" {
+						cus.ProvinceDrugMedListCodg = subItem.BaseDrugLib.ProvincesCode
 					}
 
 					customs = append(customs, cus)
@@ -344,14 +349,16 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					if len(subItem.HisProject.MedicalCode) > 0 {
 						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 						cus := &Custom{
-							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
-							Cut:              fmt.Sprintf("%.4f", cnt),
-							FeedetlSn:        subItem.FeedetlSn,
-							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
-							MedListCodg:      subItem.HisProject.MedicalCode,
-							DoctorNumber:     doctor_id,
-							DoctorName:       new_doctor_name,
-							HospApprFlag:     -1,
+							DetItemFeeSumamt:        fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:                     fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:               subItem.FeedetlSn,
+							Price:                   fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:             subItem.HisProject.MedicalCode,
+							DoctorNumber:            doctor_id,
+							DoctorName:              new_doctor_name,
+							HospApprFlag:            -1,
+							ProvinceDrugMedListCodg: "",
+							ProvinceGoodMedListCodg: "",
 						}
 						customs = append(customs, cus)
 					}
@@ -361,14 +368,16 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 
 						cus := &Custom{
-							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
-							Cut:              fmt.Sprintf("%.4f", cnt),
-							FeedetlSn:        subItem.FeedetlSn,
-							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
-							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
-							HospApprFlag:     -1,
-							DoctorNumber:     doctor_id,
-							DoctorName:       new_doctor_name,
+							DetItemFeeSumamt:        fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:                     fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:               subItem.FeedetlSn,
+							Price:                   fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:             subItem.GoodInfo.MedicalInsuranceNumber,
+							HospApprFlag:            -1,
+							DoctorNumber:            doctor_id,
+							DoctorName:              new_doctor_name,
+							ProvinceDrugMedListCodg: "",
+							ProvinceGoodMedListCodg: subItem.GoodInfo.ProvincesCode,
 						}
 						customs = append(customs, cus)
 					}