陈少旭 1 mēnesi atpakaļ
vecāks
revīzija
4d31da8031
2 mainītis faili ar 65 papildinājumiem un 2 dzēšanām
  1. 0 2
      controllers/his_api_controller.go
  2. 65 0
      models/his_models.go

+ 0 - 2
controllers/his_api_controller.go Parādīt failu

@@ -1840,13 +1840,11 @@ func (c *HisApiController) CreateHisPrescription() {
1840 1840
 	//查询默认出库仓库库存
1841 1841
 	storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
1842 1842
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
1843
-
1844 1843
 	if his_patient_id == 0 { //前端传过来的挂号id为0时,进行多一步判断
1845 1844
 		lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient_id, recordDateTime)
1846 1845
 		if len(lists) == 1 {
1847 1846
 			his_patient_id = lists[0].ID
1848 1847
 		}
1849
-
1850 1848
 	}
1851 1849
 
1852 1850
 	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)

+ 65 - 0
models/his_models.go Parādīt failu

@@ -1098,6 +1098,71 @@ func (HisOrder) TableName() string {
1098 1098
 	return "his_order"
1099 1099
 }
1100 1100
 
1101
+type HisOrderELE struct {
1102
+	ID                  int64     `gorm:"column:id" json:"id" form:"id"`
1103
+	UserOrgId           int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
1104
+	HisPatientId        int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
1105
+	SettleAccountsDate  int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
1106
+	Ctime               int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
1107
+	Mtime               int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
1108
+	Status              int64     `gorm:"column:status" json:"status" form:"status"`
1109
+	Number              string    `gorm:"column:number" json:"number" form:"number"`
1110
+	PatientId           int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
1111
+	Infcode             int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
1112
+	WarnMsg             string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
1113
+	Cainfo              string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
1114
+	ErrMsg              string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
1115
+	RespondTime         string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
1116
+	InfRefmsgid         string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
1117
+	OrderStatus         int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
1118
+	MdtrtId             string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
1119
+	SetlId              string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
1120
+	PsnNo               string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
1121
+	PsnName             string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
1122
+	PsnCertType         string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
1123
+	Certno              string    `gorm:"column:certno" json:"certno" form:"certno"`
1124
+	Gend                string    `gorm:"column:gend" json:"gend" form:"gend"`
1125
+	Naty                string    `gorm:"column:naty" json:"naty" form:"naty"`
1126
+	Brdy                time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
1127
+	Age                 float64   `gorm:"column:age" json:"age" form:"age"`
1128
+	Insutype            string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
1129
+	PsnType             string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
1130
+	CvlservFlag         string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
1131
+	SetlTime            string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
1132
+	MdtrtCertType       string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
1133
+	MedType             string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
1134
+	MedfeeSumamt        float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
1135
+	FulamtOwnpayAmt     float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
1136
+	OverlmtSelfPay      float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
1137
+	PreselfpayAmt       float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
1138
+	InscpScpAmt         float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
1139
+	ActPayDedc          float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
1140
+	HifpPay             float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
1141
+	CvlservPay          float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
1142
+	PoolPropSelfpay     float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
1143
+	HifesPay            float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
1144
+	HifmiPay            float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
1145
+	HifobPay            float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
1146
+	MafPay              float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
1147
+	OthPay              float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
1148
+	FundPaySumamt       float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
1149
+	PsnPartAmt          float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
1150
+	AcctPay             float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
1151
+	PsnCashPay          float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
1152
+	HospPartAmt         float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
1153
+	Balc                float64   `gorm:"column:balc" json:"balc" form:"balc"`
1154
+	AcctMulaidPay       float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
1155
+	MedinsSetlId        string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
1156
+	IsMedicineInsurance int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
1157
+	PayWay              int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
1158
+
1159
+	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
1160
+}
1161
+
1162
+func (HisOrderELE) TableName() string {
1163
+	return "his_order"
1164
+}
1165
+
1101 1166
 type HisOrderOther struct {
1102 1167
 	ID                  int64     `gorm:"column:id" json:"id" form:"id"`
1103 1168
 	UserOrgId           int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`