11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -1696,6 +1696,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	way_type, _ := c.GetInt64("way_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1739,7 +1740,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 
 	}
 
-	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id)
+	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type)
 
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)

controllers/his_summary_controller.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/enums"
 	"XT_New/service"
 	"github.com/astaxie/beego"
+	"github.com/shopspring/decimal"
 	"time"
 )
 
@@ -15,7 +16,7 @@ func HisSummaryApiRegistRouters() {
 
 	beego.Router("/api/gethissummarydetaillist", &HisSummaryApiController{}, "Get:GetHisSummaryDetailList")
 	beego.Router("/api/his/getgatherdetailist", &HisSummaryApiController{}, "Get:GetGatherDetaiList")
-
+	beego.Router("/api/his/getdetailpatients", &HisSummaryApiController{}, "Get:GetDetailPatients")
 }
 
 func (this *HisSummaryApiController) GetHisSummaryDetailList() {
@@ -42,9 +43,18 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 	endRecordDateTime := endTime.Unix()
 
 	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+
+	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	//获取所有的科室
+	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":         list,
+			"patient":      patient,
+			"his_patient":  his_patient,
+			"hisDepatment": hisDepatment,
 		})
 		return
 	} else {
@@ -77,13 +87,446 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	list, err := service.GetAdviceGatherDetaiList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	//查询该病人这段时间的记录单号
+	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)
+
+	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)
+
+	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()
+				}
 
-	detailList, _ := service.GetProjectGatherDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+				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,
+		})
+	} 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,
+		})
+
+	}
+}
+
+func (this *HisSummaryApiController) GetDetailPatients() {
+
+	keyword := this.GetString("keyword")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	patients, err := service.GetDetailPatients(keyword, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"detailList": detailList,
-			"list":       list,
+			"patient": patients,
 		})
 		return
 	} else {

controllers/stock_in_api_controller.go

@@ -1530,6 +1530,7 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	way_type, _ := c.GetInt64("way_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1571,7 +1572,7 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 		}
 
 	}
-	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id)
+	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)
 	if err == nil {

models/his_charge_models.go

@@ -1,15 +1,15 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count      string `gorm:"column:count" json:"count" form:"count"`
-	Type       int64  `gorm:"column:type" json:"type" form:"type"`
-
+	ID                int64             `gorm:"column:id" json:"id" form:"id"`
+	ProjectId         int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId         int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status            int64             `gorm:"column:status" json:"status" form:"status"`
+	PatientId         int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate        int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count             string            `gorm:"column:count" json:"count" form:"count"`
+	Type              int64             `gorm:"column:type" json:"type" form:"type"`
+	Unit              string            `gorm:"column:unit" json:"unit" form:"unit"`
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 }
@@ -19,13 +19,14 @@ func (HisChargePrescriptionProject) TableName() string {
 }
 
 type HisChargeDoctorAdviceInfo 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"`
