提交代码

controllers/his_api_controller.go

@@ -874,69 +874,76 @@ func (c *HisApiController) GetTestOrder() {
 		break
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"diagnosis":                                   name,
-		"order_infos":                                 orderInfos,
-		"number":                                      order.MdtrtId,
-		"date":                                        order.SettleAccountsDate,
-		"charge_admin":                                charge_admin,
-		"printor_admin":                               printor_admin,
-		"info":                                        order,
-		"order":                                       order,
-		"bedCostTotal":                                bedCostTotal,
-		"bedCostSelfTotal":                            bedCostSelfTotal,
-		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-		"bedSelfTotal":                                bedSelfTotal,
-		"bedInscpTotal":                               bedInscpTotal,
-		"operationCostTotal":                          operationCostTotal,
-		"operationCostSelfTotal":                      operationCostSelfTotal,
-		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-		"operationSelfTotal":                          operationSelfTotal,
-		"operationInscpTotal":                         operationInscpTotal,
-		"otherCostTotal":                              otherCostTotal,
-		"otherCostSelfTotal":                          otherCostSelfTotal,
-		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-		"otherSelfTotal":                              otherSelfTotal,
-		"otherInscpTotal":                             otherInscpTotal,
-		"materialCostTotal":                           materialCostTotal,
-		"materialCostSelfTotal":                       materialCostSelfTotal,
-		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-		"materialSelfTotal":                           materialSelfTotal,
-		"materialInscpTotal":                          materialInscpTotal,
-		"westernMedicineCostTotal":                    westernMedicineCostTotal,
-		"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
-		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
-		"westernMedicineSelfTotal":                    westernMedicineSelfTotal,
-		"westernMedicineInscpTotal":                   westernMedicineInscpTotal,
+		"diagnosis":            name,
+		"order_infos":          orderInfos,
+		"number":               order.MdtrtId,
+		"date":                 order.SettleAccountsDate,
+		"charge_admin":         charge_admin,
+		"printor_admin":        printor_admin,
+		"info":                 order,
+		"order":                order,
+		"bedCostTotal":         bedCostTotal,
+		"bedCostSelfTotal":     bedCostSelfTotal,
+		"bedCostPartSelfTotal": bedCostPartSelfTotal,
+		"bedSelfTotal":         bedSelfTotal,
+		"bedInscpTotal":        bedInscpTotal,
+
+		"operationCostTotal":         operationCostTotal,
+		"operationCostSelfTotal":     operationCostSelfTotal,
+		"operationCostPartSelfTotal": operationCostPartSelfTotal,
+		"operationSelfTotal":         operationSelfTotal,
+		"operationInscpTotal":        operationInscpTotal,
+		"otherCostTotal":             otherCostTotal,
+		"otherCostSelfTotal":         otherCostSelfTotal,
+		"otherCostPartSelfTotal":     otherCostPartSelfTotal,
+		"otherSelfTotal":             otherSelfTotal,
+		"otherInscpTotal":            otherInscpTotal,
+		"materialCostTotal":          materialCostTotal,
+		"materialCostSelfTotal":      materialCostSelfTotal,
+		"materialCostPartSelfTotal":  materialCostPartSelfTotal,
+		"materialSelfTotal":          materialSelfTotal,
+		"materialInscpTotal":         materialInscpTotal,
+
+		"westernMedicineCostTotal":         westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":     westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal": westernMedicineCostPartSelfTotal,
+		"westernMedicineSelfTotal":         westernMedicineSelfTotal,
+		"westernMedicineInscpTotal":        westernMedicineInscpTotal,
+
 		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
 		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
 		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
 		"chineseTraditionalSelfTotal":                 chineseTraditionalSelfTotal,
 		"chineseTraditionalInscpTotal":                chineseTraditionalInscpTotal,
-		"checkCostTotal":                              checkCostTotal,
-		"checkCostSelfTotal":                          checkCostSelfTotal,
-		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-		"checkSelfTotal":                              checkSelfTotal,
-		"checkInscpTotal":                             checkInscpTotal,
-		"laboratoryCostTotal":                         laboratoryCostTotal,
-		"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-		"laboratorySelfTotal":                         laboratorySelfTotal,
-		"laboratoryInscpTotal":                        laboratoryInscpTotal,
-		"treatCostTotal":                              treatCostTotal,
-		"treatCostSelfTotal":                          treatCostSelfTotal,
-		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-		"treatSelfTotal":                              treatSelfTotal,
-		"treatInscpTotal":                             treatInscpTotal,
-		"doctor_info":                                 doctor_info,
-		"doctor_name":                                 doctor_name,
-		"health_card_no":                              order.PsnNo,
-		"yiliao_leibie":                               yiliao_leibie,
-		"patient":                                     patient,
-		"org_name":                                    miConfig.OrgName,
-		"org_code":                                    miConfig.Code,
-		"order_number":                                order.Number,
-		"his_hospital":                                his_hospital,
-		"dia_config":                                  dia_config,
+
+		"checkCostTotal":         checkCostTotal,
+		"checkCostSelfTotal":     checkCostSelfTotal,
+		"checkCostPartSelfTotal": checkCostPartSelfTotal,
+		"checkSelfTotal":         checkSelfTotal,
+		"checkInscpTotal":        checkInscpTotal,
+
+		"laboratoryCostTotal":         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal": laboratoryCostPartSelfTotal,
+		"laboratorySelfTotal":         laboratorySelfTotal,
+		"laboratoryInscpTotal":        laboratoryInscpTotal,
+
+		"treatCostTotal":         treatCostTotal,
+		"treatCostSelfTotal":     treatCostSelfTotal,
+		"treatCostPartSelfTotal": treatCostPartSelfTotal,
+		"treatSelfTotal":         treatSelfTotal,
+		"treatInscpTotal":        treatInscpTotal,
+
+		"doctor_info":    doctor_info,
+		"doctor_name":    doctor_name,
+		"health_card_no": order.PsnNo,
+		"yiliao_leibie":  yiliao_leibie,
+		"patient":        patient,
+		"org_name":       miConfig.OrgName,
+		"org_code":       miConfig.Code,
+		"order_number":   order.Number,
+		"his_hospital":   his_hospital,
+		"dia_config":     dia_config,
 	})
 
 }
