|
@@ -376,7 +376,7 @@ func (c *HisApiController) GetBatchSettleAccounts() {
|
376
|
376
|
|
377
|
377
|
}
|
378
|
378
|
|
379
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
379
|
+ if item.MedChrgitmType == "05" { //治疗费
|
380
|
380
|
|
381
|
381
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
382
|
382
|
treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
@@ -395,7 +395,7 @@ func (c *HisApiController) GetBatchSettleAccounts() {
|
395
|
395
|
|
396
|
396
|
}
|
397
|
397
|
|
398
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
398
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
399
|
399
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
400
|
400
|
materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
401
|
401
|
materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -662,7 +662,7 @@ func (c *HisApiController) GetTestOrder() {
|
662
|
662
|
|
663
|
663
|
}
|
664
|
664
|
|
665
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
665
|
+ if item.MedChrgitmType == "05" { //治疗费
|
666
|
666
|
|
667
|
667
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
668
|
668
|
treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
|
@@ -681,7 +681,7 @@ func (c *HisApiController) GetTestOrder() {
|
681
|
681
|
|
682
|
682
|
}
|
683
|
683
|
|
684
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
684
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
685
|
685
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
686
|
686
|
materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
687
|
687
|
materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -1109,7 +1109,7 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
|
1109
|
1109
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
1110
|
1110
|
}
|
1111
|
1111
|
|
1112
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
1112
|
+ if item.MedChrgitmType == "05" { //治疗费
|
1113
|
1113
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
1114
|
1114
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
1115
|
1115
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -1121,7 +1121,7 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
|
1121
|
1121
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
1122
|
1122
|
}
|
1123
|
1123
|
|
1124
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
1124
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
1125
|
1125
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
1126
|
1126
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
1127
|
1127
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8147,7 +8147,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8147
|
8147
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8148
|
8148
|
}
|
8149
|
8149
|
|
8150
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
8150
|
+ if item.MedChrgitmType == "05" { //治疗费
|
8151
|
8151
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8152
|
8152
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8153
|
8153
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8159,7 +8159,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8159
|
8159
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8160
|
8160
|
}
|
8161
|
8161
|
|
8162
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8162
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8163
|
8163
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8164
|
8164
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8165
|
8165
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8213,7 +8213,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8213
|
8213
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8214
|
8214
|
}
|
8215
|
8215
|
|
8216
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
8216
|
+ if item.MedChrgitmType == "05" { //治疗费
|
8217
|
8217
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8218
|
8218
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8219
|
8219
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8225,7 +8225,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8225
|
8225
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8226
|
8226
|
}
|
8227
|
8227
|
|
8228
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8228
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8229
|
8229
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8230
|
8230
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8231
|
8231
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8279,7 +8279,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8279
|
8279
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8280
|
8280
|
}
|
8281
|
8281
|
|
8282
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
8282
|
+ if item.MedChrgitmType == "05" { //治疗费
|
8283
|
8283
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8284
|
8284
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8285
|
8285
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8291,7 +8291,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8291
|
8291
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8292
|
8292
|
}
|
8293
|
8293
|
|
8294
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8294
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8295
|
8295
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8296
|
8296
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8297
|
8297
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8477,7 +8477,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8477
|
8477
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8478
|
8478
|
}
|
8479
|
8479
|
|
8480
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
8480
|
+ if item.MedChrgitmType == "05" { //治疗费
|
8481
|
8481
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8482
|
8482
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8483
|
8483
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8489,7 +8489,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8489
|
8489
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8490
|
8490
|
}
|
8491
|
8491
|
|
8492
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8492
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8493
|
8493
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8494
|
8494
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8495
|
8495
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8543,7 +8543,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8543
|
8543
|
//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8544
|
8544
|
}
|
8545
|
8545
|
|
8546
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
8546
|
+ if item.MedChrgitmType == "05" { //治疗费
|
8547
|
8547
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8548
|
8548
|
//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8549
|
8549
|
//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8555,7 +8555,7 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
|
8555
|
8555
|
//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
8556
|
8556
|
}
|
8557
|
8557
|
|
8558
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8558
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8559
|
8559
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8560
|
8560
|
//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
8561
|
8561
|
//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -8931,7 +8931,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
8931
|
8931
|
operationCostSelfTotal = treatCostTotal
|
8932
|
8932
|
}
|
8933
|
8933
|
|
8934
|
|
- if item.MedChrgitmType == "08" { //材料费
|
|
8934
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
|
8935
|
8935
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
8936
|
8936
|
materialCostSelfTotal = materialCostTotal
|
8937
|
8937
|
}
|
|
@@ -8998,7 +8998,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
8998
|
8998
|
|
8999
|
8999
|
}
|
9000
|
9000
|
|
9001
|
|
- if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
|
|
9001
|
+ if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
|
9002
|
9002
|
treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
9003
|
9003
|
treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
9004
|
9004
|
treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
|
@@ -9011,7 +9011,7 @@ func (c *HisApiController) GetFaPiaoData() {
|
9011
|
9011
|
operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|
9012
|
9012
|
}
|
9013
|
9013
|
|
9014
|
|
- if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" { //材料费
|
|
9014
|
+ if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //材料费
|
9015
|
9015
|
materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
|
9016
|
9016
|
materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
|
9017
|
9017
|
materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
|