controllers/his_export_data_controller.go

@@ -28,6 +28,7 @@ func HisExportDataApiRegistRouters() {
 	beego.Router("/api/export/10697/summary", &HisExportDataController{}, "Get:Get10697SummaryExportData")
 
 	beego.Router("/api/export/10697/summary", &HisExportDataController{}, "Get:Get10697SummaryExportData")
+	beego.Router("/api/export/summary", &HisExportDataController{}, "Get:GetSummaryExport")
 
 	beego.Router("/api/batch/orderlist", &HisExportDataController{}, "Get:GetBatchOrderDetail")
 
@@ -126,6 +127,39 @@ func (c *HisExportDataController) Get10697SummaryExportData() {
 	})
 }
 
+func (c *HisExportDataController) GetSummaryExport() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	//ins := c.GetString("ins")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	fmt.Println("111111")
+	result, _ := service.GetHisOrderBy10697SummaryThree(start_time, end_time, startTime, endTime, c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"result": result,
+	})
+}
+
 func (c *HisExportDataController) GetExportSettleData() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	start_time := c.GetString("start_time")

controllers/new_stock_api_controller.go

@@ -196,16 +196,15 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 		endTime = theTime.Unix()
 	}
 
-	if is_type == 1 {
+	if is_type == 1 { //HIS 药品类医嘱
 		list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
-
+		//project_list, total, _ := service.GetHisGoodCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
 		drug, _ := service.GetAllDrugList(orgId)
-
 		codeConfig, _ := service.GetDrugCodeConfig(orgId)
-
 		patients, _ := service.GetAllpatient(orgId)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
+			"list": list,
+			//"project_list": project_list,
 			"total":      total,
 			"drug":       drug,
 			"patients":   patients,
@@ -213,6 +212,21 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 		})
 	}
 
+	if is_type == 3 { //HIS 耗材类医嘱
+		//list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
+		project_list, total, _ := service.GetHisGoodCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
+		drug, _ := service.GetAllDrugList(orgId)
+		codeConfig, _ := service.GetDrugCodeConfig(orgId)
+		patients, _ := service.GetAllpatient(orgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"project_list": project_list,
+			"total":        total,
+			"drug":         drug,
+			"patients":     patients,
+			"codeConfig":   codeConfig,
+		})
+	}
+
 	if is_type == 2 {
 		advice, total, _ := service.GetBloodDrugCode(orgId, startTime, endTime, limit, page, is_sale)
 

controllers/pharmacy_controller.go

@@ -144,13 +144,13 @@ func (this *PharmacyController) TodayNumber() {
 
 	itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
 
-	drug, _ := service.GetAllBaseDrugList(orgid)
+	//drug, _ := service.GetAllBaseDrugList(orgid)
 
 	config, _ := service.GetDrugCodeConfig(orgid)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"wtotal": wtotal,
 		"itotal": itotal,
-		"drug":   drug,
+		//"drug":   drug,
 		"config": config,
 	})
 	return
@@ -182,57 +182,22 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime, etime int64
-	if times == "" {
-		stime, etime = service.GetNowTime()
-	} else {
-		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
-		stime = stmp.Unix()
-		etime = stime + 86399
-	}
-
-	var patientsId []int64
+	var stime int64
+	stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+	stime = stmp.Unix()
+	is_medicine := 1
+	fmt.Println(partition)
+	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
+	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
+	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+	var patients []*models.PharmacyPatients
+	patients = append(patients, w_his_advice_patient...)
+	patients = append(patients, w_xt_advice_patient...)
+	patients = append(patients, w_his_goods_patient...)
+	patients = RemoveRepeatedPurviewElement(patients)
 
-	patient, _ := service.GetPatientKeyWord(keyword, orgid)
-	if len(patient) > 0 {
-		for _, item := range patient {
-			patientsId = append(patientsId, item.ID)
-		}
-	}
-
-	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
-
-	var ids []int64
-	for _, item := range schedule {
-		ids = append(ids, item.PatientId)
-	}
-
-	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
-
-	var flist []models.TmpPatientOne
-	if len(list) > 0 {
-		for _, item := range list {
-			patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
-			flist = append(flist, patientlist)
-		}
-	}
-
-	listTwo, _ := service.GetTodayAdviceCountTwo(stime, etime, orgid, 1)
-
-	var vlist []*models.HisDoctorAdviceInfo
-	if len(listTwo) > 0 {
-		for _, item := range listTwo {
-			//查询该患者是否有排班
-			scheduleList, _ := service.GetPatientAdviceScheduleByPatient(item.PatientId, item.UserOrgId, item.AdviceDate)
-			if len(scheduleList) == 0 {
-				vlist = append(vlist, item)
-			}
-		}
-	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list":    flist,
-		"listTwo": vlist,
+		"user_patientList": patients,
 	})
 
 	//if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
@@ -257,6 +222,24 @@ func (this *PharmacyController) IssuedDrug() {
 	//}
 
 }
+
+func RemoveRepeatedPurviewElement(arr []*models.PharmacyPatients) (newArr []*models.PharmacyPatients) {
+	newArr = make([]*models.PharmacyPatients, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].ID == arr[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}
+
 func (this *PharmacyController) WaitingDrug() {
 	var err error
 	defer func() {
@@ -282,63 +265,23 @@ func (this *PharmacyController) WaitingDrug() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	var stime, etime int64
-	if times == "" {
-		stime, etime = service.GetNowTime()
-	} else {
-		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
-		stime = stmp.Unix()
-		etime = stime + 86399
-	}
-
-	var patientsId []int64
-
-	patient, _ := service.GetPatientKeyWord(keyword, orgid)
-
-	if len(patient) > 0 {
-		for _, item := range patient {
-			patientsId = append(patientsId, item.ID)
-		}
-	}
+	var stime int64
 
-	//当未发药的人数
-	//获取排班班次
-	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition, patientsId)
-	var ids []int64
-	for _, item := range schedule {
-		ids = append(ids, item.PatientId)
-	}
-
-	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
+	stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+	stime = stmp.Unix()
 
-	listTwo, _ := service.GetTodayAdviceCountTwo(stime, etime, orgid, 0)
+	is_medicine := 0
+	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
+	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
+	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+	var patients []*models.PharmacyPatients
+	patients = append(patients, w_his_advice_patient...)
+	patients = append(patients, w_xt_advice_patient...)
+	patients = append(patients, w_his_goods_patient...)
+	patients = RemoveRepeatedPurviewElement(patients)
 
-	var vlist []*models.HisDoctorAdviceInfo
-	if len(listTwo) > 0 {
-		for _, item := range listTwo {
-			//查询该患者是否有排班
-			scheduleList, _ := service.GetPatientAdviceScheduleByPatient(item.PatientId, item.UserOrgId, item.AdviceDate)
-			if len(scheduleList) == 0 {
-				vlist = append(vlist, item)
-			}
-		}
-	}
-
-	patientList, _ := service.GetAllpatient(orgid)
-
-	var flist []models.TmpPatientOne
-	if len(list) > 0 {
-		for _, item := range list {
-			patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
-			flist = append(flist, patientlist)
-		}
-	}
-	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list":        flist,
-		"baseList":    baseList,
-		"listTwo":     vlist,
-		"patientList": patientList,
+		"wait_patientList": patients,
 	})
 	return
 