@@ -1054,41 +1061,59 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 		}
 	}
 
-	var bedCostTotal float64 = 0 //床位总费
-	//var bedCostSelfTotal float64 = 0     //床位自费
+	var bedCostTotal float64 = 0         //床位总费
+	var bedCostSelfTotal float64 = 0     //床位自费
 	var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+	var bedSelfTotal float64 = 0         //床位部分项目自费
+	var bedInscpTotal float64 = 0        //床位部分项目自费
 
-	var operationCostTotal float64 = 0 //手术费
-	//var operationCostSelfTotal float64 = 0     //手术费
+	var operationCostTotal float64 = 0         //手术费
+	var operationCostSelfTotal float64 = 0     //手术费
 	var operationCostPartSelfTotal float64 = 0 //手术费
+	var operationSelfTotal float64 = 0         //床位部分项目自费
+	var operationInscpTotal float64 = 0        //床位部分项目自费
 
 	var otherCostTotal float64 = 0 //其他费用
 	//var otherCostSelfTotal float64 = 0     //其他费用
 	var otherCostPartSelfTotal float64 = 0 //其他费用
+	//var otherSelfTotal float64 = 0         //床位部分项目自费
+	//var otherInscpTotal float64 = 0        //床位部分项目自费
 
-	var materialCostTotal float64 = 0 //材料费
-	//var materialCostSelfTotal float64 = 0     //材料费
+	var materialCostTotal float64 = 0         //材料费
+	var materialCostSelfTotal float64 = 0     //材料费
 	var materialCostPartSelfTotal float64 = 0 //材料费
+	var materialSelfTotal float64 = 0         //床位部分项目自费
+	var materialInscpTotal float64 = 0        //床位部分项目自费
 
-	var westernMedicineCostTotal float64 = 0 //西药费
-	//var westernMedicineCostSelfTotal float64 = 0     //西药费
+	var westernMedicineCostTotal float64 = 0         //西药费
+	var westernMedicineCostSelfTotal float64 = 0     //西药费
 	var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+	var westernMedicineSelfTotal float64 = 0         //床位部分项目自费
+	var westernMedicineInscpTotal float64 = 0        //床位部分项目自费
 
