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

models/his_models.go

@@ -683,7 +683,7 @@ type HisOrder struct {
 	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
 	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
 
-	HisOrderInfo        []*HisOrderInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	HisOrderInfo        []*HisOrderInfo     `gorm:"ForeignKey:OrderId;AssociationForeignKey:ID" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`

service/gdyb_service.go

@@ -2185,7 +2185,7 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	inputData["psn_name"] = struct4101.PsnName                // 人员姓名  必填
 	inputData["gend"] = struct4101.Gend                       // 性别  必填
 	inputData["brdy"] = struct4101.Brdy                       // 出生日期  必填
-	inputData["age"] = ""                                     // 年龄  必填
+	inputData["age"] = struct4101.Age                         // 年龄  必填
 	inputData["ntly"] = struct4101.Ntly                       // 国籍  必填
 	inputData["nwb_age"] = ""                                 // 年龄  必填
 	inputData["naty"] = struct4101.Naty                       // 民族  必填
@@ -2209,7 +2209,7 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	inputData["nwb_adm_wt"] = ""                              // 新生儿入院体重  必填
 	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
-	inputData["ipt_med_type"] = ""                            // 住院医疗类型  必填
+	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
 	inputData["adm_way"] = ""                                 // 入院途径  必填
 	inputData["trt_type"] = ""                                // 治疗类别  必填
 	inputData["adm_time"] = ""                                // 入院时间  必填
@@ -2319,7 +2319,7 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	//input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
-	input["oprninfo"] = oprninfo
+	//input["oprninfo"] = oprninfo
 	//input["icuinfo"] = icuinfo
 	inputMessage["input"] = input //交易输入