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

controllers/his_api_controller.go

@@ -5552,6 +5552,10 @@ func (c *HisApiController) setAdviceWithJSONTwo(advice *models.HisDoctorAdviceIn
 	//	start_time, _ := strconv.ParseInt(json["start_time"].(string), 10,64)
 	//	advice.StartTime = start_time
 	//}
+	if json["is_self_drug"] != nil && reflect.TypeOf(json["is_self_drug"]).String() == "string" {
+		is_self_drug, _ := strconv.ParseInt(json["is_self_drug"].(string), 10, 64)
+		advice.IsSelfDrug = is_self_drug
+	}
 
 	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
 		drugSpecUnit, _ := json["min_unit"].(string)
@@ -5742,6 +5746,10 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		groupno := int64(json["groupno"].(float64))
 		advice.Groupno = groupno
 	}
+	if json["is_self_drug"] != nil && reflect.TypeOf(json["is_self_drug"]).String() == "string" {
+		is_self_drug, _ := strconv.ParseInt(json["is_self_drug"].(string), 10, 64)
+		advice.IsSelfDrug = is_self_drug
+	}
 
 	if json["hosp_appr_flag"] != nil && reflect.TypeOf(json["hosp_appr_flag"]).String() == "string" {
 		hosp_appr_flag, _ := strconv.ParseInt(json["hosp_appr_flag"].(string), 10, 64)

models/dialysis.go

@@ -1250,6 +1250,7 @@ type HisDoctorAdvice struct {
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	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"`
 }
 
 func (HisDoctorAdvice) TableName() string {
@@ -1330,6 +1331,7 @@ type HisDoctorAdviceThirty struct {
 	IsCheck               int64                    `gorm:"-" json:"is_check" form:"is_check"`
 	Way                   int64                    `gorm:"column:way" json:"way" form:"way"`
 	IsSettle              int64                    `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsSelfDrug            int64                    `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (HisDoctorAdviceThirty) TableName() string {
@@ -1435,6 +1437,7 @@ type HisDoctorAdviceFourty struct {
 	DrugId                int64                    `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	IsSettle              int64                    `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 	Drug                  Drug                     `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	IsSelfDrug            int64                    `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (HisDoctorAdviceFourty) TableName() string {
@@ -1581,6 +1584,7 @@ type HisNoDoctorAdvice struct {
 	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
 	AdviceType     int64 `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
 	Count          int64 `json:"count"`
+	IsSelfDrug     int64 `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (HisNoDoctorAdvice) TableName() string {

models/drug_pharmacy_management_models.go

@@ -196,6 +196,7 @@ type PharmacyHisDoctorAdviceInfo struct {
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSelfDrug            int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (PharmacyHisDoctorAdviceInfo) TableName() string {

models/his_charge_models.go

@@ -33,6 +33,7 @@ type HisChargeDoctorAdviceInfo struct {
 	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	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"`
+	IsSelfDrug            int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {
@@ -111,6 +112,7 @@ type HisChargeOrder struct {
 	IsUploadDiagnose   int64   `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo  int64   `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess    int64   `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	SetlTime           string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
 
 	PsnCashPay          float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	IsMedicineInsurance int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`

models/his_models.go

@@ -136,6 +136,7 @@ type HisPatient struct {
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	Emp                    string  `gorm:"column:emp" json:"emp" form:"emp"`
 }
 
 func (HisPatient) TableName() string {
@@ -265,6 +266,7 @@ type HisDoctorAdviceInfo struct {
 	Child                 []*HisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
 	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"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/his_summary_models.go

@@ -278,6 +278,7 @@ type VmHisDoctorAdviceInfo struct {
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	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"`
+	IsSelfDrug            int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (VmHisDoctorAdviceInfo) TableName() string {

service/his_service.go

@@ -1763,6 +1763,7 @@ type HisDoctorAdviceInfo struct {
 	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
 	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"`
+	IsSelfDrug           int64                `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/mobile_dialysis_service.go

@@ -354,6 +354,7 @@ type VMHisDoctorAdviceInfo struct {
 	ExecutionState       int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
 	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"`
+	IsSelfDrug           int64 `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (VMHisDoctorAdviceInfo) TableName() string {