-	var chineseTraditionalMedicineCostTotal float64 = 0 //中成药
-	//var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+	var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+	var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
 	var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+	var chineseTraditionalSelfTotal float64 = 0                 //床位部分项目自费
+	var chineseTraditionalInscpTotal float64 = 0                //床位部分项目自费
 
-	var checkCostTotal float64 = 0 //检查费
-	//var checkCostSelfTotal float64 = 0     //检查费
+	var checkCostTotal float64 = 0         //检查费
+	var checkCostSelfTotal float64 = 0     //检查费
 	var checkCostPartSelfTotal float64 = 0 //检查费
+	var checkSelfTotal float64 = 0         //床位部分项目自费
+	var checkInscpTotal float64 = 0        //床位部分项目自费
 
-	var laboratoryCostTotal float64 = 0 //化验费
-	//var laboratoryCostSelfTotal float64 = 0     //化验费
+	var laboratoryCostTotal float64 = 0         //化验费
+	var laboratoryCostSelfTotal float64 = 0     //化验费
 	var laboratoryCostPartSelfTotal float64 = 0 //化验费
+	var laboratorySelfTotal float64 = 0         //床位部分项目自费
+	var laboratoryInscpTotal float64 = 0        //床位部分项目自费
 
-	var treatCostTotal float64 = 0 //治疗费用
-	//var treatCostSelfTotal float64 = 0     //治疗费用
+	var treatCostTotal float64 = 0         //治疗费用
+	var treatCostSelfTotal float64 = 0     //治疗费用
 	var treatCostPartSelfTotal float64 = 0 //治疗费用
+	var treatSelfTotal float64 = 0         //床位部分项目自费
+	var treatInscpTotal float64 = 0        //床位部分项目自费
 
 	var zhenChaCostTotal float64 = 0 //其他费用
 	//var zhenChaCostPartSelfTotal float64 = 0 //其他费用