-	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AdviceName string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Drug       Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceName            string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumberUnit string `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+	DrugId                int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {
@@ -92,6 +93,10 @@ type HisChargeOrder struct {
 	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
 	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
 	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HifesPay           float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	MafPay             float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	FundPaySumamt      float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	AcctPay            float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 }
 
@@ -175,6 +180,7 @@ type HisChargeGoodInfo struct {
 	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"`
 }
 
 func (HisChargeGoodInfo) TableName() string {

models/his_summary_models.go

@@ -1,5 +1,7 @@
 package models
 
+import "time"
+
 type HisPrescriptionModeTemplate 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"`
@@ -132,3 +134,247 @@ type HisPrescriptionProjectModeTemplate struct {
 func (HisPrescriptionProjectModeTemplate) TableName() string {
 	return "his_prescription_project_mode_template"
 }
+
+type VmHisOrderInfo 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"`
+	PricUplmtAmt           float64                     `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp            float64                     `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	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"`
+	BasMednFlag            string                      `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType         string                      `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag         string                      `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status                 int64                       `gorm:"column:status" json:"status" form:"status"`
+	Memo                   string                      `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn              string                      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime                  int64                       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt            float64                     `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag            string                      `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime                  int64                       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag         string                      `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag           string                      `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag            string                      `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_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"`
+	HisPatientId           int64                       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId                int64                       `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId              int64                       `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                   int64                       `gorm:"column:type" json:"type" form:"type"`
+	ItemId                 int64                       `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SettleType             int64                       `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	HisPrescriptionProject []*VmHisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"vmproject"`
+	HisDoctorAdviceInfo    []*VmHisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"vmadvice"`
+}
+
+func (VmHisOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+type VmHisPrescriptionProject struct {
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string  `gorm:"column:day" json:"day" form:"day"`
+	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+}
+
+func (VmHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
+type VmHisDoctorAdviceInfo 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"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+}
+
+func (VmHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type GatherHisOrder 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"`
+	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"`
+	IsMedicineInsurance     int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	SettleType              int64     `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime         int64     `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime           int64     `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Creator                 int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64     `gorm:"column:modify" json:"modify" form:"modify"`
+	SzChargeInfo            string    `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string    `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string    `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	AccountPrice            float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	MzNumber                string    `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber           string    `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	YiliaoNumber            string    `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	RefundLog               string    `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog               string    `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+	RequestLog              string    `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog        string    `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	FaPiaoCode              string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber            string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	PType                   int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre                   int64     `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis               string    `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId     int64     `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	Decimal                 float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+}
+
+func (GatherHisOrder) TableName() string {
+	return "his_order"
+}

service/his_service.go

@@ -1726,24 +1726,23 @@ 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"`
-	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"`
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }

service/his_summary_service.go

@@ -18,10 +18,10 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 							Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 								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").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
+								return db.Select("id,good_name,good_unit,specification_name,packing_unit").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)
@@ -79,10 +79,10 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 		}
 
 	} else {
-		keyword := "%" + keyword + "%"
+		//	keyword := "%" + keyword + "%"
 		switch item_type {
 		case 0:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -95,11 +95,11 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 							}).Where("status = 1 ")
 						})
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
-
+			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 			break
+
 		case 1:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and AND orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and ", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -112,11 +112,11 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 							}).Where("status = 1 ")
 						})
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 			break
 		case 2:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and  orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -127,11 +127,11 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 							}).Where("status = 1 ")
 						})
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 			break
 		case 3:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -142,7 +142,7 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 							}).Where("status = 1 ")
 						})
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
+			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 			break
 
@@ -264,12 +264,12 @@ func DelelteHisPrescriptionInfoModeTemplate(id int64, user_org_id int64) (err er
 	return
 }
 
