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

controllers/gobal_config_api_controller.go

@@ -69,6 +69,9 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")
 
+	beego.Router("/api/passdetail/export", &GobalConfigApiController{}, "get:GetPassExportData")
+	beego.Router("/api/consumedetail/export", &GobalConfigApiController{}, "get:GetExportData")
+
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1366,3 +1369,40 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	})
 
 }
+
+func (c *GobalConfigApiController) GetPassExportData() {
+
+}
+
+func (c *GobalConfigApiController) GetExportData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	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()
+	}
+	adminInfo := c.GetAdminUserInfo()
+	order, _ := service.GetExportHisOrderList(adminInfo.CurrentOrgId, startTime, endTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+
+}

controllers/his_api_controller.go

@@ -55,8 +55,12 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
 
+	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
+
+	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
+
 	//新增附加费用
-	beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
+	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
 
 	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
 
@@ -843,7 +847,10 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		med_list_codg, _ := json["medical_insurance_number"].(string)
 		advice.MedListCodg = med_list_codg
 	}
-
+	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
 	return 0
 }
 
@@ -895,6 +902,11 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		day, _ := json["number_days"].(string)
 		project.Day = day
 	}
+
+	if json["unit"] != nil && reflect.TypeOf(json["unit"]).String() == "string" {
+		unit, _ := json["unit"].(string)
+		project.Unit = unit
+	}
 	return 0
 }
 
@@ -927,12 +939,43 @@ func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditi
 }
 
 func (c *HisApiController) GetHisOrderList() {
+	page, _ := c.GetInt64("page", -1)
+	limit, _ := c.GetInt64("limit", -1)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	types, _ := c.GetInt64("type", 0)
+	keywords := c.GetString("keywords")
+
+	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()
+	}
+
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err := service.GetHisOrderList(org_id)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"order": order,
+			"total": total,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -960,13 +1003,29 @@ func (c *HisApiController) GetHisOrder() {
 }
 
 func (c *HisApiController) GetHisPrescriptionList() {
+	record_date := c.GetString("record_date")
+	keywords := c.GetString("keywords")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)
-	fmt.Println(prescriptionOrder)
+	prescriptionOrder, err, total := service.GetHisPatientPrescriptionList(adminInfo.CurrentOrgId, keywords, recordDateTime, page, limit)
 
+	//adminInfo := c.GetAdminUserInfo()
+	//prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)
+	//fmt.Println(prescriptionOrder)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"order": prescriptionOrder,
+			"total": total,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1933,3 +1992,11 @@ func (this *HisApiController) DeleteAddition() {
 	}
 
 }
