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

models/his_models.go

@@ -174,57 +174,59 @@ func (HisCaseHistoryTemplate) TableName() string {
 }
 
 type HisDoctorAdviceInfo struct {
-	ID                    int64       `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId             int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId          int64       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	AdviceType            int64       `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64       `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64       `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string      `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string      `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64       `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string      `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64     `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string      `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string      `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string      `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64       `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	Status                int64       `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64       `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime           int64       `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	AdviceAffirm          string      `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string      `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64       `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string      `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64       `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64       `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64       `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	ExecutionTime         int64       `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff        int64       `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState        int64       `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	Checker               int64       `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64       `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DialysisOrderId       int64       `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	CheckTime             int64       `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64       `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	DrugSpec              float64     `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string      `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	Groupno               int64       `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	RemindType            int64       `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
-	FrequencyType         int64       `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount              int64       `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay               string      `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	TemplateId            string      `gorm:"column:template_id" json:"template_id" form:"template_id"`
-	Modifier              int64       `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	DrugId                int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Price                 float64     `gorm:"column:price" json:"price" form:"price"`
-	PrescriptionId        int64       `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	MedListCodg           string      `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	FeedetlSn             string      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Day                   int64       `gorm:"column:day" json:"day" form:"day"`
-	BaseDrugLib           BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+
+	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/gdyb_service.go

@@ -808,7 +808,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
-						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
+						HospApprFlag:     subItem.HospApprFlag,
 					}
 
 					customs = append(customs, cus)
@@ -904,14 +904,13 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
 		} else {
-
 			if item.HospApprFlag != -1 {
 				if item.HospApprFlag == 1 {
-					feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
-				} else if item.HospApprFlag == 2 {
 					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
-				} else if item.HospApprFlag == 3 {
+				} else if item.HospApprFlag == 2 {
 					feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+				} else if item.HospApprFlag == 3 {
+					feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
 				} else {
 					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 				}