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

controllers/sg/his_api_controller.go

@@ -81,6 +81,7 @@ type CustomFundPay struct {
 }
 
 func (c *HisApiController) GetSettleList() {
+
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
@@ -114,16 +115,16 @@ func (c *HisApiController) GetSettleList() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       "",
-		BizSn:          "",
-		BillNo:         "",
+		BillCode:       order.FaPiaoCode,
+		BillNo:         order.FaPiaoNumber,
+		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
 		AcctPay:        order.AcctPay,
 		PsnCashpay:     order.PsnCashPay,
 		HiPaymtd:       "1",
-		Hsorg:          "医保中心",
-		HsorgOpter:     "医保中心",
+		Hsorg:          miConfig.InsuplcAdmdvs,
+		HsorgOpter:     miConfig.InsuplcAdmdvs,
 		MedinsFillPsn:  curRoles.UserName,
 		MedinsFillDept: depart.Name,
 	}
@@ -256,11 +257,11 @@ func (c *HisApiController) GetSettleList() {
 				bed_claa_sunmfee, _ = decimal.NewFromFloat(bed_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			}
 			if item.ChrgitmLv == "2" {
-				bed_clab_amt, _ = decimal.NewFromFloat(bed_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bed_clab_amt, _ = decimal.NewFromFloat(bed_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				bed_other_amt, _ = decimal.NewFromFloat(bed_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bed_other_amt, _ = decimal.NewFromFloat(bed_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 
 		}
@@ -276,11 +277,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				check_clab_amt, _ = decimal.NewFromFloat(check_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				check_clab_amt, _ = decimal.NewFromFloat(check_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				check_other_amt, _ = decimal.NewFromFloat(check_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				check_other_amt, _ = decimal.NewFromFloat(check_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -295,11 +296,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				laboratory_clab_amt, _ = decimal.NewFromFloat(laboratory_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratory_clab_amt, _ = decimal.NewFromFloat(laboratory_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				laboratory_other_amt, _ = decimal.NewFromFloat(laboratory_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratory_other_amt, _ = decimal.NewFromFloat(laboratory_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -314,11 +315,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				treat_clab_amt, _ = decimal.NewFromFloat(treat_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treat_clab_amt, _ = decimal.NewFromFloat(treat_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				treat_other_amt, _ = decimal.NewFromFloat(treat_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treat_other_amt, _ = decimal.NewFromFloat(treat_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -334,11 +335,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				operation_clab_amt, _ = decimal.NewFromFloat(operation_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operation_clab_amt, _ = decimal.NewFromFloat(operation_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				operation_other_amt, _ = decimal.NewFromFloat(operation_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operation_other_amt, _ = decimal.NewFromFloat(operation_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -353,11 +354,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				material_clab_amt, _ = decimal.NewFromFloat(material_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				material_clab_amt, _ = decimal.NewFromFloat(material_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				material_other_amt, _ = decimal.NewFromFloat(material_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				material_other_amt, _ = decimal.NewFromFloat(material_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -372,11 +373,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				westernMedicine_clab_amt, _ = decimal.NewFromFloat(westernMedicine_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicine_clab_amt, _ = decimal.NewFromFloat(westernMedicine_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				westernMedicine_other_amt, _ = decimal.NewFromFloat(westernMedicine_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicine_other_amt, _ = decimal.NewFromFloat(westernMedicine_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -391,11 +392,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				chineseTraditional_clab_amt, _ = decimal.NewFromFloat(chineseTraditional_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditional_clab_amt, _ = decimal.NewFromFloat(chineseTraditional_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				chineseTraditional_other_amt, _ = decimal.NewFromFloat(chineseTraditional_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditional_other_amt, _ = decimal.NewFromFloat(chineseTraditional_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -409,11 +410,11 @@ func (c *HisApiController) GetSettleList() {
 
 			}
 			if item.ChrgitmLv == "2" {
-				other_clab_amt, _ = decimal.NewFromFloat(other_clab_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				other_clab_amt, _ = decimal.NewFromFloat(other_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 
 			}
 			if item.ChrgitmLv == "3" {
-				other_other_amt, _ = decimal.NewFromFloat(other_other_amt).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				other_other_amt, _ = decimal.NewFromFloat(other_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			}
 		}
 
@@ -509,6 +510,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.OthAmt = other_other_amt
 		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
+	struct4101.Ntly = "中国"
 	result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 	fmt.Println(result)
 
@@ -1835,6 +1837,9 @@ func (c *HisApiController) GetUploadInfo() {
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
@@ -1975,6 +1980,8 @@ func (c *HisApiController) GetUploadInfo() {
 				SettleEndTime:         end_time,
 				Creator:               roles.AdminUserId,
 				Modify:                roles.AdminUserId,
+				FaPiaoNumber:          fapiao_number,
+				FaPiaoCode:            fapiao_code,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {

models/his_models.go

@@ -667,6 +667,9 @@ type HisOrder struct {
 	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
 	YiliaoNumber            string `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+
 	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
 

service/his_service.go

@@ -777,6 +777,9 @@ type XtHisOrder struct {
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify             int64  `gorm:"column:modify" json:"modify" form:"modify"`
 
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`