自备药开发

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
-		UserSysBeforeCount:       patient.UserSysBeforeCount,
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
+		UserSysBeforeCount:           patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
-		BloodPatients:            1,
-		Lapseto:                  patient.Lapseto,
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
+		BloodPatients:             1,
+		Lapseto:                   patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1228,6 +1228,16 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.ExecutionFrequency = executionFrequency
 		}
 
+		if adviceNameM["way"] != nil || reflect.TypeOf(adviceNameM["way"]).String() == "float64" {
+			way := int64(adviceNameM["way"].(float64))
+			advice.Way = way
+		}
+
+		if adviceNameM["drug_id"] != nil || reflect.TypeOf(adviceNameM["drug_id"]).String() == "float64" {
+			drug_id := int64(adviceNameM["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -1493,6 +1503,7 @@ func (c *PatientApiController) ExecGroupAdvice() {
 }
 
 func (c *PatientApiController) ExecDoctorAdvice() {
+
 	patient, _ := c.GetInt64("patient", 0)
 	id, _ := c.GetInt64("id", 0)
 	executionTime := c.GetString("execution_time")
@@ -1563,9 +1574,121 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	// advice.Checker = checker
 
 	adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
-
+	fmt.Println("adviceName", adviceName.Way)
+	timeStr := time.Now().Format("2006-01-02")
+	fmt.Println("timestr", timeStr)
 	//如果医嘱已执行，生成自备药出库单
-	if adviceName.ExecutionState == 1 {
+	//来自药品库
+	if adviceName.ExecutionState == 1 && adviceName.Way == 1 {
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		//产询今日是否存在出库单
+		timeStr := time.Now().Format("2006-01-02")
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", timeStr+" 00:00:00", loc)
+		_, errcode := service.GetDrugWareseOut(theTime.Unix(), adminUserInfo.CurrentOrgId)
+		if errcode == gorm.ErrRecordNotFound {
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPRKD" + strconv.FormatInt(number, 10)
+			//查询厂家
+			drug, _ := service.GetManufacturer(adviceName.DrugId)
+			//创建
+			warehouse := models.XtDrugWarehouse{
+				WarehousingOrder: warehousing_out_order,
+				OperationTime:    theTime.Unix(),
+				Creater:          adminUserInfo.AdminUser.Id,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Status:           1,
+				WarehousingTime:  theTime.Unix(),
+				Manufacturer:     drug.Manufacturer,
+				Type:             1,
+			}
+			service.CreateDrugWarehoue(&warehouse)
+		}
+
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		total = total + 1
+		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		number = number + total
+		warehousing_out_order = "YPRKD" + strconv.FormatInt(number, 10)
+		drug, _ := service.GetManufacturer(adviceName.DrugId)
+		out := models.XtDrugWarehouseOut{
+			WarehouseOutOrderNumber: warehousing_out_order,
+			OperationTime:           theTime.Unix(),
+			Creater:                 adminUserInfo.AdminUser.Id,
+			OrgId:                   adminUserInfo.CurrentOrgId,
+			Ctime:                   time.Now().Unix(),
+			Status:                  1,
+			WarehouseOutTime:        theTime.Unix(),
+			Manufacturer:            drug.Manufacturer,
+			Type:                    1,
+			IsSys:                   1,
+		}
+		service.CreateDrugWareHouseOut(&out)
+
+		//查询今日的出库单号
+		orderOut, _ := service.GetTodayWareHousringOrder(theTime.Unix(), adminUserInfo.CurrentOrgId)
+		prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
+		outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+		timeArrs := strings.Split(timeStr, "-")
+		totals, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		totals = totals + 1
+		warehousing_out_orders := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrs[0] + timeArrs[1] + timeArrs[2] + "000"
+		numbers, _ := strconv.ParseInt(warehousing_out_orders, 10, 64)
+		number = numbers + totals
+		warehousing_out_order = "YPCKD" + strconv.FormatInt(numbers, 10)
+		info := models.XtDrugWarehouseOutInfo{
+			WarehouseOutId:          orderOut.ID,
+			DrugId:                  adviceName.DrugId,
+			Count:                   outStoreNumber,
+			Price:                   drug.RetailPrice,
+			TotalPrice:              drug.RetailPrice,
+			ProductDate:             theTime.Unix(),
+			Ctime:                   time.Now().Unix(),
+			Status:                  1,
+			OrgId:                   adminUserInfo.CurrentOrgId,
+			IsCancel:                2,
+			WarehouseOutOrderNumber: warehousing_out_order,
+			Type:                    1,
+			Manufacturer:            orderOut.Manufacturer,
+			IsSys:                   1,
+			SysRecordTime:           theTime.Unix(),
+		}
+		service.CreateWareHouseOutInfo(&info)
+
+		timeArrss := strings.Split(timeStr, "-")
+		totalss, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+		totalss = totalss + 1
+		warehousing_out_orderss := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrss[0] + timeArrss[1] + timeArrss[2] + "000"
+		numberss, _ := strconv.ParseInt(warehousing_out_orderss, 10, 64)
+		number = numberss + totalss
+		warehousing_out_order = "YPCKD" + strconv.FormatInt(numberss, 10)
+		detail := models.XtDrugAutomaticReduceDetail{
+			WarehouseOutOrderNumber: warehousing_out_order,
+			WarehouseOutId:          orderOut.ID,
+			PatientId:               adviceName.PatientId,
+			Ctime:                   time.Now().Unix(),
+			RecordTime:              theTime.Unix(),
+			OrgId:                   adminUserInfo.CurrentOrgId,
+			GoodId:                  adviceName.DrugId,
+			Count:                   outStoreNumber,
+			Status:                  1,
+		}
+		service.CreateAotoMaticReduceDetail(&detail)
+	}
+
+	if adviceName.ExecutionState == 1 && adviceName.Way == 2 {
+
 		prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
 		outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 

controllers/self_drug_api_congtroller.go

@@ -629,6 +629,9 @@ func (this *SelfDrugApiController) GetSelfMedicalList() {
 	orgId := adminUserInfo.CurrentOrgId
 	//查询该机构是否开启自备药
 	medical, _ := service.GetSetSelfMedical(orgId)
+
+	//查询该机构下的药品库
+	drugName, _ := service.GetAllDrugName(orgId)
 	//开启
 	if medical.DrugStart == 1 {
 		list, err := service.GetSelfMedicalList(patient_id)
@@ -638,6 +641,11 @@ func (this *SelfDrugApiController) GetSelfMedicalList() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"medicalList": list,
+			"drugName":    drugName,
+		})
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugName": drugName,
 		})
 	}
 }
@@ -645,17 +653,40 @@ func (this *SelfDrugApiController) GetSelfMedicalList() {
 func (this *SelfDrugApiController) GetDrugDescByDrugName() {
 
 	drug_name := this.GetString("drug_name")
-
 	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
+	way, _ := this.GetInt64("way")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	drugspec, err := service.GetDrugDescByDrugName(drug_name, patient_id, orgId)
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
-		return
+	drug_id, _ := this.GetInt64("id")
+	//从基础库查询
+	if way == 1 {
+		//查询基础库数据
+		medcal, err := service.GetBaseMedcal(drug_name, orgId)
+		//统计入库数量
+		countInfo, err := service.GetTotalBaseMedicalCount(drug_id, orgId)
+
+		//统计出库数量
+		countout, err := service.GetTotalBaseMedicalCountOut(drug_id, orgId)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugspec":  medcal,
+			"countInfo": countInfo,
+			"countout":  countout,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"drugspec": drugspec,
-	})
+	//从自备药库查询
+	if way == 2 {
+		drugspec, err := service.GetDrugDescByDrugName(drug_name, patient_id, orgId)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"drugspec": drugspec,
+		})
+	}
+
 }

