11月8日库存管理

controllers/his_summary_controller.go

@@ -3,9 +3,7 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/service"
-	"fmt"
 	"github.com/astaxie/beego"
-	"github.com/shopspring/decimal"
 	"time"
 )
 
@@ -94,449 +92,523 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	//查询该病人这段时间的记录单号
-	orderInfo, _ := service.GetGatherHisOrder(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
-
-	org_id := this.GetAdminUserInfo().CurrentOrgId
-	appid := this.GetAdminUserInfo().CurrentAppId
-	var order_info []*service.HisOrderInfo
-
-	var MdtrtId string
-
-	patient, _ := service.GetPatientByID(org_id, patient_id)
-	for _, item := range orderInfo {
-		orderinfo, _ := service.GetHisOrderDetailByNumber(item.Number, org_id)
-		//number = item.Number
-		MdtrtId = item.MdtrtId
-		for _, it := range orderinfo {
-
-			order_info = append(order_info, it)
-		}
-	}
-	his, _ := service.GetHisPatientInfoFive(org_id, patient_id, startRecordDateTime, endRecordDateTime)
-
-	record, _ := service.GetInHospitalRecordByNumber(MdtrtId)
-
-	//获取所有客户
-	adminInfo, _ := service.GetAllDoctorSix(org_id, appid)
-
-	//获取最后一次排班
-	schedule, _ := service.GetHisSchedule(patient_id, org_id, startRecordDateTime, endRecordDateTime)
-	fmt.Println("scheudlwe3223333232233232232323232323232323", schedule)
-	bedNumber, _ := service.GetAllBedNumberSix(org_id)
-	var bedCostTotal float64 = 0 //床位总费
-
-	var operationCostTotal float64 = 0 //手术费
-
-	var otherCostTotal float64 = 0 //其他费用
-
-	var materialCostTotal float64 = 0 //材料费
-
-	var westernMedicineCostTotal float64 = 0 //西药费
-
-	var chineseTraditionalMedicineCostTotal float64 = 0 //中成药
-
-	var checkCostTotal float64 = 0 //检查费
-
-	var laboratoryCostTotal float64 = 0 //化验费
-
-	var treatCostTotal float64 = 0 //治疗费用
+	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
 
-	var zhenChaCostTotal float64 = 0 //其他费用
+	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
-	decimal.DivisionPrecision = 2
-	var BalanceAccountsType int64
-	if his.ID > 0 {
-		BalanceAccountsType = his.BalanceAccountsType
-	} else {
-		BalanceAccountsType = record.BalanceAccountsType
-	}
+	order, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
-	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+	his_record_patient, _ := service.GetHisSummaryPatientInfoSix(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
 	//获取所有的科室
 	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
 
-	//统计
-	prescription, _ := service.GetHisPrescriptionTenty(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
-
-	//orderlist, _ := service.GetHisChargeOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
-
 	var medicalInsuranceLevel = "医保等级"
 	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
 	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, adminUser.CurrentOrgId)
-	if BalanceAccountsType != 2 && BalanceAccountsType > 0 {
-		for _, item := range order_info {
-			if org_id == 10215 {
-				if item.MedChrgitmType == "01" { //床位费
-					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-				if item.MedChrgitmType == "02" { //诊察费
-					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-				if item.MedChrgitmType == "03" { //检查费
-					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-
-				if item.MedChrgitmType == "04" { //化验费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
-					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-
-				if item.MedChrgitmType == "06" { //手术费
-					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "08" { //材料费
-					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUser.CurrentOrgId)
+	var costClassify = "费用类别"
+	costClassifyParent, _ := service.GetDrugDataConfig(0, costClassify)
+	costClassifyList, _ := service.GetParentDataConfig(costClassifyParent.ID, adminUser.CurrentOrgId)
+	doctorlist, _ := service.GetAllDoctorSix(adminUser.CurrentOrgId, adminUser.CurrentAppId)
 
-				if item.MedChrgitmType == "09" { //西药费
-					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "11" { //中成费
-					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
-					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-			} else if org_id == 10188 || org_id == 10217 {
-				if item.MedChrgitmType == "01" { //床位费
-					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-				if item.MedChrgitmType == "02" { //诊察费
-					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-				if item.MedChrgitmType == "03" { //检查费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "04" { //化验费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
-					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "06" { //手术费
-					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "08" { //材料费
-					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "09" { //西药费
-					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "11" { //中成费
-					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
-					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-			} else {
-
-				if item.MedChrgitmType == "01" { //床位费
-					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-
-				if item.MedChrgitmType == "03" { //检查费
-					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "04" { //化验费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
-
-				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
-					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "06" { //手术费
-					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "08" { //材料费
-					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "09" { //西药费
-					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "11" { //中成费
-					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
-					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-
-				}
+	//获取最后一次排班
+	schedule, _ := service.GetHisSchedule(patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	bedNumber, _ := service.GetAllBedNumberSix(adminUser.CurrentOrgId)
+	orderInfo, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
-			}
-		}
+	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"order":                               orderInfo,
-			"order_info":                          order_info,
-			"patient":                             patient,
-			"admin_info":                          adminInfo,
-			"his_hospital":                        record,
-			"bedCostTotal":                        bedCostTotal,
-			"operationCostTotal":                  operationCostTotal,
-			"otherCostTotal":                      otherCostTotal,
-			"materialCostTotal":                   materialCostTotal,
-			"westernMedicineCostTotal":            westernMedicineCostTotal,
-			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
-			"checkCostTotal":                      checkCostTotal,
-			"zhenChaCostTotal":                    zhenChaCostTotal,
-			"laboratoryCostTotal":                 laboratoryCostTotal,
-			"treatCostTotal":                      treatCostTotal,
-			"his_patient":                         his_patient,
-			"hisDepatment":                        hisDepatment,
-			"prescription":                        prescription,
-			"schedule":                            schedule,
-			"bedNumber":                           bedNumber,
+			"list":                      list,
+			"patient":                   patient,
+			"his_patient":               his_patient,
+			"hisDepatment":              hisDepatment,
+			"order":                     order,
+			"his_record_patient":        his_record_patient,
+			"medicalInsuranceLevelList": medicalInsuranceLevelList,
+			"drugTypeList":              drugTypeList,
+			"costClassifyList":          costClassifyList,
+			"doctorlist":                doctorlist,
+			"schedule":                  schedule,
+			"bedNumber":                 bedNumber,
+			"orderInfo":                 orderInfo,
 		})
+		return
 	} else {
-		for _, item := range order_info {
-
-			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 this.GetAdminUserInfo().CurrentOrgId == 10215 {
-						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
-
-						}
-
-					} 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
-						}
-					}
-				} else if item.HisPrescriptionProject.Type == 3 {
-					item.MedChrgitmType = "08"
-				}
-			}
-		}
-
-		for _, item := range order_info {
-			if org_id == 10215 {
-				if item.MedChrgitmType == "01" { //床位费
-					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-				if item.MedChrgitmType == "02" { //诊察费
-					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "03" { //检查费
-					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "04" { //化验费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
-					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "06" { //手术费
-					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "08" { //材料费
-					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "09" { //西药费
-					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "11" { //中成费
-					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
-					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-			} else {
-
-				if item.MedChrgitmType == "01" { //床位费
-					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "03" { //检查费
-					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "04" { //化验费
-					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
-					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "06" { //手术费
-					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "08" { //材料费
-					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "09" { //西药费
-					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "11" { //中成费
-					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
-					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				}
-
-			}
-
-		}
-
-		this.ServeSuccessJSON(map[string]interface{}{
-			"order":                               orderInfo,
-			"order_info":                          order_info,
-			"patient":                             patient,
-			"admin_info":                          adminInfo,
-			"his_hospital":                        record,
-			"bedCostTotal":                        bedCostTotal,
-			"operationCostTotal":                  operationCostTotal,
-			"otherCostTotal":                      otherCostTotal,
-			"materialCostTotal":                   materialCostTotal,
-			"westernMedicineCostTotal":            westernMedicineCostTotal,
-			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
-			"checkCostTotal":                      checkCostTotal,
-			"zhenChaCostTotal":                    zhenChaCostTotal,
-			"laboratoryCostTotal":                 laboratoryCostTotal,
-			"treatCostTotal":                      treatCostTotal,
-			"his_patient":                         his_patient,
-			"hisDepatment":                        hisDepatment,
-			"prescription":                        prescription,
-			"balanceAccountsType":                 BalanceAccountsType,
-			"medicalInsuranceLevelList":           medicalInsuranceLevelList,
-			"schedule":                            schedule,
-			"bedNumber":                           bedNumber,
-		})
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
 
 	}
 }
 
+//func (this *HisSummaryApiController) GetGatherDetaiList() {
+//
+//	start_time := this.GetString("start_time")
+//	end_time := this.GetString("end_time")
+//	keyword := this.GetString("keyword")
+//	item_type, _ := this.GetInt64("type")
+//	patient_id, _ := this.GetInt64("patient_id")
+//	adminUser := this.GetAdminUserInfo()
+//
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+//	if err != nil {
+//
+//	}
+//	startRecordDateTime := startTime.Unix()
+//
+//	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+//	if err != nil {
+//
+//	}
+//	endRecordDateTime := endTime.Unix()
+//
+//	//查询该病人这段时间的记录单号
+//	orderInfo, _ := service.GetGatherHisOrder(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+//
+//	org_id := this.GetAdminUserInfo().CurrentOrgId
+//	appid := this.GetAdminUserInfo().CurrentAppId
+//	var order_info []*service.HisOrderInfo
+//
+//	var MdtrtId string
+//
+//	patient, _ := service.GetPatientByID(org_id, patient_id)
+//	for _, item := range orderInfo {
+//		orderinfo, _ := service.GetHisOrderDetailByNumber(item.Number, org_id)
+//		MdtrtId = item.MdtrtId
+//		for _, it := range orderinfo {
+//
+//			order_info = append(order_info, it)
+//		}
+//	}
+//	his, _ := service.GetHisPatientInfoFive(org_id, patient_id, startRecordDateTime, endRecordDateTime)
+//
+//	record, _ := service.GetInHospitalRecordByNumber(MdtrtId)
+//
+//	//获取所有客户
+//	adminInfo, _ := service.GetAllDoctorSix(org_id, appid)
+//
+//	//获取最后一次排班
+//	schedule, _ := service.GetHisSchedule(patient_id, org_id, startRecordDateTime, endRecordDateTime)
+//
+//	bedNumber, _ := service.GetAllBedNumberSix(org_id)
+//	var bedCostTotal float64 = 0 //床位总费
+//
+//	var operationCostTotal float64 = 0 //手术费
+//
+//	var otherCostTotal float64 = 0 //其他费用
+//
+//	var materialCostTotal float64 = 0 //材料费
+//
+//	var westernMedicineCostTotal float64 = 0 //西药费
+//
+//	var chineseTraditionalMedicineCostTotal float64 = 0 //中成药
+//
+//	var checkCostTotal float64 = 0 //检查费
+//
+//	var laboratoryCostTotal float64 = 0 //化验费
+//
+//	var treatCostTotal float64 = 0 //治疗费用
+//
+//	var zhenChaCostTotal float64 = 0 //其他费用
+//
+//	decimal.DivisionPrecision = 2
+//	var BalanceAccountsType int64
+//	if his.ID > 0 {
+//		BalanceAccountsType = his.BalanceAccountsType
+//	} else {
+//		BalanceAccountsType = record.BalanceAccountsType
+//	}
+//
+//	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+//
+//	//获取所有的科室
+//	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
+//
+//	//统计
+//	prescription, _ := service.GetHisPrescriptionTenty(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
+//
+//	//orderlist, _ := service.GetHisChargeOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
+//
+//	var medicalInsuranceLevel = "医保等级"
+//	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+//	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, adminUser.CurrentOrgId)
+//	if BalanceAccountsType != 2 && BalanceAccountsType > 0 {
+//		for _, item := range order_info {
+//			if org_id == 10215 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else if org_id == 10188 || org_id == 10217 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "03" { //检查费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else {
+//
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//			}
+//		}
+//		this.ServeSuccessJSON(map[string]interface{}{
+//			"order":                               orderInfo,
+//			"order_info":                          order_info,
+//			"patient":                             patient,
+//			"admin_info":                          adminInfo,
+//			"his_hospital":                        record,
+//			"bedCostTotal":                        bedCostTotal,
+//			"operationCostTotal":                  operationCostTotal,
+//			"otherCostTotal":                      otherCostTotal,
+//			"materialCostTotal":                   materialCostTotal,
+//			"westernMedicineCostTotal":            westernMedicineCostTotal,
+//			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
+//			"checkCostTotal":                      checkCostTotal,
+//			"zhenChaCostTotal":                    zhenChaCostTotal,
+//			"laboratoryCostTotal":                 laboratoryCostTotal,
+//			"treatCostTotal":                      treatCostTotal,
+//			"his_patient":                         his_patient,
+//			"hisDepatment":                        hisDepatment,
+//			"prescription":                        prescription,
+//			"schedule":                            schedule,
+//			"bedNumber":                           bedNumber,
+//		})
+//	} else {
+//		for _, item := range order_info {
+//
+//			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 this.GetAdminUserInfo().CurrentOrgId == 10215 {
+//						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
+//
+//						}
+//
+//					} 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
+//						}
+//					}
+//				} else if item.HisPrescriptionProject.Type == 3 {
+//					item.MedChrgitmType = "08"
+//				}
+//			}
+//		}
+//
+//		for _, item := range order_info {
+//			if org_id == 10215 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else {
+//
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			}
+//
+//		}
+//
+//		this.ServeSuccessJSON(map[string]interface{}{
+//			"order":                               orderInfo,
+//			"order_info":                          order_info,
+//			"patient":                             patient,
+//			"admin_info":                          adminInfo,
+//			"his_hospital":                        record,
+//			"bedCostTotal":                        bedCostTotal,
+//			"operationCostTotal":                  operationCostTotal,
+//			"otherCostTotal":                      otherCostTotal,
+//			"materialCostTotal":                   materialCostTotal,
+//			"westernMedicineCostTotal":            westernMedicineCostTotal,
+//			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
+//			"checkCostTotal":                      checkCostTotal,
+//			"zhenChaCostTotal":                    zhenChaCostTotal,
+//			"laboratoryCostTotal":                 laboratoryCostTotal,
+//			"treatCostTotal":                      treatCostTotal,
+//			"his_patient":                         his_patient,
+//			"hisDepatment":                        hisDepatment,
+//			"prescription":                        prescription,
+//			"balanceAccountsType":                 BalanceAccountsType,
+//			"medicalInsuranceLevelList":           medicalInsuranceLevelList,
+//			"schedule":                            schedule,
+//			"bedNumber":                           bedNumber,
+//		})
+//
+//	}
+//}
+
 func (this *HisSummaryApiController) GetDetailPatients() {
 
 	keyword := this.GetString("keyword")

models/his_charge_models.go

@@ -28,6 +28,7 @@ type HisChargeDoctorAdviceInfo struct {
 	Status                int64  `gorm:"column:status" json:"status" form:"status"`
 	DrugId                int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Remark                string `gorm:"column:remark" json:"remark" form:"remark"`
+	AdviceDate            int64  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
 	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
@@ -167,9 +168,11 @@ func (HisChargeSettleOrder) TableName() string {
 }
 
 type HisChargeProject struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Unit        string `gorm:"column:unit" json:"unit" form:"unit"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
+	MedicalCoverage int64  `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	CostClassify    int64  `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
 }
 
 func (HisChargeProject) TableName() string {
@@ -177,12 +180,13 @@ func (HisChargeProject) TableName() string {
 }
 
 type HisChargeGoodInfo struct {
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName           string `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodUnit           int64  `gorm:"column:good_unit" json:"good_unit"`
-	SpecificationnName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	RegisterNumber     string `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	PackingUnit        string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName              string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit              int64  `gorm:"column:good_unit" json:"good_unit"`
+	SpecificationnName    string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	RegisterNumber        string `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	PackingUnit           string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	MedicalInsuranceLevel int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 }
 
 func (HisChargeGoodInfo) TableName() string {

service/his_summary_service.go

@@ -16,9 +16,9 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 						return db.Preload("Drug", "status = 1").Where("status = 1 ")
 					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
 					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit,remark").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,project_name,unit").Where("status = 1 ")
+						return db.Select("id,project_name,unit,medical_coverage,cost_classify").Where("status = 1 ")
 					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,good_name,good_unit,specification_name,packing_unit").Where("status = 1 ")
+						return db.Select("id,good_name,good_unit,specification_name,packing_unit,medical_insurance_level").Where("status = 1 ")
 					}).Where("status = 1 ")
 				})
 			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)