@@ -1096,113 +1121,115 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	decimal.DivisionPrecision = 2
 
 	for _, item := range orderInfos {
-		item.FulamtOwnpayAmt = item.DetItemFeeSumamt
-		if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
-			item.MedChrgitmType = "09"
-		}
-		if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
-			if item.HisPrescriptionProject.Type == 2 {
-				if c.GetAdminUserInfo().CurrentOrgId == 10215 {
-					fmt.Println("CostClassify")
-					fmt.Println(item.HisPrescriptionProject.VMHisProject.CostClassify)
-					switch item.HisPrescriptionProject.VMHisProject.CostClassify {
-					case 0:
-						item.MedChrgitmType = "0"
-						break
-					case 1:
-						item.MedChrgitmType = "14"
-						break
-					case 2:
-						item.MedChrgitmType = "05"
-
-						break
-					case 3:
-						item.MedChrgitmType = "03"
-
-						break
-					case 4:
-						item.MedChrgitmType = "03"
-
-						break
-					case 5:
-						item.MedChrgitmType = "08"
-
-						break
-					case 6:
-						item.MedChrgitmType = "14"
-
-						break
-					case 7:
-						item.MedChrgitmType = "14"
-
-						break
-					case 8:
-						item.MedChrgitmType = "03"
-						break
-					case 9:
-						item.MedChrgitmType = "14"
-						break
-					case 10:
-						item.MedChrgitmType = "14"
-						break
-					case 11:
-						item.MedChrgitmType = "06"
-						break
-					case 12:
-						item.MedChrgitmType = "12"
-						break
-					case 13:
-						item.MedChrgitmType = "01"
-						break
-					case 14:
-						item.MedChrgitmType = "04"
-						break
-					case 15:
-						item.MedChrgitmType = "14"
-						break
+		//item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+		if c.GetAdminUserInfo().CurrentOrgId != 10726 {
+			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+				item.MedChrgitmType = "09"
+			}
+			if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+				if item.HisPrescriptionProject.Type == 2 {
+					if c.GetAdminUserInfo().CurrentOrgId == 10215 {
+						fmt.Println("CostClassify")
+						fmt.Println(item.HisPrescriptionProject.VMHisProject.CostClassify)
+						switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+						case 0:
+							item.MedChrgitmType = "0"
+							break
+						case 1:
+							item.MedChrgitmType = "14"
+							break
+						case 2:
+							item.MedChrgitmType = "05"
 
-					}
+							break
+						case 3:
+							item.MedChrgitmType = "03"
 
-				} else {
-					switch item.HisPrescriptionProject.VMHisProject.CostClassify {
-					case 1:
-						item.MedChrgitmType = "14"
-						break
-					case 2:
-						item.MedChrgitmType = "05"
-
-						break
-					case 3:
-						item.MedChrgitmType = "04"
-
-						break
-					case 4:
-						item.MedChrgitmType = "14"
-
-						break
-					case 5:
-						item.MedChrgitmType = "08"
-
-						break
-					case 6:
-						item.MedChrgitmType = "14"
-						break
-					case 7:
-						item.MedChrgitmType = "14"
-						break
-					case 8:
-						item.MedChrgitmType = "03"
-						break
-					case 9:
-						item.MedChrgitmType = "14"
-						break
-					default:
-						item.MedChrgitmType = "14"
-						break
+							break
+						case 4:
+							item.MedChrgitmType = "03"
+
+							break
+						case 5:
+							item.MedChrgitmType = "08"
+
+							break
+						case 6:
+							item.MedChrgitmType = "14"
+
+							break
+						case 7:
+							item.MedChrgitmType = "14"
+
+							break
+						case 8:
+							item.MedChrgitmType = "03"
+							break
+						case 9:
+							item.MedChrgitmType = "14"
+							break
+						case 10:
+							item.MedChrgitmType = "14"
+							break
+						case 11:
+							item.MedChrgitmType = "06"
+							break
+						case 12:
+							item.MedChrgitmType = "12"
+							break
+						case 13:
+							item.MedChrgitmType = "01"
+							break
+						case 14:
+							item.MedChrgitmType = "04"
+							break
+						case 15:
+							item.MedChrgitmType = "14"
+							break
+
+						}
+
+					} else {
+						switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+						case 1:
+							item.MedChrgitmType = "14"
+							break
+						case 2:
+							item.MedChrgitmType = "05"
+
+							break
+						case 3:
+							item.MedChrgitmType = "04"
+
+							break
+						case 4:
+							item.MedChrgitmType = "14"
+
+							break
+						case 5:
+							item.MedChrgitmType = "08"
+
+							break
+						case 6:
+							item.MedChrgitmType = "14"
+							break
+						case 7:
+							item.MedChrgitmType = "14"
+							break
+						case 8:
+							item.MedChrgitmType = "03"
+							break
+						case 9:
+							item.MedChrgitmType = "14"
+							break
+						default:
+							item.MedChrgitmType = "14"
+							break
+						}
 					}
+				} else if item.HisPrescriptionProject.Type == 3 {
+					item.MedChrgitmType = "08"
 				}
-			} else if item.HisPrescriptionProject.Type == 3 {
-				item.MedChrgitmType = "08"
 			}
 		}
 	}
