Browse Source

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

csx 3 years ago
parent
commit
bce1c14e97

+ 1 - 2
controllers/sg/his_api_controller.go View File

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

+ 2 - 0
controllers/zh/zh_his_api_controller.go View File

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

+ 1 - 0
models/zh_his_models.go View File

@@ -39,6 +39,7 @@ type HisHospitalCheckRecord struct {
39 39
 	OutHospitalStatus    int64  `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
40 40
 	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
41 41
 	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
42
+	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
42 43
 }
43 44
 
44 45
 func (HisHospitalCheckRecord) TableName() string {