+
+func (this *HisApiController) GetAdminUsers() {
+	adminUser := this.GetAdminUserInfo()
+	doctors, _ := service.GetAllHisDoctor(adminUser.CurrentOrgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"doctors": doctors,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -338,10 +338,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 {
 		dewater_amount = dewater_amount * 1000
+	}
 
-		if dewater_amount < 0 {
-			dewater_amount = 0
-		}
+	if dewater_amount < 0 {
+		dewater_amount = 0
 	}
 
 	if dialysistype == 1 {
@@ -354,10 +354,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		var system_dialysisPrescribe *models.SystemPrescription
 
 		var mode_id int64
-		weightfirst, _ := service.FindLastDryWeightAdjust(adminUserInfo.Org.Id, id)
-		if weightfirst.DryWeight > weighing_before {
-			return
-		}
+		//weightfirst, _ := service.FindLastDryWeightAdjust(adminUserInfo.Org.Id, id)
+		//if weightfirst.DryWeight > weighing_before {
+		//	return
+		//}
 
 		dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if schedual != nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1060,44 +1060,174 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
-
 		timeLayout2 := "2006-01-02 15:04:05"
 		loc, _ := time.LoadLocation("Local")
-
 		theTime, errs := time.ParseInLocation(timeLayout2, execution_time, loc)
 		if errs != nil {
 			utils.ErrorLog(errs.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
-
 		adminInfo := c.GetMobileAdminUserInfo()
 		advice_id, _ := c.GetInt64("advice_id")
 		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-
 		if advices.ExecutionState == 1 {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 			return
 		}
-
 		if advices.Checker >= 0 && advices.Checker == adminInfo.AdminUser.Id {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 			return
 		}
-
 		if advices.StartTime > theTime.Unix() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 			return
 		}
-
 		advices.ExecutionState = 1
 		advices.ExecutionStaff = adminInfo.AdminUser.Id
 		advices.ExecutionTime = theTime.Unix()
-
 		err := service.SaveHisDoctorAdvice(&advices)
 		var ids []string
 		ids = append(ids, strconv.FormatInt(advices.ID, 10))
 		if err == nil {
+			//药品管理信息
+			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+			if drugStockConfig.IsOpen == 1 {
+				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
+				record_time := advice.RecordDate
+
+				out, err := service.FindDrugStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+				if err == gorm.ErrRecordNotFound {
+					//没有记录，则创建出库单
+					timeStr := time.Now().Format("2006-01-02")
+					timeArr := strings.Split(timeStr, "-")
+					total, _ := service.FindAllDrugWarehouseOut(adminInfo.Org.Id)
+					total = total + 1
+					warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+					number = number + total
+					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+					creater := adminInfo.AdminUser.Id
+					warehouseOut := models.DrugWarehouseOut{
+						WarehouseOutOrderNumber: warehousing_out_order,
+						OperationTime:           time.Now().Unix(),
+						OrgId:                   adminInfo.Org.Id,
+						Creater:                 creater,
+						Ctime:                   time.Now().Unix(),
+						Status:                  1,
+						WarehouseOutTime:        record_time,
+						Dealer:                  0,
+						Manufacturer:            0,
+						Type:                    1,
+						IsSys:                   1,
+					}
+					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+					if err != nil {
+						utils.TraceLog("创建出库单失败 err = %v", err)
+					} else {
+						if advice.PrescribingNumber > 0 {
+							warehouseOutInfo := &models.DrugWarehouseOutInfo{
+								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+								WarehouseOutId:          warehouseOut.ID,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Remark:                  "",
+								OrgId:                   adminInfo.Org.Id,
+								Type:                    1,
+								Manufacturer:            0,
+								Dealer:                  0,
+								IsSys:                   1,
+								SysRecordTime:           record_time,
+								DrugId:                  advice.DrugId,
+							}
+							prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							warehouseOutInfo.Count = count
+							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
+							warehouseOutInfo.Price = stockInInfo.Price
+							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+							if err == nil {
+								details := &models.DrugAutomaticReduceDetail{
+									WarehouseOutId:          warehouseOutInfo.ID,
+									WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+									PatientId:               advice.PatientId,
+									Ctime:                   time.Now().Unix(),
+									Mtime:                   time.Now().Unix(),
+									Status:                  1,
+									RecordTime:              record_time,
+									OrgId:                   adminInfo.Org.Id,
+									DrugId:                  advice.DrugId,
+									Count:                   count,
+								}
+								service.AddSigleDrugAutoReduceRecordInfo(details)
+							}
+						}
+					}
+
+				} else if err == nil {
+					outInfo, err := service.FindDrugStockOutInfoByTypeId(adminInfo.Org.Id, advice.DrugId, out.ID, out.WarehouseOutOrderNumber)
+					if err == gorm.ErrRecordNotFound {
+						warehouseOutInfo := &models.DrugWarehouseOutInfo{
+							WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+							WarehouseOutId:          out.ID,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Remark:                  "",
+							OrgId:                   adminInfo.Org.Id,
+							Type:                    1,
+							Manufacturer:            0,
+							Dealer:                  0,
+							IsSys:                   1,
+							SysRecordTime:           record_time,
+						}
+
+						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
+						warehouseOutInfo.Price = stockInInfo.Price
+						warehouseOutInfo.DrugId = advice.DrugId
+						prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+						warehouseOutInfo.Count = count
+						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+						if err == nil {
+							details := &models.DrugAutomaticReduceDetail{
+								WarehouseOutId:          warehouseOutInfo.ID,
+								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								PatientId:               advice.PatientId,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   time.Now().Unix(),
+								Status:                  1,
+								RecordTime:              record_time,
+								OrgId:                   adminInfo.Org.Id,
+								DrugId:                  advice.DrugId,
+								Count:                   count,
+							}
+							service.AddSigleDrugAutoReduceRecordInfo(details)
+						}
+
+					} else if err == nil { //记录存在，则将增加数量
+						if outInfo.ID > 0 {
+							prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+							service.UpdateDrugStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, count)
+						}
+						prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+						details := &models.DrugAutomaticReduceDetail{
+							WarehouseOutId:          outInfo.ID,
+							WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+							PatientId:               advice.PatientId,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   time.Now().Unix(),
+							Status:                  1,
+							RecordTime:              record_time,
+							OrgId:                   adminInfo.Org.Id,
+							DrugId:                  advice.DrugId,
+							Count:                   count,
+						}
+						service.AddSigleDrugAutoReduceRecordInfo(details)
+					}
+				}
+			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",
 				"advice": advices,

controllers/role_controller.go

@@ -233,6 +233,10 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	//门诊管理
 	_, _, outpatientRegistrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
 
+	_, _, outpatientRegistrationPurviewTwo := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientDoctorStation")
+
+	_, _, outpatientRegistrationPurviewThree := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientCharges")
+
 	//透析管理
 	_, _, originDialysisWatchPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/watch")
 	_, _, originWorkforcePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/workforce/patient")
@@ -255,6 +259,10 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	//门诊管理
 
 	subPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+
+	subPurviewTreeViewModelTwo := []*service.PurviewTreeViewModel{}
+	subPurviewTreeViewModelThree := []*service.PurviewTreeViewModel{}
+
 	for _, item := range outpatientRegistrationPurview {
 		temp := &service.PurviewTreeViewModel{
 			ID:     item.Id,
@@ -265,10 +273,38 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		subPurviewTreeViewModel = append(subPurviewTreeViewModel, temp)
 	}
 
+	for _, item := range outpatientRegistrationPurviewTwo {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subPurviewTreeViewModelTwo = append(subPurviewTreeViewModelTwo, temp)
+	}
+
+	for _, item := range outpatientRegistrationPurviewThree {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subPurviewTreeViewModelThree = append(subPurviewTreeViewModelThree, temp)
+	}
+
 	for _, item := range outpatientRegistration {
 		if item.Name == "门诊挂号" {
 			item.Childs = append(item.Childs, subPurviewTreeViewModel...)
 		}
+
+		if item.Name == "门诊医生站" {
+			item.Childs = append(item.Childs, subPurviewTreeViewModelTwo...)
+		}
+
+		if item.Name == "门诊收费" {
+			item.Childs = append(item.Childs, subPurviewTreeViewModelThree...)
+		}
 	}
 
 	//电子病历

controllers/schedule_api_controller.go

@@ -687,17 +687,17 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		weekEnd1 := 7 - weekDay1
 		weekStart1 := weekEnd1 - 6
 		for index := weekStart1; index <= weekEnd1; index++ {
+			fmt.Println(index)
 			theDay := thisTime1.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
 
-			if index == -1 {
-				start_time = theDay.Format("2006-01-02")
-				fmt.Println(start_time)
-			}
-
-			end_time = theDay.Format("2006-01-02")
 		}
 
+		fmt.Println(days)
+
+		start_time = days[0]
+		end_time = days[len(days)-1]
+
 		timeLayout := "2006-01-02"
 		loc, _ := time.LoadLocation("Local")
 
@@ -731,13 +731,12 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 		for index := weekStart2; index <= weekEnd2; index++ {
 			theDay := thisTime2.AddDate(0, 0, index)
 			days = append(days, theDay.Format("2006-01-02"))
-			if index == -1 {
-				start_time = theDay.Format("2006-01-02")
-			}
 
-			end_time = theDay.Format("2006-01-02")
 		}
 
+		start_time = days[0]
+		end_time = days[len(days)-1]
+
 		timeLayout := "2006-01-02"
 		loc, _ := time.LoadLocation("Local")
 

models/drug.go

@@ -1,58 +1,57 @@
 package models
 
 type BaseDrugLib 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"`
-	MinUnit                     string                         `gorm:"column:min_unit" json:"min_unit" form:"min_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"`
-	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"`
-	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"`
-	MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugWarehouseInfo           []*DrugWarehouseInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"stock_in"`
+	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"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_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"`
+	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"`
+	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"`
+	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 
 func (BaseDrugLib) TableName() string {

models/his_models.go

@@ -199,6 +199,7 @@ type HisDoctorAdviceInfo struct {
 	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"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -248,25 +249,26 @@ func (HisPatientCaseHistory) TableName() string {
 }
 
 type HisPrescriptionInfo 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"`
-	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	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"`
-	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"`
-	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	ID                 int64           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	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"`
+	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"`
+	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       string          `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string          `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	PrescriptionStatus int64           `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -452,6 +454,7 @@ type HisPrescriptionProject struct {
 	Day                string     `gorm:"column:day" json:"day" form:"day"`
 	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/gobal_config_service.go

@@ -192,3 +192,24 @@ func CreateXTHisRecord(config *models.XtHisConfig) (err error) {
 	err = writeDb.Model(&models.XtHisConfig{}).Create(config).Error
 	return
 }
+
+func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64) (order []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	if start_time != 0 {
+		db = db.Where("his_order.settle_accounts_date>=?", start_time)
+	}
+	if end_time != 0 {
+		db = db.Where("his_order.settle_accounts_date<=?", end_time)
+	}
+
+	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ?", user_org_id)
+
+	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPrescriptionInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("XtHisDepartment", "status = 1")
+		})
+	err = db.Order("ctime desc").Find(&order).Error
+	return
+}

service/his_service.go

@@ -204,8 +204,122 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 	return
 }
 
-func GetAllDrugLibList(org_id int64) (list []*models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
+type OtherDrugWarehouseInfo struct {
+	ID               int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingCount int64 `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Status           int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (OtherDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
+type VMDrugSalesReturnInfo struct {
+	ID     int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (VMDrugSalesReturnInfo) TableName() string {
+	return "xt_drug_sales_return_info"
+}
+
+type VMDrugWarehouseOutInfo struct {
+	ID     int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (VMDrugWarehouseOutInfo) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}
+
+type VMDrugCancelStockInfo struct {
+	ID     int64 `gorm:"column:id" json:"id" form:"id"`
+	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (VMDrugCancelStockInfo) TableName() string {
+	return "xt_drug_cancel_stock_info"
+}
+
+type BaseDrugLib 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"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_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"`
+	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"`
+	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"`
+	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
+	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
+	VMDrugWarehouseOutInfo []*VMDrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_out"`
+	VMDrugCancelStockInfo  []*VMDrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"cancel_stock"`
+}
+
+func (BaseDrugLib) TableName() string {
+	return "xt_base_drug"
+}
+
+func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
+	err = readDb.Model(&BaseDrugLib{}).Preload("OtherDrugWarehouseInfo", "status = 1 AND org_id = ?", org_id).
+		Preload("VMDrugSalesReturnInfo", "status = 1 AND org_id = ?", org_id).
+		Preload("VMDrugWarehouseOutInfo", "status = 1 AND org_id = ?", org_id).
+		Preload("VMDrugCancelStockInfo", "status = 1 AND org_id = ?", org_id).
+		Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
 	return
 }
 
@@ -285,13 +399,37 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 
 }
 
-func GetHisOrderList(user_org_id int64) (order []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("status = 1 AND user_org_id = ?", user_org_id).
-		Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string) (order []*models.HisOrder, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisOrder{})
+
+	if doctor_id > 0 {
+		db = db.Joins("join his_prescription_info as info on info.patient_id = his_order.patient_id AND info.record_date = his_order.settle_accounts_date AND info.doctor_id = ? AND info.user_org_id = ?", doctor_id, user_org_id)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id  AND patient.name like ? AND patient.user_org_id = ?", keywords, user_org_id)
+
+	}
+
+	if start_time != 0 {
+		db = db.Where("his_order.settle_accounts_date>=?", start_time)
+	}
+	if end_time != 0 {
+		db = db.Where("his_order.settle_accounts_date<=?", end_time)
+	}
+
+	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ?", user_org_id)
+
+	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
-		Preload("HisPrescriptionInfo", "status = 1 AND user_org_id = ?", user_org_id).Order("ctime desc").
-		Find(&order).Error
+		Preload("HisPrescriptionInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("XtHisDepartment", "status = 1")
+		})
+	db = db.Count(&total)
+	err = db.Limit(limit).Offset(offset).Order("ctime desc").Find(&order).Error
 	return
 }
 
@@ -352,6 +490,7 @@ func GetHisPrescriptionThree(org_id int64, patient_id int64, record_date int64,
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
+		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND batch_number=?", org_id, record_date, patient_id, number).
 		Find(&prescription).Error
 	return
@@ -530,3 +669,20 @@ func DelelteAddition(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisAdditionalCharge{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
+
+func GetHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*Schedule, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients as p On xt_schedule.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
+		db = db.Joins("JOIN his_prescription_info as info On xt_schedule.patient_id = info.patient_id  AND info.user_org_id = ? AND  info.record_date = ? AND info.prescription_number like ?", org_id, record_date, keywords)
+	}
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1", org_id).
+		Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1", org_id)
+	db = db.Count(&total)
+	err = db.Limit(limit).Offset(offset).Find(&patients).Error
+	return
+}

service/user_service.go

@@ -158,3 +158,9 @@ func ModifyDryWeightData(adjust *models.SgjPatientDryweight, id int64) error {
 	err := XTWriteDB().Model(&adjust).Where("id=?", id).Updates(map[string]interface{}{"dry_weight": adjust.DryWeight, "creator": adjust.Creator, "remakes": adjust.Remakes, "adjusted_value": adjust.AdjustedValue}).Error
 	return err
 }
+
+func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
+
+	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
+	return appRole, err
+}