@@ -370,22 +313,16 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	var list []*models.PharmacyContent
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
-
-	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
-
+	list_p, err := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
+	list = append(list, list_p...)
+	//baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	patients, _ := service.GetPatientByIDOne(orgid, patient_id)
-	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
-	numberList, _ := service.GetAllBedNumberList(orgid)
-	zoneList, _ := service.GetAllZoneByList(orgid)
-
+	//zoneList, _ := service.GetAllZoneByList(orgid)
 	appId := this.GetAdminUserInfo().CurrentAppId
 	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
 	allDoctor, _ := service.GetAllDoctor(orgid, appId)
-
 	prescriptionListByToDay, _ := service.GetPrescriptionListByToDay(orgid, patient_id, stime)
-
 	diagnose, _ := service.FindAllDiagnose(orgid)
-
 	config, _ := service.GetDrugCodeConfig(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())
@@ -394,24 +331,77 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	return_value := make(map[string]interface{})
 	return_value["list"] = list
-	return_value["baseList"] = baseList
 	return_value["patients"] = patients
-	return_value["order"] = order
-	return_value["numberList"] = numberList
-	return_value["zoneList"] = zoneList
 	return_value["adminUserES"] = adminUserES
 	return_value["doctors"] = allDoctor
 	return_value["prescription"] = prescriptionListByToDay
 	return_value["diagnose"] = diagnose
 	return_value["config"] = config
-	//if is_medicine == 1{发药时间先不展示
-	//	return_value["time"] = time
-	//}
+
 	this.ServeSuccessJSON(return_value)
 	return
 
 }
 
