csx hace 3 años
padre
commit
344c4e87e9
Se han modificado 2 ficheros con 8 adiciones y 4 borrados
  1. 4 4
      controllers/his_api_controller.go
  2. 4 0
      models/his_print_models.go

+ 4 - 4
controllers/his_api_controller.go Ver fichero

5239
 				laboratoryCostSelfTotal = laboratoryCostTotal
5239
 				laboratoryCostSelfTotal = laboratoryCostTotal
5240
 			}
5240
 			}
5241
 
5241
 
5242
-			if item.MedChrgitmType == "05" { //治疗费
5242
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
5243
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5243
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5244
 				treatCostSelfTotal = treatCostTotal
5244
 				treatCostSelfTotal = treatCostTotal
5245
 			}
5245
 			}
5264
 				chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
5264
 				chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
5265
 			}
5265
 			}
5266
 
5266
 
5267
-			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
5267
+			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
5268
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5268
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5269
 				otherCostSelfTotal = otherCostTotal
5269
 				otherCostSelfTotal = otherCostTotal
5270
 			}
5270
 			}
5291
 				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5291
 				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5292
 			}
5292
 			}
5293
 
5293
 
5294
-			if item.MedChrgitmType == "05" { //治疗费
5294
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" { //治疗费
5295
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5295
 				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5296
 				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
5296
 				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
5297
 				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5297
 				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5321
 				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5321
 				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5322
 			}
5322
 			}
5323
 
5323
 
5324
-			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
5324
+			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
5325
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5325
 				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
5326
 				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
5326
 				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
5327
 				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
5327
 				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()

+ 4 - 0
models/his_print_models.go Ver fichero

4
 	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
4
 	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
5
 	UserOrgId              int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
5
 	UserOrgId              int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
6
 	Name                   string                  `gorm:"column:name" json:"name" form:"name"`
6
 	Name                   string                  `gorm:"column:name" json:"name" form:"name"`
7
+	Age                    string                  `gorm:"column:age" json:"age" form:"age"`
8
+	HomeAddress            string                  `gorm:"column:home_address" json:"home_address" form:"home_address"`
9
+	Phone                  string                  `gorm:"column:phone" json:"phone" form:"phone"`
7
 	Lapseto                int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
10
 	Lapseto                int64                   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
8
 	Status                 int64                   `gorm:"column:status" json:"status" form:"status"`
11
 	Status                 int64                   `gorm:"column:status" json:"status" form:"status"`
9
 	HisPrintPatient        HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
12
 	HisPrintPatient        HisPrintPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
13
+	HisHospitalCheckRecord HisHospitalCheckRecord  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
10
 	HisPrescriptionInfoTwo HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
14
 	HisPrescriptionInfoTwo HisPrescriptionInfoTwo  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
11
 	HisPrintPrescription   []*HisPrintPrescription `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescriptions"`
15
 	HisPrintPrescription   []*HisPrintPrescription `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescriptions"`
12
 }
16
 }