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

controllers/sg/his_api_controller.go

@@ -5294,12 +5294,11 @@ func (c *HisApiController) GetSettleAccounts() {
 			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
-		if item.MedChrgitmType == "14" { //其他费
+		if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" { //其他费
 			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
-
 	}
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)

controllers/zh/zh_his_api_controller.go

@@ -291,6 +291,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	diagnosis_ids := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	start_time := c.GetString("start_time")
+	balance_accounts_type, _ := c.GetInt64("balance_accounts_type")
 
 	//reg_type, _ := c.GetInt64("p_type")
 	med_type, _ := c.GetInt64("med_type")
@@ -487,6 +488,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				InHospitalStatus:     1,
 				Certificates:         certificates,
 				Phone:                phone,
+				BalanceAccountsType:  balance_accounts_type,
 			}
 			service.CreateHospitalRecord(inHospital)
 			c.ServeSuccessJSON(map[string]interface{}{

models/zh_his_models.go

@@ -39,6 +39,7 @@ type HisHospitalCheckRecord struct {
 	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"`
 }
 
 func (HisHospitalCheckRecord) TableName() string {