@@ -1213,8 +1240,11 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	for _, item := range orderInfos {
 		if item.MedChrgitmType == "01" { //床位费
 			bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			bedSelfTotal, _ = decimal.NewFromFloat(bedSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			bedInscpTotal, _ = decimal.NewFromFloat(bedInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 		if item.MedChrgitmType == "02" { //诊察费
 			zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
@@ -1223,50 +1253,83 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 
 		if item.MedChrgitmType == "03" { //检查费
 			checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			checkSelfTotal, _ = decimal.NewFromFloat(checkSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			checkInscpTotal, _ = decimal.NewFromFloat(checkInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "02" { //检查费
 			checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			checkSelfTotal, _ = decimal.NewFromFloat(checkSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			checkInscpTotal, _ = decimal.NewFromFloat(checkInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "04" { //化验费
 			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			laboratorySelfTotal, _ = decimal.NewFromFloat(laboratorySelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			laboratoryInscpTotal, _ = decimal.NewFromFloat(laboratoryInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "05" { //治疗费
 			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			treatSelfTotal, _ = decimal.NewFromFloat(treatSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			treatInscpTotal, _ = decimal.NewFromFloat(treatInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "06" { //手术费
 			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+			operationSelfTotal, _ = decimal.NewFromFloat(operationSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			operationInscpTotal, _ = decimal.NewFromFloat(operationInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" { //材料费
 			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+			materialSelfTotal, _ = decimal.NewFromFloat(materialSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			materialInscpTotal, _ = decimal.NewFromFloat(materialInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "09" { //西药费
+			fmt.Println("FulamtOwnpayAmt")
+
+			fmt.Println(item.FulamtOwnpayAmt)
+			fmt.Println("FulamtOwnpayAmt")
+
 			westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+			westernMedicineSelfTotal, _ = decimal.NewFromFloat(westernMedicineSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			westernMedicineInscpTotal, _ = decimal.NewFromFloat(westernMedicineInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "11" { //中成费
 			chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+			chineseTraditionalSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			chineseTraditionalInscpTotal, _ = decimal.NewFromFloat(chineseTraditionalInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
@@ -1299,51 +1362,77 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
 	patient, _ := service.GetFaPiaoPatientByID(order.UserOrgId, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"patient":                                     patient,
-		"order_infos":                                 orderInfos,
-		"diagnosis":                                   name,
-		"bedCostTotal":                                bedCostTotal,
-		"bedCostSelfTotal":                            bedCostTotal,
-		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-		"operationCostTotal":                          operationCostTotal,
-		"operationCostSelfTotal":                      operationCostTotal,
-		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-		"otherCostTotal":                              otherCostTotal,
-		"otherCostSelfTotal":                          otherCostTotal,
-		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-		"materialCostTotal":                           materialCostTotal,
-		"materialCostSelfTotal":                       materialCostTotal,
-		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-		"westernMedicineCostTotal":                    westernMedicineCostTotal,
-		"westernMedicineCostSelfTotal":                westernMedicineCostTotal,
-		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+		"patient":              patient,
+		"order_infos":          orderInfos,
+		"diagnosis":            name,
+		"bedCostTotal":         bedCostTotal,
+		"bedCostSelfTotal":     bedCostSelfTotal,
+		"bedCostPartSelfTotal": bedCostPartSelfTotal,
+
+		"bedSelfTotal":  bedSelfTotal,
+		"bedInscpTotal": bedInscpTotal,
+
+		"operationCostTotal":         operationCostTotal,
+		"operationCostSelfTotal":     operationCostSelfTotal,
+		"operationCostPartSelfTotal": operationCostPartSelfTotal,
+		"operationInscpTotal":        operationInscpTotal,
+		"operationSelfTotal":         operationSelfTotal,
+
+		"otherCostTotal": otherCostTotal,
+		//"otherCostSelfTotal":        otherCostSelfTotal,
+		"otherCostPartSelfTotal":    otherCostPartSelfTotal,
+		"materialCostTotal":         materialCostTotal,
+		"materialCostSelfTotal":     materialCostSelfTotal,
+		"materialCostPartSelfTotal": materialCostPartSelfTotal,
+		"materialSelfTotal":         materialSelfTotal,
+		"materialInscpTotal":        materialInscpTotal,
+
+		"westernMedicineCostTotal":         westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":     westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal": westernMedicineCostPartSelfTotal,
+		"westernMedicineSelfTotal":         westernMedicineSelfTotal,
+		"westernMedicineInscpTotal":        westernMedicineInscpTotal,
+
 		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
-		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostTotal,
+		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
 		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-		"checkCostTotal":                              checkCostTotal,
-		"checkCostSelfTotal":                          checkCostTotal,
-		"zhenChaCostTotal":                            zhenChaCostTotal,
-		"zhenChaCostSelfTotal":                        zhenChaCostTotal,
-		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-		"laboratoryCostTotal":                         laboratoryCostTotal,
-		"laboratoryCostSelfTotal":                     laboratoryCostTotal,
-		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-		"treatCostTotal":                              treatCostTotal,
-		"treatCostSelfTotal":                          treatCostTotal,
-		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-		"charge_admin":                                charge_admin,
-		"printor_admin":                               printor_admin,
-		"org_name":                                    org.OrgName,
-		"org_code":                                    miConfig.Code,
-		"name":                                        patient.Name,
-		"number":                                      order.MdtrtId,
-		"date":                                        order.SettleAccountsDate,
-		"info":                                        order,
-		"new_order":                                   order,
-		"his_hospital":                                his_hospital,
-		"his":                                         his,
-		"funds":                                       rf,
-		"dia_config":                                  dia_config,
+		"chineseTraditionalSelfTotal":                 chineseTraditionalSelfTotal,
+		"chineseTraditionalInscpTotal":                chineseTraditionalInscpTotal,
+
+		"checkCostTotal":         checkCostTotal,
+		"checkCostSelfTotal":     checkCostSelfTotal,
+		"checkSelfTotal":         checkSelfTotal,
+		"checkInscpTotal":        checkInscpTotal,
+		"checkCostPartSelfTotal": checkCostPartSelfTotal,
+
+		"zhenChaCostTotal":     zhenChaCostTotal,
+		"zhenChaCostSelfTotal": zhenChaCostTotal,
+
+		"laboratoryCostTotal":         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal": laboratoryCostPartSelfTotal,
+		"laboratorySelfTotal":         laboratorySelfTotal,
+		"laboratoryInscpTotal":        laboratoryInscpTotal,
+
+		"treatCostTotal":         treatCostTotal,
+		"treatCostSelfTotal":     treatCostSelfTotal,
+		"treatCostPartSelfTotal": treatCostPartSelfTotal,
+		"treatSelfTotal":         treatSelfTotal,
+		"treatInscpTotal":        treatInscpTotal,
+
+		"charge_admin":  charge_admin,
+		"printor_admin": printor_admin,
+		"org_name":      org.OrgName,
+		"org_code":      miConfig.Code,
+		"name":          patient.Name,
+		"number":        order.MdtrtId,
+		"date":          order.SettleAccountsDate,
+		"info":          order,
+		"new_order":     order,
+		"his_hospital":  his_hospital,
+		"his":           his,
+		"funds":         rf,
+		"dia_config":    dia_config,
 	})
 
 }

service/his_service.go

@@ -2026,24 +2026,28 @@ func (HisPrescriptionProject) TableName() string {
 }
 
 type HisOrderInfo struct {
-	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber            string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate             int64                  `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId               int64                  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt       float64                `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt                    float64                `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric                   float64                `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId              int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	MedChrgitmType         string                 `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
-	FeedetlSn              string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	ChldMedcFlag           string                 `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	ChrgitmLv              string                 `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId              int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	ProjectId              int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	SelfpayProp            float64                `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
-	ItemId                 int64                  `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	FulamtOwnpayAmt        float64                `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt      float64 `json:"inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }
@@ -2869,23 +2873,27 @@ func UpDateOrderTwo(order *models.HisOrder, tx *gorm.DB) (err error) {
 }
 
 type HisOrderInfoTen struct {
-	ID                     int64                      `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber            string                     `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate             int64                      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId               int64                      `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt       float64                    `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt                    float64                    `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric                   float64                    `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId              int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	MedChrgitmType         string                     `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	Status                 int64                      `gorm:"column:status" json:"status" form:"status"`
-	FeedetlSn              string                     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	ChldMedcFlag           string                     `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	ChrgitmLv              string                     `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId              int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	ProjectId              int64                      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId                 int64                      `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	FulamtOwnpayAmt        float64                    `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt      float64 `json:"inscp_scp_amt"`
+
 	HisPrescriptionProject HisPrescriptionProject     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    models.HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }
@@ -2925,23 +2933,28 @@ func GetHisPrescriptonProjectById(id int64) (models.HisPrescriptionProject, erro
 }
 
 type HisOrderInfoTwo struct {
-	ID                     int64                      `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber            string                     `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate             int64                      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId               int64                      `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt       float64                    `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt                    float64                    `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric                   float64                    `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId              int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	MedChrgitmType         string                     `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	Status                 int64                      `gorm:"column:status" json:"status" form:"status"`
-	FeedetlSn              string                     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	ChldMedcFlag           string                     `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	ChrgitmLv              string                     `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId              int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	ProjectId              int64                      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId                 int64                      `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	FulamtOwnpayAmt        float64                    `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+
+	InscpScpAmt float64 `json:"inscp_scp_amt"`
+
 	HisPrescriptionProject HisPrescriptionProject     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    models.HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }