|
@@ -5262,7 +5262,6 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
5262
|
5262
|
zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
5263
|
5263
|
//zhenChaCostSelfTotal = zhenChaCostTotal
|
5264
|
5264
|
}
|
5265
|
|
-
|
5266
|
5265
|
if item.MedChrgitmType == "03" { //检查费
|
5267
|
5266
|
checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
5268
|
5267
|
//checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
@@ -5317,6 +5316,72 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
5317
|
5316
|
//otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
5318
|
5317
|
}
|
5319
|
5318
|
|
|
5319
|
+ } else if org_id == 10188 || org_id == 10217 {
|
|
5320
|
+ if item.MedChrgitmType == "01" { //床位费
|
|
5321
|
+ bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5322
|
+ //bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5323
|
+ //bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5324
|
+ }
|
|
5325
|
+ if item.MedChrgitmType == "02" { //诊察费
|
|
5326
|
+ zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5327
|
+ //zhenChaCostSelfTotal = zhenChaCostTotal
|
|
5328
|
+ }
|
|
5329
|
+ if item.MedChrgitmType == "03" { //检查费
|
|
5330
|
+ laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5331
|
+
|
|
5332
|
+ //checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5333
|
+ //checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5334
|
+ //checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5335
|
+ }
|
|
5336
|
+
|
|
5337
|
+ //if item.MedChrgitmType == "02" { //检查费
|
|
5338
|
+ // checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5339
|
+ // //checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5340
|
+ // //checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5341
|
+ //}
|
|
5342
|
+
|
|
5343
|
+ if item.MedChrgitmType == "04" { //化验费
|
|
5344
|
+ laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5345
|
+ //laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5346
|
+ //laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5347
|
+ }
|
|
5348
|
+
|
|
5349
|
+ if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
5350
|
+ treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5351
|
+ //treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5352
|
+ //treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5353
|
+ }
|
|
5354
|
+
|
|
5355
|
+ if item.MedChrgitmType == "06" { //手术费
|
|
5356
|
+ operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5357
|
+ //operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5358
|
+ //operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5359
|
+ }
|
|
5360
|
+
|
|
5361
|
+ if item.MedChrgitmType == "08" { //材料费
|
|
5362
|
+ materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5363
|
+ //materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5364
|
+ //materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5365
|
+ }
|
|
5366
|
+
|
|
5367
|
+ if item.MedChrgitmType == "09" { //西药费
|
|
5368
|
+ westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5369
|
+ //westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5370
|
+ //westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5371
|
+ }
|
|
5372
|
+
|
|
5373
|
+ if item.MedChrgitmType == "11" { //中成费
|
|
5374
|
+ chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5375
|
+ //chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5376
|
+ //chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5377
|
+ }
|
|
5378
|
+
|
|
5379
|
+ if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
|
|
5380
|
+ otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
5381
|
+ //otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
5382
|
+ //otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
5383
|
+ }
|
|
5384
|
+
|
5320
|
5385
|
} else {
|
5321
|
5386
|
|
5322
|
5387
|
if item.MedChrgitmType == "01" { //床位费
|
|
@@ -5850,8 +5915,6 @@ func (c *HisApiController) GetFaPiaoData() {
|
5850
|
5915
|
if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
|
5851
|
5916
|
if item.HisPrescriptionProject.Type == 2 {
|
5852
|
5917
|
if c.GetAdminUserInfo().CurrentOrgId == 10215 {
|
5853
|
|
- fmt.Println("CostClassify")
|
5854
|
|
- fmt.Println(item.HisPrescriptionProject.VMHisProject.CostClassify)
|
5855
|
5918
|
switch item.HisPrescriptionProject.VMHisProject.CostClassify {
|
5856
|
5919
|
case 0:
|
5857
|
5920
|
item.MedChrgitmType = "0"
|
|
@@ -6025,11 +6088,11 @@ func (c *HisApiController) GetFaPiaoData() {
|
6025
|
6088
|
zhenChaCostPartSelfTotal, _ = decimal.NewFromFloat(zhenChaCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
6026
|
6089
|
}
|
6027
|
6090
|
|
6028
|
|
- if c.GetAdminUserInfo().CurrentOrgId == 10188 {
|
|
6091
|
+ if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
|
6029
|
6092
|
if item.MedChrgitmType == "03" { //检查费
|
6030
|
|
- treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
6031
|
|
- treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
6032
|
|
- treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
6093
|
+ laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
|
6094
|
+ laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
6095
|
+ laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
6033
|
6096
|
|
6034
|
6097
|
}
|
6035
|
6098
|
} else {
|
|
@@ -6045,6 +6108,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
6045
|
6108
|
laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
6046
|
6109
|
laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
6047
|
6110
|
laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
6111
|
+
|
6048
|
6112
|
}
|
6049
|
6113
|
|
6050
|
6114
|
if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|