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

models/good_models.go

@@ -1,7 +1,5 @@
 package models
 
-import "XT/models"
-
 type GoodsType struct {
 	ID              int64  `gorm:"column:id" json:"id"`
 	TypeCode        string `gorm:"column:type_code" json:"type_code"`
@@ -80,21 +78,21 @@ func (GoodInfo) TableName() string {
 }
 
 type GoodsTypeOne struct {
-	ID             int64              `gorm:"column:id" json:"id"`
-	TypeCode       string             `gorm:"column:type_code" json:"type_code"`
-	TypeName       string             `gorm:"column:type_name" json:"type_name"`
-	Remark         string             `gorm:"column:remark" json:"remark"`
-	Ctime          int64              `gorm:"column:ctime" json:"ctime"`
-	Mtime          int64              `gorm:"column:mtime" json:"mtime"`
-	Creater        int64              `gorm:"column:creater" json:"creater"`
-	Modifier       int64              `gorm:"column:modifier" json:"modifier"`
-	OrgId          int64              `gorm:"column:org_id" json:"org_id"`
-	Status         int64              `gorm:"column:status" json:"status"`
-	Type           int64              `gorm:"column:type" json:"type"`
-	Number         int64              `gorm:"column:number" json:"number"`
-	OutStock       int64              `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
-	StockAttribute int64              `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
-	GoodInfo       []*models.GoodInfo `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
+	ID             int64       `gorm:"column:id" json:"id"`
+	TypeCode       string      `gorm:"column:type_code" json:"type_code"`
+	TypeName       string      `gorm:"column:type_name" json:"type_name"`
+	Remark         string      `gorm:"column:remark" json:"remark"`
+	Ctime          int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime          int64       `gorm:"column:mtime" json:"mtime"`
+	Creater        int64       `gorm:"column:creater" json:"creater"`
+	Modifier       int64       `gorm:"column:modifier" json:"modifier"`
+	OrgId          int64       `gorm:"column:org_id" json:"org_id"`
+	Status         int64       `gorm:"column:status" json:"status"`
+	Type           int64       `gorm:"column:type" json:"type"`
+	Number         int64       `gorm:"column:number" json:"number"`
+	OutStock       int64       `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
+	StockAttribute int64       `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
+	GoodInfo       []*GoodInfo `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
 }
 
 func (GoodsTypeOne) TableName() string {

models/his_models.go

@@ -1445,3 +1445,154 @@ type HisSignIn struct {
 func (HisSignIn) TableName() string {
 	return "his_sign_in"
 }
+
+type HisChargeSettleOrder 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"`
+	HisPatientId        int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate  int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Status              int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId           int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode             int64   `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg             string  `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo              string  `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg              string  `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime         string  `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid         string  `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus         int64   `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId              string  `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	Insutype            string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType             string  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag         string  `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime            string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType       string  `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType             string  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt        float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt     float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay      float64 `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt       float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt         float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc          float64 `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay             float64 `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay          float64 `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay     float64 `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay            float64 `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay            float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay            float64 `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay              float64 `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay              float64 `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt       float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt          float64 `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay             float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay          float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt         float64 `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                float64 `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay       float64 `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId        string  `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins           string  `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay              string  `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType             string  `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail          string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance int64   `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PType               int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	SettleType          int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime     int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime       int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+}
+
+func (HisChargeSettleOrder) TableName() string {
+	return "his_order"
+}
+
+type HisPrintPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	PsnNo                  string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType            string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                 string  `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName                string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                   string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                   string  `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                   string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+}
+
+func (HisPrintPatient) TableName() string {
+	return "his_patient"
+}
+
+type HisHospitalCheckRecordTwo struct {
+	ID                   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                 string `gorm:"column:name" json:"name" form:"name"`
+	MedicalTreatmentType int64  `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	RecordDate           int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IdCardNo             string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	AdminUserId          int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments          int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	UserOrgId            int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number               string `gorm:"column:number" json:"number" form:"number"`
+	Doctor               int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	PsnNo                string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType          string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno               string `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName              string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                 string `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                 string `gorm:"column:naty" json:"naty" form:"naty"`
+	MedType              int64  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Brdy                 string `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                string `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo             string `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo             string `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	AdmBed               int64  `gorm:"column:adm_bed" json:"adm_bed" form:"adm_bed"`
+	IdCardType           int64  `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	Diagnosis            string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	InsutypeType         string `gorm:"column:insutype_type" json:"insutype_type" form:"insutype_type"`
+	SickType             int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	MdtrtCertType        string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime       string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime      string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	InHospitalStatus     int64  `gorm:"column:in_hospital_status" json:"in_hospital_status" form:"in_hospital_status"`
+	Certificates         int64  `gorm:"column:certificates" json:"certificates" form:"certificates"`
+	OutHospitalStatus    int64  `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
+	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
+	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
+	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+}
+
+func (HisHospitalCheckRecordTwo) TableName() string {
+	return "his_hospital_check_record"
+}

service/his_deposit_service.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"fmt"
+	"gdyb/models"
+	"gdyb/utils"
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"math/rand"