Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

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/app_version.go

@@ -6,6 +6,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -486,82 +487,83 @@ func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 //}
 
 type HisOrderTen struct {
-	ID                    int64     `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId          int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate    int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime                 int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                int64     `gorm:"column:status" json:"status" form:"status"`
-	Number                string    `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode               int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg               string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo                string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg                string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime           string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid           string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus           int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId               string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId                string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo                 string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName               string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno                string    `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend                  string    `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
-	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
-	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
-	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Decimal               float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
-	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
-	HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	Patients           Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId          int64                 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate    int64                 `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                 int64                 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64                 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	Number                string                `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode               int64                 `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg               string                `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                string                `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                string                `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime           string                `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid           string                `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus           int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                string                `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                 string                `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName               string                `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType           string                `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                string                `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                  string                `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                  string                `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  time.Time             `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64               `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string                `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string                `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string                `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string                `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string                `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string                `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64               `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64               `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64               `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64               `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64               `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64               `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64               `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64               `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64               `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64               `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64               `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64               `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64               `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay               float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay            float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt           float64               `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64               `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64               `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string                `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string                `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string                `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string                `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string                `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64                 `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64               `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string                `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64               `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64               `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64               `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64               `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64               `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64               `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string                `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string                `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	//HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	CardDesc string   `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisOrderTen) TableName() string {
@@ -783,6 +785,7 @@ type HisOrder9504 struct {
 	Decimal            float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
 	VmHisOrderInfo9504 []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
 	Patients           Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	CardDesc           string                `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisOrder9504) TableName() string {
@@ -907,7 +910,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("setl_time >= '2024-04-01 00:00:00' AND setl_time <= '2024-06-30 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
+	}).Where("setl_time >= '2024-07-01 00:00:00' AND setl_time <= '2024-09-30 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
@@ -941,7 +944,7 @@ func GetHisOrderDetail10106(start_time int64, end_time int64) (order []*HisOrder
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug")
 		})
-	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2  AND user_org_id = 10106", start_time, end_time).Find(&order).Order("setl_time").Error
+	}).Where("settle_accounts_date >= ? AND settle_accounts_date <= ? AND status = 1 AND order_status =2  AND user_org_id = 10265", start_time, end_time).Find(&order).Order("setl_time").Error
 	return
 }
 
@@ -1252,6 +1255,7 @@ type XtBaseDrugtwo struct {
 	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	IsZeroFlag                  int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (XtBaseDrugtwo) TableName() string {
@@ -1399,11 +1403,11 @@ func UpDateNumber(id int64, number string) {
 }
 
 func GetOrderinfo(org_id int64) (info []models.HisOrderInfo, err error) {
-	err = readDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and   advice_id = 0 and med_chrgitm_type = '09' and ctime >= 1717344000", org_id).Find(&info).Error
+	err = readDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and   advice_id = 0 and project_id = 0 and ctime >= 1726675200", org_id).Find(&info).Error
 	for _, in := range info {
 		var doc models.HisDoctorAdviceInfo
-		readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and feedetl_sn = ? and status = 1 and advice_date = 1717344000", org_id, in.FeedetlSn).First(&doc)
-		writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and feedetl_sn = ? and advice_id = 0 and med_chrgitm_type = '09' and ctime >= 1717344000", org_id, doc.FeedetlSn).Updates(map[string]interface{}{"advice_id": doc.ID})
+		readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and feedetl_sn = ? and status = 1 and advice_date >= 1726675200", org_id, in.FeedetlSn).First(&doc)
+		writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and feedetl_sn = ? and advice_id = 0 and   project_id = 0 and ctime >= 1726675200", org_id, doc.FeedetlSn).Updates(map[string]interface{}{"advice_id": doc.ID})
 	}
 	return
 }
@@ -1426,7 +1430,6 @@ type Result22 struct {
 }
 
 func Aaa() {
-
 	var inspections []Result22
 	readDb.Raw(`
         SELECT 
@@ -1457,7 +1460,7 @@ func Aaa() {
              JOIN xt_assessment_before_dislysis be 
              ON be.patient_id = xts.patient_id 
              AND DATE(FROM_UNIXTIME(xts.inspect_date)) = DATE(FROM_UNIXTIME(be.assessment_date))
-             WHERE xts.org_id = 10677 AND xts.item_id = 106770503) xts
+             WHERE xts.org_id = 10677 AND xts.item_id = 106770503 and xts.inspect_date >= 1725120000) xts
         JOIN
             (SELECT 
                 DATE(FROM_UNIXTIME(xt.inspect_date)) AS inspect_date,
@@ -1474,7 +1477,7 @@ func Aaa() {
              JOIN xt_assessment_after_dislysis ad 
              ON DATE(FROM_UNIXTIME(xt.inspect_date)) = DATE(FROM_UNIXTIME(ad.assessment_date)) 
              AND xt.patient_id = ad.patient_id 
-             WHERE xt.org_id = 10677 AND xt.item_id = 106771301 
+             WHERE xt.org_id = 10677 AND xt.item_id = 106771301  and  xt.inspect_date >= 1725120000
              AND ad.weight_after > 0 
              AND ad.actual_ultrafiltration > 0) b 
         ON xts.inspect_date = b.inspect_date 
@@ -1611,3 +1614,47 @@ func Aaa() {
 		writeDb.Create(&ins9)
 	}
 }
+
+func GetOrder11111() {
+	var info []models.HisOrder
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-08-01 00:00:00' and setl_time <= '2024-12-31 23:59:59'").Find(&info).Error
+	for _, in := range info {
+		var p models.HisPatient
+		var sss models.OutpatientServiceSick
+		readDb.Model(&models.HisPatient{}).Where("number = ?", in.MdtrtId).First(&p)
+		readDb.Model(&models.OutpatientServiceSick{}).Where("id = ?", p.SickType).First(&sss)
+		in.SickName = sss.ClassName
+		writeDb.Save(&in)
+		//writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? and feedetl_sn = ? and advice_id = 0 and med_chrgitm_type = '09' and ctime >= 1717344000", org_id, doc.FeedetlSn).Updates(map[string]interface{}{"advice_id": doc.ID})
+	}
+	return
+}
+
+func GetOrder111112() {
+	var info []models.HisOrder
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-11-23 00:00:00'").Find(&info).Error
+	for _, in := range info {
+		var p_info models.HisPrescriptionInfo
+		readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = 10138 and status = 1 and patient_id = ? and record_date = ?", in.PatientId, in.SettleAccountsDate).First(&p_info)
+		//readUserDb.Model(&models.UserAdminRole{}).Where("admin_user_id = ? and org_id = 10138", p_info.DoctorId)
+
+		diass := strings.Split(in.Diagnosis, ",")
+		var dia_name = ""
+		for _, dia := range diass {
+			var sss models.HisXtDiagnoseConfig
+			if len(dia) > 0 {
+				readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", dia).First(&sss)
+				if len(dia_name) == 0 {
+					dia_name = sss.ClassName
+				} else {
+					dia_name = dia_name + "," + sss.ClassName
+				}
+			}
+		}
+		if len(dia_name) > 0 {
+			in.WarnMsg = dia_name
+			writeDb.Save(&in)
+		}
+	}
+	return
+}

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"`
 }