-func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.VmHisOrderInfo, err error) {
 
 	db := XTReadDB().Model(&orderInfo).Where("status = 1")
 
 	if org_id > 0 {
-		db = db.Where("user_org_id = ?", org_id)
+		db = db.Where("user_org_id = ? and advice_id > 0", org_id)
 	}
 	if start_time > 0 {
 		db = db.Where("ctime >=?", start_time)
@@ -277,15 +277,15 @@ func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64,
 	if end_time > 0 {
 		db = db.Where("ctime <=?", end_time)
 	}
-	err = db.Group("advice_id").Find(&orderInfo).Error
+	err = db.Preload("VmHisDoctorAdviceInfo", "patient_id = ? and advice_date>=? and advice_date<=?", patient_id, start_time, end_time).Group("advice_id").Scan(&orderInfo).Error
 	return orderInfo, err
 }
 
-func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.VmHisOrderInfo, err error) {
 	db := XTReadDB().Model(&orderInfo).Where("status = 1")
 
 	if org_id > 0 {
-		db = db.Where("user_org_id = ?", org_id)
+		db = db.Where("user_org_id = ? and project_id > 0", org_id)
 	}
 	if start_time > 0 {
 		db = db.Where("ctime >=?", start_time)
@@ -293,6 +293,123 @@ func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int6
 	if end_time > 0 {
 		db = db.Where("ctime <=?", end_time)
 	}
-	err = db.Group("project_id").Find(&orderInfo).Error
+	err = db.Group("project_id").Preload("HisPrescriptionProject", "patient_id = ? and record_date>=? and record_date<=?", patient_id, start_time, end_time).Find(&orderInfo).Error
 	return orderInfo, err
 }
+
+func GetGatherHisOrder(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (order []*models.GatherHisOrder, err error) {
+
+	db := XTReadDB().Model(&order).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if len(keyword) > 0 {
+
+	}
+
+	err = db.Find(&order).Error
+
+	return order, err
+}
+
+func GetGatherHisOrderTwo(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (models.GatherHisOrder, error) {
+
+	hisOrder := models.GatherHisOrder{}
+	db := XTReadDB().Model(&hisOrder).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if len(keyword) > 0 {
+
+	}
+
+	err = db.Last(&hisOrder).Error
+
+	return hisOrder, err
+}
+
+func GetHisSummaryPatientInfo(org_id int64, patient_id int64, start_time int64, end_time int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? AND  record_date <= ? AND patient_id = ?", org_id, start_time, end_time, patient_id).Last(&info).Error
+	return
+}
+
+func GetDetailPatients(keywords string, org_id int64) (patients []*models.ChargePatientTwo, err error) {
+	if len(keywords) == 0 {
+		err = readDb.Model(&models.ChargePatientTwo{}).Where("user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+	}
+
+	if len(keywords) > 0 {
+		keyword := "%" + keywords + "%"
+		err = readDb.Model(&models.ChargePatientTwo{}).Where("user_org_id = ? AND status = 1 and name like ?", org_id, keyword).Find(&patients).Error
+	}
+
+	return
+}
+
+func GetHisDepatment(user_org_id int64) (hisdepartment []*models.XtHisDepartment, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&hisdepartment).Error
+	return hisdepartment, err
+}
+
+func GetHisPatientInfoFive(org_id int64, patient_id int64, startime int64, endtime int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 and patient_id = ? AND record_date >= ? and record_date <=?", org_id, patient_id, startime, endtime).Last(&info).Error
+	return
+}
+
+func GetHisPrescriptionTenty(org_id int64, patient_id int64, start_time int64, end_time int64, keyword string, item_type int64) (prescription []*models.HisPrescription, err error) {
+
+	db := readDb.Model(&models.HisPrescription{}).Where("status = 1")
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("record_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <=?", end_time)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if len(keyword) > 0 {
+		err = db.Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).Find(&prescription).Error
+	} else {
+		err = db.Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+			Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).Find(&prescription).Error
+	}
+
+	return
+}

service/stock_service.go

@@ -1530,7 +1530,7 @@ func FindAllWarehouseOutList(orgId int64, page int64, limit int64, startTime int
 
 }
 
-func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*models.WarehouseOut, total int64, err error) {
+func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.WarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.WarehouseOut{})
 	db = db.Where("xt_warehouse_out.org_id = ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.type = ?", orgId, types)
 
@@ -1549,6 +1549,18 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 	if storehouse_id > 0 {
 		db = db.Where("xt_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
+	if way_type == 0 {
+		db = db.Where("xt_warehouse_out.is_sys = 0 || xt_warehouse_out.is_sys = 1 || xt_warehouse_out.is_sys = 12")
+	}
+	if way_type == 1 {
+		db = db.Where("xt_warehouse_out.is_sys = 0")
+	}
+	if way_type == 2 {
+		db = db.Where("xt_warehouse_out.is_sys = 1")
+	}
+	if way_type == 3 {
+		db = db.Where("xt_warehouse_out.is_sys = 12")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {
@@ -1586,7 +1598,7 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 
 }
 
-func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*models.DrugWarehouseOut, total int64, err error) {
+func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.DrugWarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.DrugWarehouseOut{})
 	db = db.Where("xt_drug_warehouse_out.org_id = ? AND xt_drug_warehouse_out.status = 1 ", orgId)
 
@@ -1606,6 +1618,19 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	if storehouse_id > 0 {
 		db = db.Where("xt_drug_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
+
+	if way_type == 0 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 0 || xt_drug_warehouse_out.is_sys = 1 || xt_drug_warehouse_out.is_sys = 12")
+	}
+	if way_type == 1 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 0")
+	}
+	if way_type == 2 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 1")
+	}
+	if way_type == 3 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 12")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {

service/warhouse_service.go

@@ -4325,7 +4325,8 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-
+		fmt.Println("maxNumber2323232233232332332323232323233232", maxNumber)
+		fmt.Println("minNumber3223233232323233232332322332", minNumber)
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -4353,7 +4354,11 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
 			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				} else {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
 			}
 
 			if minNumber == 0 && maxNumber != 1 {