+//func (this *PharmacyController) GetNewPharmacyContent() {
+//	patient_id, _ := this.GetInt64("patient_id", 0)
+//	is_medicine, _ := this.GetInt64("is_medicine", 0) //0：待发药，1：已发药
+//	times := this.GetString("time", "")
+//	orgid := this.GetAdminUserInfo().CurrentOrgId
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	var stime, etime int64
+//	if times == "" {
+//		stime, etime = service.GetNowTime()
+//	} else {
+//		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+//		stime = stmp.Unix()
+//		etime = stime + 86399
+//	}
+//	var list []*models.PharmacyContent
+//	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
+//
+//	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
+//
+//	patients, _ := service.GetPatientByIDOne(orgid, patient_id)
+//	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
+//	numberList, _ := service.GetAllBedNumberList(orgid)
+//	zoneList, _ := service.GetAllZoneByList(orgid)
+//
+//	appId := this.GetAdminUserInfo().CurrentAppId
+//	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
+//	allDoctor, _ := service.GetAllDoctor(orgid, appId)
+//
+//	prescriptionListByToDay, _ := service.GetPrescriptionListByToDay(orgid, patient_id, stime)
+//
+//	diagnose, _ := service.FindAllDiagnose(orgid)
+//
+//	config, _ := service.GetDrugCodeConfig(orgid)
+//	if err != nil {
+//		utils.ErrorLog(err.Error())
+//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//	return_value := make(map[string]interface{})
+//	return_value["list"] = list
+//	return_value["baseList"] = baseList
+//	return_value["patients"] = patients
+//	return_value["order"] = order
+//	return_value["numberList"] = numberList
+//	return_value["zoneList"] = zoneList
+//	return_value["adminUserES"] = adminUserES
+//	return_value["doctors"] = allDoctor
+//	return_value["prescription"] = prescriptionListByToDay
+//	return_value["diagnose"] = diagnose
+//	return_value["config"] = config
+//	//if is_medicine == 1{发药时间先不展示
+//	//	return_value["time"] = time
+//	//}
+//	this.ServeSuccessJSON(return_value)
+//	return
+//
+//}
+
 // 发药按钮点击
 func (this *PharmacyController) DispensingMedicine() {
 
@@ -502,6 +492,9 @@ func (this *PharmacyController) DispensingMedicine() {
 	if orgid != 10480 && orgid != 10188 && orgid != 10217 && orgid != 10164 && orgid != 10666 {
 		//发药
 		err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+
+		err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
@@ -518,6 +511,7 @@ func (this *PharmacyController) DispensingMedicine() {
 		//发药逻辑
 
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
+		err = service.DispensingGoods(orgid, patient_id, stime, etime, creater)
 
 		//针对桑植盛康
 		if orgid == 10387 || orgid == 3877 {
@@ -577,14 +571,13 @@ func (this *PharmacyController) DrugWithdrawal() {
 		etime = stime + 86399
 	}
 	err = service.DrugWithdrawal(orgid, patient_id, stime, etime, creater)
-
+	err = service.DrugWithdrawalForGood(orgid, patient_id, stime, etime, creater)
 	prescriptionList, _ := service.GetHisPrescriptionByStartTime(orgid, patient_id, stime, etime)
 	if len(prescriptionList) > 0 {
 		for _, item := range prescriptionList {
 			service.ModiftyPrescpiton(item.ID)
 		}
 	}
-
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
@@ -1423,16 +1416,23 @@ func (this *PharmacyController) ChangeDrugCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	data_source, _ := this.GetInt64("data_source")
 	drug_code := this.GetString("drug_code")
+	//item_type := this.GetString("type")
+
 	str := strings.Replace(drug_code, " ", "", -1)
 	// 去除换行符
 	str = strings.Replace(str, "\n", "", -1)
 	if data_source == 1 {
 		service.ChangeHisDrugCode(id, str, orgId)
+
 	}
 	if data_source == 2 {
 		service.ChangeAdivceDrugCode(id, str, orgId)
 	}
 
+	if data_source == 3 {
+		service.ChangeHisProjectCode(id, str, orgId)
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "msg",
 	})

models/good_models.go

@@ -35,17 +35,19 @@ func (NewGoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
-	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	Remark                      string               `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                       int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                       int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ID                int64        `gorm:"column:id" json:"id" form:"id"`
+	GoodCode          string       `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName string       `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64        `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit          int64        `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice         float64      `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark            string       `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime             int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer      int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Manufacturers     Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
+
 	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
 	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`

models/his_models.go

@@ -290,82 +290,83 @@ func (HisDoctorAdviceInfo) TableName() string {
 }
 
 type Drug struct {
-	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                      string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
-	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	Code                        string  `gorm:"column:code" json:"code" form:"code"`
-	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
-	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
-	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
-	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
-	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
-	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	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"`
-	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
-	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
-	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
-	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
-	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
-	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"`
-	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
-	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
-	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
-	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
-	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
-	IsZeroFlag                  int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ID                          int64        `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string       `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string       `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string       `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string       `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string       `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64        `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string       `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64        `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string       `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string       `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64        `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64        `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string       `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64        `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        string       `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string       `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	UnitMatrixing               string       `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice                    float64      `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice                   float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64        `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string       `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string       `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64      `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64        `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string       `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string       `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	Manufacturer                int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Manufacturers               Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
+	PharmacologyCategory        int64        `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64        `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string       `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64        `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64        `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string       `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string       `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64      `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64      `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64        `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64        `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64        `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64        `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64        `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64        `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64        `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string       `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64        `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string       `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string       `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string       `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64        `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	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"`
+	Dosage                      string       `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval                       string       `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit                 string       `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64      `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay                     string       `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64      `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string       `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	IsUser                      int64        `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Bck01b                      string       `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01                       string       `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Bbx01                       string       `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	IsZeroFlag                  int64        `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (Drug) TableName() string {
@@ -545,6 +546,8 @@ type TempHisOrder struct {
 	IsUploadOrderInfo int64  `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess   int64  `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 	CardDesc          string `gorm:"card_desc" json:"card_desc" form:"card_desc"`
+	PackNum           int64  `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum       int64  `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
 }
 
 func (TempHisOrder) TableName() string {
@@ -907,6 +910,10 @@ type HisPrescriptionProject struct {
 	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsOut                int64        `gorm:"column:is_out" json:"is_out" form:"is_out"` //新增字段
 	YbSyncStatus         int64        `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
+
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
+	DispensingTime int64 `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1112,6 +1119,8 @@ type HisOrder struct {
 	IsUploadSuccess         int64                   `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 	SickName                string                  `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 	CardDesc                string                  `gorm:"card_desc" json:"card_desc" form:"card_desc"`
+	PackNum                 int64                   `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum             int64                   `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
 }
 
 func (HisOrder) TableName() string {
@@ -1176,7 +1185,9 @@ type HisOrderELE struct {
 	IsMedicineInsurance int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
 	PayWay              int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
 
-	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	Patients    Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	PackNum     int64    `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum int64    `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
 }
 
 func (HisOrderELE) TableName() string {
@@ -2996,78 +3007,127 @@ type HisOrder10726Summary struct {
 }
 
 type NewHisDoctorAdviceInfo 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"`
-	Drug                  Drug               `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
-	Diagnosis             int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
-	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"`
-	IsMedicine            int64              `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
-	IsSettle              int64              `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
-	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
-	IsSelfDrug            int64              `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
-	DrugWayCount          string             `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
-	YbSyncStatus          int64              `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
-	DrugCode              string             `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	IsUpload              int64              `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
-	ZeroFlag              int64              `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
-	NewHisPrescription    NewHisPrescription `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"pre"`
+	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"`
+	Drug                  Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	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"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSettle              int64   `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsMobile              int64   `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
+	IsSelfDrug            int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	DrugWayCount          string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	YbSyncStatus          int64   `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsUpload              int64   `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+
+	ZeroFlag           int64              `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
+	NewHisPrescription NewHisPrescription `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"pre"`
 }
 
 func (NewHisDoctorAdviceInfo) TableName() string {
 	return "his_doctor_advice_info"
 }
 
+type NewHisPrintPrescriptionProject 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"`
+	HisProject           HisProject         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo             GoodInfo           `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	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              `gborm:"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"`
+	IsCheckTeam          int64              `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsUpload             int64              `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	NewHisPrescription   NewHisPrescription `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"pre"`
+	DrugCode             string             `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsMedicine           int64              `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+}
+
+func (NewHisPrintPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
 type NewHisPrescription 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"`

models/pharmacy_models.go

@@ -63,6 +63,10 @@ type PharmacyContent struct {
 	Price          float64
 	DrugCode       string
 	ZeroFlag       string
+	MName          string
+	Spec           string
+	Type           int64
+	Bm             string
 }
 
 // 发药明细列表
@@ -211,12 +215,59 @@ type HisDoctorAdviceInfoL struct {
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	ZeroFlag              int64   `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
+	Drug                  Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
 func (HisDoctorAdviceInfoL) TableName() string {
 	return "sgj_xt.his_doctor_advice_info"
 }
 
+type HisPrintPrescriptionProjectL 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"`
+	GoodInfo             GoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	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    `gborm:"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"`
+	IsCheckTeam          int64    `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64    `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	DrugCode             string   `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsMedicine           int64    `gorm:"is_medicine" json:"is_medicine" form:"is_medicine"`
+	DispensingTime       int64    `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+}
+
+func (HisPrintPrescriptionProjectL) TableName() string {
+	return "his_prescription_project"
+}
+
 type XtDoctorAdviceL 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"`

service/export_data_service.go

@@ -2,7 +2,9 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
+	"log"
 )
 
 type ExportPatient struct {
@@ -292,6 +294,39 @@ type MedicalCharges struct {
 	OtherPayment             float64 `gorm:"column:其它支付"`   // 其它支付
 }
 
+type MedicalChargesThree struct {
+	PatientID                string  `gorm:"column:ID"`   // 姓名
+	PsnName                  string  `gorm:"column:姓名"`   // 姓名
+	TypeName                 string  `gorm:"column:类型"`   // 姓名
+	Total                    float64 `gorm:"column:合计次数"` // 姓名
+	XtCount                  float64 `gorm:"column:血透"`
+	XlCount                  float64 `gorm:"column:血滤"`
+	GlCount                  float64 `gorm:"column:灌流"`
+	WesternMedicineFee       float64 `gorm:"column:西药费"`    // 西药费
+	ChinesePatentMedicineFee float64 `gorm:"column:中成药费"`   // 中成药费
+	HealthMaterialsFee       float64 `gorm:"column:耗材费"`    // 卫生材料费
+	RegistrationFee          float64 `gorm:"column:挂号费"`    // 挂号费
+	TreatmentFee             float64 `gorm:"column:治疗费"`    // 治疗费
+	ExaminationFee           float64 `gorm:"column:检查费"`    // 检查费
+	LaboratoryFee            float64 `gorm:"column:化验费"`    // 化验费
+	NursingFee               float64 `gorm:"column:护理费"`    // 护理费
+	OtherFee                 float64 `gorm:"column:其他费"`    // 其他费
+	BedsFee                  float64 `gorm:"column:床位费"`    // 床位费
+	ConsultationFee          float64 `gorm:"column:诊察费"`    // 诊察费
+	ChineseMedicineFee       float64 `gorm:"column:中药饮片费"`  // 中药饮片费
+	GeneralTreatmentFee      float64 `gorm:"column:一般诊疗费"`  // 一般诊疗费
+	TotalMedicalFee          float64 `gorm:"column:合计"`     // 医疗费总额
+	SelfPay                  float64 `gorm:"column:自费金额"`   // 个人自付金额
+	AcctPay                  float64 `gorm:"column:个人账户支付"` // 基本账户支付
+	Return                   string  `gorm:"column:退费"`     // 共济账户支付
+	YouHui                   string  `gorm:"column:优惠"`     // 公务员补助
+	YingShou                 float64 `gorm:"column:应收"`     // 统筹支付金额
+	GuaZhang                 string  `gorm:"column:挂账"`     // 医疗救助
+	ChongZhang               string  `gorm:"column:冲账"`     // 大病支付
+	ShiShou                  float64 `gorm:"column:实收"`     // 企业补充支付
+	YiShou                   float64 `gorm:"column:已收"`     // 重大疾病补充 (Empty in SQL, will be left blank in Go)
+}
+
 func GetHisOrderBy10697Summary(start_time string, end_time string, ins string) (results []MedicalCharges, err error) {
 	err = readDb.Table("his_order").
 		Select(`
@@ -394,6 +429,295 @@ func GetHisOrderBy10697SummaryTwo(startTime, endTime, ins string, st_stamp, end_
 	return results, nil
 }
 
+func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_stamp int64, org_id int64) ([]*MedicalChargesThree, error) {
+	var results []*MedicalChargesThree
+	// 改为字符串数组
+	medChargeTypes := []string{"01", "02", "03", "04", "05", "07", "08", "09", "10", "11", "12", "13", "14"}
+
+	// 定义子查询
+	subQuery := readDb.Table("his_order_info").
+		Select(`
+            order_number, 
+            med_chrgitm_type, 
+            SUM(det_item_fee_sumamt) AS det_item_fee_sumamt`).
+		Where("user_org_id = ? AND STATUS = ? AND (upload_date) >= ? AND (upload_date) <= ? AND med_chrgitm_type IN (?)",
+			org_id, 1,
+			st_stamp,
+			end_stamp,
+			medChargeTypes).
+		Group("order_number, med_chrgitm_type").
+		SubQuery() // 作为临时表
+
+	// 执行主查询
+	err := readDb.Table("his_order").
+		Select(`p.id as ID, p.name AS 姓名,
+			CASE his_order.insutype
+				WHEN '390' THEN '城乡'
+				WHEN '310' THEN '职工'
+				ELSE '未知' 
+			END AS "类型",
+			SUM(CASE i.med_chrgitm_type WHEN '09' THEN i.det_item_fee_sumamt ELSE 0 END) AS 西药费,
+			0 AS 成药费,
+			SUM(CASE i.med_chrgitm_type WHEN '11' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中成药费,
+			SUM(CASE i.med_chrgitm_type WHEN '08' THEN i.det_item_fee_sumamt ELSE 0 END) AS 耗材费,
+			SUM(CASE i.med_chrgitm_type WHEN '13' THEN i.det_item_fee_sumamt ELSE 0 END) AS 挂号费,
+			SUM(CASE i.med_chrgitm_type WHEN '05' THEN i.det_item_fee_sumamt ELSE 0 END) AS 治疗费,
+			SUM(CASE i.med_chrgitm_type WHEN '03' THEN i.det_item_fee_sumamt ELSE 0 END) AS 检查费,
+			SUM(CASE i.med_chrgitm_type WHEN '04' THEN i.det_item_fee_sumamt ELSE 0 END) AS 化验费,
+			SUM(CASE i.med_chrgitm_type WHEN '07' THEN i.det_item_fee_sumamt ELSE 0 END) AS 护理费,
+			SUM(CASE i.med_chrgitm_type WHEN '14' THEN i.det_item_fee_sumamt ELSE 0 END) AS 其他费,
+			0 AS 合计,  -- 移除不必要的DISTINCT
+			0 AS 自费金额,
+			0 AS 个人账户支付,
+			0 AS 医保报销金额,
+			"" AS 退费,
+			"" AS 优惠,
+			0 AS 应收,
+			"" AS 挂账,
+			"" AS 冲账,
+			0 AS 实收`).
+		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery).                       // 使用子查询
+		Joins("JOIN xt_patients p on p.id = his_order.patient_id and p.user_org_id = ?", org_id). // 使用子查询
+
+		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ?  AND his_order.STATUS = ?",
+			org_id, 2, startTime+" 00:00:00", endTime+" 23:59:59", 1).
+		Group("his_order.patient_id").
+		Scan(&results).Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	type CusTotal struct {
+		MedfeeSumamt float64
+		PsnCashPay   float64
+		AcctPay      float64
+		FunPay       float64
+	}
+
+	// To store totals per patient
+	patientTotals := make(map[string]CusTotal)
+	var grandTotal CusTotal
+
+	for _, item := range results {
+		var tempTotal CusTotal
+
+		err := readDb.Model(models.HisOrder{}).
+			Select("sum(medfee_sumamt) as medfee_sumamt, "+
+				"sum(psn_cash_pay) as psn_cash_pay, "+
+				"sum(acct_pay) as acct_pay, "+
+				"sum(fund_pay_sumamt) as fun_pay").
+			Where("patient_id = ? and user_org_id = ? "+
+				"and setl_time >= ? and setl_time <= ? "+
+				"and status = 1 and order_status = 2",
+				item.PatientID, org_id,
+				startTime+" 00:00:00", endTime+" 23:59:59").
+			Scan(&tempTotal).Error
+
+		if err != nil {
+			log.Printf("Error querying for patient %s: %v", item.PatientID, err)
+			continue
+		}
+
+		// Store this patient's total
+		patientTotals[item.PatientID] = tempTotal
+
+		// Accumulate to grand total
+		grandTotal.MedfeeSumamt += tempTotal.MedfeeSumamt
+		grandTotal.PsnCashPay += tempTotal.PsnCashPay
+		grandTotal.AcctPay += tempTotal.AcctPay
+		grandTotal.FunPay += tempTotal.FunPay
+	}
+
+	// Print totals per patient
+	for patientID, total := range patientTotals {
+		//fmt.Printf("Patient %s total: %+v\n", patientID, total)
+		for _, item := range results {
+			if patientID == item.PatientID {
+				item.TotalMedicalFee = total.MedfeeSumamt
+				item.SelfPay = total.PsnCashPay
+				item.AcctPay = total.AcctPay
+				item.YingShou = total.MedfeeSumamt
+				item.ShiShou = total.MedfeeSumamt
+				item.YiShou = total.PsnCashPay
+				fmt.Println(item)
+			}
+
+		}
+	}
+
+	type CusTotalTwo struct {
+		XT float64 `gorm:"column:XT"`
+		XL float64 `gorm:"column:XL"`
+		GL float64 `gorm:"column:GL"`
+	}
+
+	// To store totals per patient
+	patientTotals_two := make(map[string]CusTotalTwo)
+	var grandTotal_two CusTotalTwo
+
+	for _, item := range results {
+		if org_id == 9478 {
+			var tempTotal CusTotalTwo
+
+			readDb.Table("his_order_info as oi").Select(`
+    COALESCE(SUM(CASE WHEN project.project_name = '血液透析（用）' THEN p.count ELSE 0 END), 0) as XT,
+    COALESCE(SUM(CASE WHEN project.project_name = '血液透析滤过（用）' THEN p.count ELSE 0 END), 0) as XL,
+    COALESCE(SUM(CASE WHEN project.project_name = '血液灌流（用）' THEN p.count ELSE 0 END), 0) as GL
+`).
+				Joins("JOIN his_order o ON oi.order_number = o.number AND o.setl_time BETWEEN ? AND ? AND o.order_status = 2 AND o.status = 1", startTime+" 00:00:00", endTime+" 23:59:59").
+				Joins("JOIN his_prescription_project p ON oi.project_id = p.id").
+				Joins("LEFT JOIN xt_his_project project ON p.project_id = project.id").
+				Joins("JOIN xt_patients pp ON oi.patient_id = pp.id").
+				Where(`
+    oi.patient_id = ? 
+    AND oi.project_id > 0 
+    AND oi.user_org_id = ? 
+    AND oi.upload_date >= ? 
+    AND oi.upload_date <= ? 
+    AND oi.status = 1 
+    AND p.type = 2 
+    AND project.project_name IN ('血液透析（用）','血液透析滤过（用）','血液灌流（用）')
+`, item.PatientID, org_id, st_stamp, end_stamp).
+				Scan(&tempTotal)
+
+			patientTotals_two[item.PatientID] = tempTotal
+			grandTotal_two.GL += tempTotal.GL
+			grandTotal_two.XT += tempTotal.XT
+			grandTotal_two.XL += tempTotal.XL
+
+		} else {
+			var tempTotal CusTotalTwo
+
+			readDb.Table("his_order_info as oi").Select(`
+    COALESCE(SUM(CASE WHEN project.project_name = '血液透析' THEN p.count ELSE 0 END), 0) as XT,
+    COALESCE(SUM(CASE WHEN project.project_name = '血液透析滤过' THEN p.count ELSE 0 END), 0) as XL,
+    COALESCE(SUM(CASE WHEN project.project_name = '血液灌流' THEN p.count ELSE 0 END), 0) as GL
+`).
+				Joins("JOIN his_order o ON oi.order_number = o.number AND o.setl_time BETWEEN ? AND ? AND o.order_status = 2 AND o.status = 1", startTime+" 00:00:00", endTime+" 23:59:59").
+				Joins("JOIN his_prescription_project p ON oi.project_id = p.id").
+				Joins("LEFT JOIN xt_his_project project ON p.project_id = project.id").
+				Joins("JOIN xt_patients pp ON oi.patient_id = pp.id").
+				Where(`
+    oi.patient_id = ? 
+    AND oi.project_id > 0 
+    AND oi.user_org_id = ? 
+    AND oi.upload_date >= ? 
+    AND oi.upload_date <= ? 
+    AND oi.status = 1 
+    AND p.type = 2 
+    AND project.project_name IN ('血液透析','血液透析滤过','血液灌流')
+`, item.PatientID, org_id, st_stamp, end_stamp).
+				Scan(&tempTotal)
+
+			patientTotals_two[item.PatientID] = tempTotal
+			grandTotal_two.GL += tempTotal.GL
+			grandTotal_two.XT += tempTotal.XT
+			grandTotal_two.XL += tempTotal.XL
+
+		}
+	}
+	fmt.Println(patientTotals_two)
+
+	for patientID, total := range patientTotals_two {
+		//fmt.Printf("Patient %s total: %+v\n", patientID, total)
+		for _, item := range results {
+			if patientID == item.PatientID {
+				item.Total = total.XL + total.GL + total.XT
+				item.XtCount = total.XT
+				item.XlCount = total.XL
+				item.GlCount = total.GL
+			}
+
+		}
+	}
+	// Print grand total
+	//fmt.Printf("Grand total for all patients: %+v\n", grandTotal)
+	return results, nil
+}
+
+func GetHisOrderBySummary(startTime, endTime string, st_stamp, end_stamp int64, org_id int64) ([]MedicalChargesThree, error) {
+	var results []MedicalChargesThree
+	medChargeTypes := []string{"01", "02", "03", "04", "05", "07", "08", "09", "10", "11", "12", "13", "14"}
+
+	// 优化后的费用聚合子查询（使用覆盖索引）
+	subQuery := readDb.Table("his_order_info").
+		Select(`order_number, med_chrgitm_type, SUM(det_item_fee_sumamt) AS det_item_fee_sumamt`).
+		Where("user_org_id = ? AND status = ? AND upload_date BETWEEN ? AND ?",
+			org_id, 1, st_stamp, end_stamp).
+		Where("med_chrgitm_type IN (?)", medChargeTypes).
+		Group("order_number, med_chrgitm_type").
+		SubQuery()
+
+	// 处理时间范围格式
+	startTimeFull := fmt.Sprintf("%s 00:00:00", startTime)
+	endTimeFull := fmt.Sprintf("%s 23:59:59", endTime)
+
+	err := readDb.Table("his_order").
+		Select(`his_order.psn_name AS 姓名,
+			CASE his_order.insutype
+				WHEN '390' THEN '城乡'
+				WHEN '310' THEN '职工'
+				ELSE '未知' 
+			END AS "类型",
+			SUM(CASE i.med_chrgitm_type WHEN '09' THEN i.det_item_fee_sumamt ELSE 0 END) AS 西药费,
+			0 AS 成药费,
+			SUM(CASE i.med_chrgitm_type WHEN '11' THEN i.det_item_fee_sumamt ELSE 0 END) AS 中成药费,
+			SUM(CASE i.med_chrgitm_type WHEN '08' THEN i.det_item_fee_sumamt ELSE 0 END) AS 耗材费,
+			SUM(CASE i.med_chrgitm_type WHEN '13' THEN i.det_item_fee_sumamt ELSE 0 END) AS 挂号费,
+			SUM(CASE i.med_chrgitm_type WHEN '05' THEN i.det_item_fee_sumamt ELSE 0 END) AS 治疗费,
+			SUM(CASE i.med_chrgitm_type WHEN '03' THEN i.det_item_fee_sumamt ELSE 0 END) AS 检查费,
+			SUM(CASE i.med_chrgitm_type WHEN '04' THEN i.det_item_fee_sumamt ELSE 0 END) AS 化验费,
+			SUM(CASE i.med_chrgitm_type WHEN '07' THEN i.det_item_fee_sumamt ELSE 0 END) AS 护理费,
+			SUM(CASE i.med_chrgitm_type WHEN '14' THEN i.det_item_fee_sumamt ELSE 0 END) AS 其他费,
+			SUM(his_order.medfee_sumamt) AS 合计,  -- 移除不必要的DISTINCT
+			SUM(his_order.psn_cash_pay) AS 自费金额,
+			SUM(his_order.acct_pay) AS 个人账户支付,
+			SUM(his_order.fund_pay_sumamt) AS 医保报销金额,
+			"" AS 退费,
+			"" AS 优惠,
+			SUM(his_order.medfee_sumamt) AS 应收,
+			"" AS 挂账,
+			"" AS 冲账,
+			SUM(his_order.medfee_sumamt) AS 实收`).
+		Joins("JOIN (?) i ON his_order.number = i.order_number", subQuery).
+		//Joins("LEFTJOIN (?) p ON his_order.number = p.order_number", projectJoinQuery).
+		Where("his_order.user_org_id = ?", org_id).
+		Where("his_order.order_status = ?", 2).
+		Where("his_order.setl_time BETWEEN ? AND ?", startTimeFull, endTimeFull).
+		Where("his_order.is_medicine_insurance = ?", 1).
+		Where("his_order.status = ?", 1).
+		Group("his_order.patient_id").
+		Scan(&results).Error
+
+	if err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
+
+// 建议的索引方案（MySQL语法示例）
+/*
+-- his_order_info 表
+ALTER TABLE his_order_info
+ADD INDEX idx_org_status_upload (user_org_id, status, upload_date),
+ADD INDEX idx_order_medtype (order_number, med_chrgitm_type);
+
+-- his_order 表
+ALTER TABLE his_order
+ADD INDEX idx_org_status_setltime (user_org_id, order_status, setl_time),
+ADD INDEX idx_patient_setltime (patient_id, setl_time);
+
+-- his_prescription_project 表
+ALTER TABLE his_prescription_project
+ADD INDEX idx_org_record_project (user_org_id, record_date, project_id),
+ADD INDEX idx_status_project (status, project_id);
+
+-- xt_his_project 表
+ALTER TABLE xt_his_project
+ADD INDEX idx_org_project (id, user_org_id);
+*/
 type MedicalChargesTwo struct {
 	TotalMedicalFee float64 `gorm:"column:医疗费总额"`     // 医疗费总额
 	Fund            float64 `gorm:"column:基金支付总金额"`   // 个人自付金额

service/pharmacy_service.go

@@ -300,7 +300,9 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
 	if orgid == 10375 {
-		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Preload("Drug", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Manufacturers", "status = 1").Where("status = 1")
+		}).Where(
 			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ?)", stime, etime, orgid, patient_id, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
@@ -322,6 +324,10 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				Price:        v.Price,
 				DrugCode:     v.DrugCode,
 				ZeroFlag:     config.ToString(v.ZeroFlag),
+				MName:        v.Drug.Manufacturers.ManufacturerName,
+				Spec:         v.Drug.Dose + v.Drug.DoseUnit + strconv.FormatInt(v.Drug.MinNumber, 10) + v.Drug.MinUnit + "/" + v.Drug.MaxUnit,
+				Type:         1,
+				Bm:           v.Drug.MedicalInsuranceNumber,
 			})
 		}
 
@@ -354,6 +360,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				Remarks:      v.Remark,
 				DrugId:       v.DrugId,
 				DrugCode:     v.DrugCode,
+				Type:         1,
 			})
 		}
 		return
@@ -361,13 +368,17 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 	if orgid != 10375 {
 		if is_medicine == 0 {
-			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Preload("Drug", func(db *gorm.DB) *gorm.DB {
+				return db.Preload("Manufacturers", "status = 1").Where("status = 1")
+			}).Where(
 				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 			if err != nil {
 				return pp, err
 			}
 		} else {
-			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Preload("Drug", func(db *gorm.DB) *gorm.DB {
+				return db.Preload("Manufacturers", "status = 1").Where("status = 1")
+			}).Where(
 				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
 			if err != nil {
 				return pp, err
@@ -393,6 +404,10 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				Price:          v.Price,
 				DrugCode:       v.DrugCode,
 				ZeroFlag:       config.ToString(v.ZeroFlag),
+				MName:          v.Drug.Manufacturers.ManufacturerName,
+				Spec:           v.Drug.Dose + v.Drug.DoseUnit + strconv.FormatInt(v.Drug.MinNumber, 10) + v.Drug.MinUnit + "/" + v.Drug.MaxUnit,
+				Type:           1,
+				Bm:             v.Drug.MedicalInsuranceNumber,
 			})
 		}
 
@@ -428,6 +443,8 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
 				DrugCode:       v.DrugCode,
+				Type:           1,
+
 				//Price:        v.Price,
 
 			})
@@ -437,6 +454,55 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 	return
 }
 
+func GetPatientProject(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
+	var tmp []*models.HisPrintPrescriptionProjectL
+
+	if is_medicine == 0 {
+		err = XTReadDB().Model(&models.HisPrintPrescriptionProjectL{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Manufacturers", "status = 1").Where("status = 1")
+		}).Where(
+			"status = 1 and record_date >= ? and record_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and type = 3", stime, etime, orgid, patient_id, is_medicine).Find(&tmp).Error
+		if err != nil {
+			return pp, err
+		}
+	} else {
+		err = XTReadDB().Model(&models.HisPrintPrescriptionProjectL{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Manufacturers", "status = 1").Where("status = 1")
+		}).Where(
+			"status = 1 and record_date >= ? and record_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ?  and type = 3", stime, etime, orgid, patient_id, is_medicine).Find(&tmp).Error
+		if err != nil {
+			return pp, err
+		}
+	}
+
+	for _, v := range tmp {
+		pp = append(pp, &models.PharmacyContent{
+			ID:             v.ID,
+			Name:           v.GoodInfo.GoodName,
+			SingleDosage:   config.ToString(v.SingleDose) + v.Unit,
+			Usage:          v.DeliveryWay,
+			Frequency:      v.ExecutionFrequency,
+			Days:           config.ToString(v.Day) + "天",
+			Total:          config.ToString(v.Count) + v.Unit,
+			Doctor:         GetAdminUserName(v.Doctor, orgid), //开立医生
+			DataSources:    "his处方",
+			Remarks:        v.Remark, //备注
+			DrugId:         v.GoodInfo.ID,
+			ExecutionState: v.ExecutionState,
+			ExecutionStaff: v.ExecutionStaff,
+			ExecutionTime:  v.ExecutionTime,
+			Price:          v.Price,
+			DrugCode:       v.DrugCode,
+			MName:          v.GoodInfo.Manufacturers.ManufacturerName,
+			Spec:           v.GoodInfo.SpecificationName,
+			Type:           2,
+			Bm:             v.GoodInfo.MedicalInsuranceNumber,
+		})
+	}
+
+	return
+}
+
 // 获取创建者姓名(改)
 func GetAdminUserName(doctor, orgid int64) string {
 	var tmp models.VmUserAdminRole
@@ -793,21 +859,43 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	time_now := time.Now().Unix()
 	var hids []*models.TmpID
 	var xids []*models.TmpID
+
+	var projectids []*models.TmpID
+
 	err = tx.Raw("select id from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return
 	}
+
+	err = tx.Raw("select id from his_prescription_project where status = 1 and record_date >= ? and record_date <= ? "+
+		"and user_org_id = ? and patient_id = ? and is_medicine = 0  ", stime, etime, orgid, patient_id).Scan(&projectids).Error
+	if err != nil {
+		return
+	}
+
 	hid := make([]int64, 0)
+
+	pid := make([]int64, 0)
+
 	for _, v := range hids {
 		hid = append(hid, v.Id)
 	}
+	for _, v := range projectids {
+		pid = append(pid, v.Id)
+	}
 	var advice_info []*models.HisDoctorAdviceInfo
 	err = tx.Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", hid).Find(&advice_info).Error
 	if err != nil {
 		return
 	}
 
+	var project_info []*models.HisPrescriptionProject
+	err = tx.Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", pid).Find(&project_info).Error
+	if err != nil {
+		return
+	}
+
 	if orgid != 10480 {
 		for _, v := range advice_info {
 
@@ -911,6 +999,55 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	return
 }
 
+func DispensingGoods(orgid, patient_id, stime, etime, creater int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	time_now := time.Now().Unix()
+
+	var projectids []*models.TmpID
+
+	err = tx.Raw("select id from his_prescription_project where status = 1 and record_date >= ? and record_date <= ? "+
+		"and user_org_id = ? and patient_id = ? and is_medicine = 0 and type = 3 ", stime, etime, orgid, patient_id).Scan(&projectids).Error
+	if err != nil {
+		return
+	}
+
+	pid := make([]int64, 0)
+
+	for _, v := range projectids {
+		pid = append(pid, v.Id)
+	}
+
+	var project_info []*models.HisPrescriptionProject
+	err = tx.Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", pid).Find(&project_info).Error
+	if err != nil {
+		return
+	}
+
+	//修改状态
+	errs := XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("id in (?)", pid).Updates(map[string]interface{}{
+		"is_medicine":     1,
+		"dispensing_time": time_now,
+	}).Error
+	if errs != nil {
+		return errs
+	}
+	err1 := ChangeHisPrescriptionByGood(pid)
+	if err1 != nil {
+		return err1
+	}
+
+	return
+}
+
 func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err error) {
 
 	//开事务
@@ -1229,6 +1366,52 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	return
 }
 
+func DrugWithdrawalForGood(orgid, patient_id, stime, etime, creater int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	map_time := make(map[int64]int64)
+	var hids []*models.TmpID
+	//var hid,xid []int64//查询已发药的药品
+	err = tx.Raw("select id,dispensing_time from his_prescription_project where  type = 3 and status = 1 and record_date >= ? and record_date <= ?"+
+		" and user_org_id = ? and patient_id = ? and is_medicine = 1", stime, etime, orgid, patient_id).Scan(&hids).Error
+	if err != nil {
+		return
+	}
+	hid := make([]int64, 0)
+	for _, v := range hids {
+		hid = append(hid, v.Id)
+		map_time[v.DispensingTime] = v.DispensingTime
+	}
+	//修改状态
+	errs := XTWriteDB().Model(&models.HisPrintPrescriptionProjectL{}).Where("id in (?)", hid).Updates(map[string]interface{}{
+		"is_medicine":     0,
+		"dispensing_time": 0,
+	}).Error
+	if errs != nil {
+		return errs
+	}
+	ChangeHisPrescriptionTwo(hid)
+	//删除掉发药明细
+	for k, _ := range map_time {
+		err = tx.Model(&models.Pharmary{}).Where("user_org_id = ? and record_date = ? and patient_id = ? ", orgid, k, patient_id).Updates(map[string]interface{}{
+			"status": 0,
+			"mtime":  time.Now().Unix(),
+		}).Error
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
 // 获取患者名称
 func FindUserName(patient_id int64) (name string) {
 	var tmp models.GetHisName
@@ -1245,6 +1428,14 @@ func FindDrugsName(drug_id int64) (name string) {
 	return
 }
 
+// 获取药品名称
+func FindGoodsName(project_id int64) (name string) {
+	var tmp models.GoodInfo
+	XTReadDB().Model(&models.GoodInfo{}).Where("id = ?", project_id).Find(&tmp)
+	name = tmp.GoodName
+	return
+}
+
 // 药品发药按钮点击(
 func MedicineDeparture(ids string, creater, orgid int64) (err error) {
 	//开事务
@@ -1689,6 +1880,31 @@ func ChangeHisPrescription(tmp []int64) (err error) {
 	return
 }
 
+func ChangeHisPrescriptionByGood(tmp []int64) (err error) {
+	var advice_info []*models.HisPrescriptionProject
+	err = XTReadDB().Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil
+		}
+		return
+	}
+
+	tmp_id := make(map[int64]int64)
+	for _, v := range advice_info {
+		tmp_id[v.PrescriptionId] = v.PrescriptionId
+	}
+	for k, _ := range tmp_id {
+		err = XTWriteDB().Model(&models.HisPrintPrescription{}).Where("id = ?", k).Updates(map[string]interface{}{
+			"is_medicine": 1,
+		}).Error
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
 // 改变处方状态(退药
 func ChangeHisPrescriptionT(tmp []int64) (err error) {
 	var advice_info []*models.HisDoctorAdviceInfo
@@ -1721,6 +1937,35 @@ func ChangeHisPrescriptionT(tmp []int64) (err error) {
 	return
 }
 
+func ChangeHisPrescriptionTwo(tmp []int64) (err error) {
+	var advice_info []*models.HisPrescriptionProject
+	err = XTReadDB().Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", tmp).Find(&advice_info).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil
+		}
+		return
+	}
+	tmp_id := make(map[int64]int64)
+	for _, v := range advice_info {
+		tmp_id[v.PrescriptionId] = v.PrescriptionId
+	}
+	for k, _ := range tmp_id {
+		var total int
+		//查询退药的
+		XTReadDB().Model(&models.HisPrescriptionProject{}).Where("prescription_id = ? and status = 1 and is_medicine = 1", k).Count(&total)
+		if total == 0 {
+			err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("id = ?", k).Updates(map[string]interface{}{
+				"is_medicine": 0,
+			}).Error
+			if err != nil {
+				return
+			}
+		}
+	}
+	return
+}
+
 // 改变处方状态
 func ChangeHisPrescriptionid(id string) (err error) {
 	var advice models.HisDoctorAdviceInfo
@@ -2368,6 +2613,27 @@ func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime i
 	return advice, err
 }
 
+func FindeHisProjectDocAdvice(orgid int64, patient_id int64, stime int64, etime int64) (advice []*models.HisPrescriptionProject, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if stime > 0 {
+		db = db.Where("recrod_date >=?", stime)
+	}
+	if etime > 0 {
+		db = db.Where("recrod_date<=?", etime)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
 func FindeHisAdviceDocAdviceOne(orgid int64, patient_id int64, drug_id int64, advice_date int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
 	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
@@ -2470,6 +2736,12 @@ func ChangeHisDrugCode(id int64, drug_code string, user_org_id int64) (models.Hi
 	return adviceInfo, err
 }
 
+func ChangeHisProjectCode(id int64, drug_code string, user_org_id int64) (models.HisPrescriptionProject, error) {
+	adviceInfo := models.HisPrescriptionProject{}
+	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"drug_code": drug_code}).Error
+	return adviceInfo, err
+}
+
 func ChangeAdivceDrugCode(id int64, drug_code string, user_org_id int64) (models.DoctorAdvice, error) {
 
 	adviceInfo := models.DoctorAdvice{}
@@ -2575,3 +2847,200 @@ func GetNewBaseDrugById(id int64) (models.NBXtBaseDrug, error) {
 
 	return drug, err
 }
+
+func GetNewPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
+	InitDrugidIsNil(orgid, stime, etime)
+	var tmp []*models.HisDoctorAdviceInfoL
+	if orgid == 10375 {
+		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ?)", stime, etime, orgid, patient_id, orgid).Find(&tmp).Error
+		if err != nil {
+			return pp, err
+		}
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				ID:           v.ID,
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         config.ToString(v.Day) + "天",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:  "his处方",
+				Remarks:      v.Remark, //备注
+				DrugId:       v.DrugId,
+				Price:        v.Price,
+				DrugCode:     v.DrugCode,
+				ZeroFlag:     config.ToString(v.ZeroFlag),
+			})
+		}
+
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				ID:           v.ID,
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         "-",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:  "临时医嘱",
+				Remarks:      v.Remark,
+				DrugId:       v.DrugId,
+				DrugCode:     v.DrugCode,
+			})
+		}
+		return
+	}
+
+	if orgid != 10375 {
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				ID:             v.ID,
+				Name:           v.AdviceName,
+				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:          v.DeliveryWay,
+				Frequency:      v.ExecutionFrequency,
+				Days:           config.ToString(v.Day) + "天",
+				Total:          config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:         GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:    "his处方",
+				Remarks:        v.Remark, //备注
+				DrugId:         v.DrugId,
+				ExecutionState: v.ExecutionState,
+				ExecutionStaff: v.ExecutionStaff,
+				ExecutionTime:  v.ExecutionTime,
+				Price:          v.Price,
+				DrugCode:       v.DrugCode,
+				ZeroFlag:       config.ToString(v.ZeroFlag),
+			})
+		}
+
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				ID:             v.ID,
+				Name:           v.AdviceName,
+				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:          v.DeliveryWay,
+				Frequency:      v.ExecutionFrequency,
+				Days:           "-",
+				Total:          config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:         GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:    "临时医嘱",
+				Remarks:        v.Remark,
+				DrugId:         v.DrugId,
+				ExecutionState: v.ExecutionState,
+				ExecutionStaff: v.ExecutionStaff,
+				ExecutionTime:  v.ExecutionTime,
+				DrugCode:       v.DrugCode,
+				//Price:        v.Price,
+
+			})
+		}
+		return
+	}
+	return
+}
+
+func GetWaitPharmacyHISAdvicePatient(zone_id int64, sch_type int64, record_date int64, org_id int64, keyword string, is_medicine int) (patient []*models.PharmacyPatients, err error) {
+	fmt.Println(zone_id)
+	db := readDb.Model(&models.PharmacyPatients{})
+	if zone_id > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.partition_id = ?", record_date, org_id, zone_id)
+	}
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.schedule_type = ?", record_date, org_id, sch_type)
+	}
+	db = db.Joins("join his_doctor_advice_info on xt_patients.id = his_doctor_advice_info.patient_id and his_doctor_advice_info.is_medicine = ? and his_doctor_advice_info.advice_date = ? and his_doctor_advice_info.user_org_id = ? and his_doctor_advice_info.status = 1", is_medicine, record_date, org_id)
+	if len(keyword) > 0 {
+		keyword = "%" + keyword + "%"
+		db = db.Where("xt_patients.name like ?", keyword)
+
+	}
+	err = db.Where("xt_patients.user_org_id = ?", org_id).Group("xt_patients.id").Find(&patient).Error
+	return
+}
+
+func GetWaitPharmacyXTPatient(zone_id int64, sch_type int64, record_date int64, org_id int64, keyword string, is_medicine int) (patient []*models.PharmacyPatients, err error) {
+	db := readDb.Model(&models.PharmacyPatients{})
+	if zone_id > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.schedule_type = ?", record_date, org_id, sch_type)
+	}
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.partition_id = ?", record_date, org_id, zone_id)
+	}
+	db = db.Joins("join xt_doctor_advice on xt_patients.id = xt_doctor_advice.patient_id and xt_doctor_advice.is_medicine = ? and xt_doctor_advice.advice_date = ? and xt_doctor_advice.user_org_id = ? and xt_doctor_advice.status = 1", is_medicine, record_date, org_id)
+	if len(keyword) > 0 {
+		keyword = "%" + keyword + "%"
+		db = db.Where("xt_patients.name like ?", keyword)
+
+	}
+	err = db.Where("xt_patients.user_org_id = ?", org_id).Group("xt_patients.id").Find(&patient).Error
+
+	return
+}
+
+func GetWaitPharmacyHISGoodsPatient(zone_id int64, sch_type int64, record_date int64, org_id int64, keyword string, is_medicine int) (patient []*models.PharmacyPatients, err error) {
+	db := readDb.Model(&models.PharmacyPatients{})
+	if zone_id > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.schedule_type = ?", record_date, org_id, sch_type)
+	}
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule on xt_schedule.patient_id = xt_patients.id and xt_schedule.schedule_date = ?  and xt_schedule.user_org_id = ? and xt_schedule.status = 1 and xt_schedule.partition_id = ?", record_date, org_id, zone_id)
+	}
+	db = db.Joins("join his_prescription_project on xt_patients.id = his_prescription_project.patient_id  and his_prescription_project.record_date = ? and his_prescription_project.user_org_id = ? and his_prescription_project.type = 3 and his_prescription_project.status = 1 and his_prescription_project.is_medicine = ?", record_date, org_id, is_medicine)
+	if len(keyword) > 0 {
+		keyword = "%" + keyword + "%"
+		db = db.Where("xt_patients.name like ?", keyword)
+
+	}
+	err = db.Where("xt_patients.user_org_id = ?", org_id).Group("xt_patients.id").Find(&patient).Error
+	return
+}

service/stock_service.go

@@ -11068,6 +11068,55 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 	return list, total, err
 }
 
+func GetHisGoodCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64, is_settle int64, keywords string, is_code int64) (list []*models.NewHisPrintPrescriptionProject, total int64, err error) {
+
+	db := XTReadDB().Model(&models.NewHisPrintPrescriptionProject{}).Preload("NewHisPrescription", "status = 1").Preload("GoodInfo", "status = 1").Where("his_prescription_project.status=1")
+	if is_settle == 2 {
+		db = db.Joins("join his_prescription on his_prescription.id = his_prescription_project.prescription_id and his_prescription.order_status = 2 and his_prescription.status = 1")
+
+	} else if is_settle == 1 {
+		db = db.Joins("join his_prescription on his_prescription.id = his_prescription_project.prescription_id and his_prescription.order_status <> 2 and his_prescription.status = 1")
+	}
+	if is_code == 2 {
+		//db = db.Joins("join his_prescription on his_prescription.id = his_doctor_advice_info.prescription_id and his_prescription.order_status = 2 and his_prescription.status = 1")
+
+		db = db.Where("his_prescription_project.drug_code <> ''")
+
+	} else if is_code == 1 {
+
+		db = db.Where("length(his_prescription_project.drug_code) = 0")
+
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("join xt_patients on xt_patients.id = his_doctor_advice_info.patient_id and xt_patients.user_org_id = ? and xt_patients.name like ?", orgId, keywords)
+
+	}
+
+	if orgId > 0 {
+		db = db.Where("his_prescription_project.user_org_id=?", orgId)
+	}
+	if start_time > 0 {
+		db = db.Where("his_prescription_project.record_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("his_prescription_project.record_date<=?", end_time)
+	}
+	offset := (page - 1) * limit
+	if is_sale == 1 {
+		db = db.Where("his_prescription_project.is_upload = 1")
+	}
+	if is_sale == 2 {
+		db = db.Where("his_prescription_project.is_upload = 2 or his_prescription_project.is_upload =0")
+	}
+	db = db.Where("his_prescription_project.type = 3")
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("his_prescription_project.record_date desc").Find(&list).Error
+
+	return list, total, err
+}
+
 func GetBloodDrugCode(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64) (advice []*models.DoctorAdvice, total int64, err error) {
 
 	db := XTReadDB().Model(&advice).Where("status=1 and advice_type !=1")