models/dialysis.go

@@ -393,6 +393,8 @@ type DoctorAdvice struct {
 	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (DoctorAdvice) TableName() string {

models/self_drug_models.go

@@ -102,16 +102,20 @@ func (XtStandName) TableName() string {
 }
 
 type XtSelfMedical struct {
-	DrugName    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugSpec    string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	DrugNameId  int64  `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	MinUnit     string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec           string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugNameId         int64   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime        int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime        int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	MinUnit            string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	PrescribingNumber  float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	SingleDose         float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 }
 
 func (XtSelfMedical) TableName() string {
@@ -220,3 +224,127 @@ type XtSelfOutStocks struct {
 	DialysisNO     string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	Count          int64
 }
+
+type XtDrugWarehouse struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime    int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater          int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Modifier         int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime  int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+	Dealer           int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type             int64  `gorm:"column:type" json:"type" form:"type"`
+}
+
+func (XtDrugWarehouse) TableName() string {
+	return "xt_drug_warehouse"
+}
+
+type XtDrugWarehouseOut struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime           int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                 int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	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"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime        int64  `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                  int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                    int64  `gorm:"column:type" json:"type" form:"type"`
+	IsSys                   int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+}
+
+func (XtDrugWarehouseOut) TableName() string {
+	return "xt_drug_warehouse_out"
+}
+
+type XtDrugWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+}
+
+func (XtDrugWarehouseOutInfo) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}
+
+type XtDrugAutomaticReduceDetail struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodId                  int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId              int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
+}
+
+func (XtDrugAutomaticReduceDetail) TableName() string {
+	return "xt_drug_automatic_reduce_detail"
+}
+
+type XtDrugWarehouseInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+}
+
+func (XtDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
+type DrugWarehousingInfo struct {
+	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count  int64
+}

service/mobile_dialysis_service.go

@@ -491,7 +491,7 @@ func MobileGetDoctorAdvices(orgID int64, patientID int64, recordDate int64) ([]*
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientID, orgID, recordDate).
-		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,IF(parent_id>0, parent_id, id) as advice_order,groupno").
+		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,IF(parent_id>0, parent_id, id) as advice_order,groupno").
 		Order("start_time asc, groupno desc, advice_order desc, id").
 		Scan(&records).Error
 

service/self_drug_service.go

@@ -307,3 +307,71 @@ func GetDrugDescByDrugName(drugname string, patient_id int64, orgid int64) (self
 	err = XTReadDB().Model(&selfMedical).Where("drug_name = ? and patient_id = ? and user_org_id = ? and status = 1", drugname, patient_id, orgid).Find(&selfMedical).Error
 	return selfMedical, err
 }
+
+func GetBaseMedcal(drugname string, orgid int64) (baseDrug []*models.XtBaseDrug, err error) {
+
+	err = XTReadDB().Model(&baseDrug).Where("drug_name = ? and org_id = ? and status = 1", drugname, orgid).Find(&baseDrug).Error
+	return baseDrug, err
+}
+
+func GetTotalBaseMedicalCount(drug_id int64, orgid int64) (drugInfo []*models.DrugWarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	err = db.Select("x.drug_id,sum(x.warehousing_count) as count").Where("drug_id = ? and org_id = ?", drug_id, orgid).Scan(&drugInfo).Error
+	return drugInfo, err
+}
+
+func GetTotalBaseMedicalCountOut(drug_id int64, orgid int64) (drugOut []*models.DrugWarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	err = db.Select("x.drug_id,sum(x.count) as count").Where("drug_id = ? and org_id = ?", drug_id, orgid).Scan(&drugOut).Error
+	return drugOut, err
+}
+
+func GetDrugWareseOut(startime int64, orgid int64) (*models.XtDrugWarehouse, error) {
+	warehouse := models.XtDrugWarehouse{}
+	err := XTReadDB().Model(&warehouse).Where("warehousing_time = ? and org_id = ? and status = 1", startime, orgid).Find(&warehouse).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &warehouse, nil
+}
+
+func GetManufacturer(id int64) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := XTReadDB().Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	return drug, err
+}
+
+func CreateDrugWarehoue(warehouse *models.XtDrugWarehouse) error {
+
+	err := XTWriteDB().Model(&warehouse).Create(&warehouse).Error
+	return err
+}
+
+func GetTodayWareHousringOrder(startime int64, orgid int64) (models.XtDrugWarehouseOut, error) {
+	warehouse := models.XtDrugWarehouseOut{}
+	err := XTReadDB().Model(&warehouse).Where("warehouse_out_time = ? and org_id = ? and status = 1", startime, orgid).Find(&warehouse).Error
+	return warehouse, err
+}
+
+func CreateDrugWareHouseOut(out *models.XtDrugWarehouseOut) error {
+
+	err := XTWriteDB().Model(&out).Create(&out).Error
+	return err
+}
+
+func CreateWareHouseOutInfo(info *models.XtDrugWarehouseOutInfo) error {
+
+	err := XTWriteDB().Model(&info).Create(&info).Error
+	return err
+}
+
+func CreateAotoMaticReduceDetail(detail *models.XtDrugAutomaticReduceDetail) error {
+
+	err := XTWriteDB().Model(&detail).Create(&detail).Error
+	return err
+}