11月9日库存管理

controllers/dialysis_api_controller.go

@@ -95,6 +95,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/gethisdialysisgoodcount", &DialysisApiController{}, "Get:GetHisDialysisGoodCount")
 
 	beego.Router("/api/schedule/getpatientshedule", &DialysisApiController{}, "Get:GetPatientSchedule")
+
+	beego.Router("/api/patient/getscheduleprintlist", &DialysisApiController{}, "Get:GetSchedulePrintList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -306,6 +308,7 @@ func (c *DialysisApiController) PostPrescription() {
 	is_water, _ := c.GetInt64("is_water")
 	drhy_water := c.GetString("drhy_water")
 	dry_water_hour := c.GetString("dry_water_hour")
+	water_machine := c.GetString("water_machine")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -410,6 +413,7 @@ func (c *DialysisApiController) PostPrescription() {
 		IsWater:                    is_water,
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
+		WaterMachine:               water_machine,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -638,6 +642,7 @@ func (c *DialysisApiController) PostSoulution() {
 	is_water, _ := c.GetInt64("is_water")
 	dry_water_hour := c.GetString("dry_water_hour")
 	drhy_water := c.GetString("drhy_water")
+	water_machine := c.GetString("water_machine")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -754,6 +759,7 @@ func (c *DialysisApiController) PostSoulution() {
 		IsWater:                    is_water,
 		DryWaterHour:               dry_water_hour,
 		DrhyWater:                  drhy_water,
+		WaterMachine:               water_machine,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1525,6 +1531,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	weight_befor_remake := c.GetString("weight_befor_remake")
 	height := c.GetString("height")
 	age := c.GetString("age")
+	his_department := c.GetString("his_department")
+	his_bed := c.GetString("his_bed")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1596,6 +1604,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		WeightBeforRemake:              weight_befor_remake,
 		Height:                         height,
 		Age:                            age,
+		HisDepartment:                  his_department,
+		HisBed:                         his_bed,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -4636,3 +4646,35 @@ func (this *DialysisApiController) GetPatientSchedule() {
 		"schedulePatient": schedulePatient,
 	})
 }
+
+func (c *DialysisApiController) GetSchedulePrintList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 10)
+	schedulType, _ := c.GetInt64("schedule_type", 0)
+	partitionType, _ := c.GetInt64("partition_type", 0)
+	keywords := c.GetString("keywords")
+	schedule_date := c.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(schedule_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", schedule_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+	adminUserInfo := c.GetAdminUserInfo()
+
+	list, total, _ := service.GetSchedulePrintList(page, limit, schedulType, partitionType, keywords, theStartTime, adminUserInfo.CurrentOrgId)
+
+	listOne, _ := service.GetSchedulePrintListOne(page, limit, schedulType, partitionType, keywords, theStartTime, adminUserInfo.CurrentOrgId)
+	numberList, _ := service.GetAllBedNumberSix(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"total":      total,
+		"numberList": numberList,
+		"listOne":    listOne,
+	})
+
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -886,9 +886,8 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	psychological_other := c.GetString("psychological_other")
 
 	admission_number := c.GetString("admission_number")
-
-	//diacrisis, _ := c.GetInt64("diacrisis")
-
+	tumble, _ := c.GetInt64("diacrisis")
+	diacrisis := c.GetString("diacrisis")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -942,6 +941,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		PsychologicalOther:           psychological_other,
 		AdmissionNumber:              admission_number,
 		Tumble:                       tumble,
+		Diacrisis:                    diacrisis,
 	}
 
 	if receiveTreatment.ID == 0 { //新增
@@ -1375,6 +1375,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	drhy_water := c.GetString("drhy_water")
 
 	dry_water_hour := c.GetString("dry_water_hour")
+
+	water_machine := c.GetString("water_machine")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1484,6 +1486,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		IsWater:                    is_war,
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
+		WaterMachine:               water_machine,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2599,7 +2602,7 @@ func (c *DialysisAPIController) PostSolution() {
 	}
 	drhy_water := c.GetString("drhy_water")
 	dry_water_hour := c.GetString("dry_water_hour")
-
+	water_machine := c.GetString("water_machine")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2710,6 +2713,7 @@ func (c *DialysisAPIController) PostSolution() {
 		IsWater:                    is_war,
 		DrhyWater:                  drhy_water,
 		DryWaterHour:               dry_water_hour,
+		WaterMachine:               water_machine,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2796,6 +2796,18 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.Age = age
 	}
+
+	if dataBody["his_department"] != nil && reflect.TypeOf(dataBody["his_department"]).String() == "string" {
+		his_department := dataBody["his_department"].(string)
+
+		evaluation.HisDepartment = his_department
+	}
+
+	if dataBody["his_bed"] != nil && reflect.TypeOf(dataBody["his_bed"]).String() == "string" {
+		his_bed := dataBody["his_bed"].(string)
+
+		evaluation.HisBed = his_bed
+	}
 	return
 }
 
@@ -2944,7 +2956,7 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		if dataBody["drug_name_id"] != nil || reflect.TypeOf(dataBody["drug_name_id"]).String() == "float64" {
 			drug_name_id := int64(dataBody["drug_name_id"].(float64))
 			advice.DrugNameId = drug_name_id
-			fmt.Println("0000000000", advice.DrugNameId)
+
 		}
 	}
 

models/dialysis.go

@@ -323,6 +323,8 @@ type PredialysisEvaluation struct {
 	WeightBeforRemake              string  `gorm:"column:weight_befor_remake" json:"weight_befor_remake" form:"weight_befor_remake"`
 	Height                         string  `gorm:"column:height" json:"height" form:"height"`
 	Age                            string  `gorm:"column:age" json:"age" form:"age"`
+	HisDepartment                  string  `gorm:"column:his_department" json:"his_department" form:"his_department"`
+	HisBed                         string  `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -963,6 +965,7 @@ type ReceiveTreatmentAsses struct {
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
 	AdmissionNumber              string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Diacrisis                    string `gorm:"column:diacrisis" json:"diacrisis" form:"diacrisis"`
 	Tumble                       int64  `gorm:"column:tumble" json:"tumble" form:"tumble"`
 }
 
@@ -1200,3 +1203,29 @@ type HisDoctorAdvice struct {
 func (HisDoctorAdvice) TableName() string {
 	return "his_doctor_advice_info"
 }
+
+type DialysisScheduleSix 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"`
+	PartitionId  int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+}
+
+type DialysisScheduleSeven 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"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (DialysisScheduleSeven) TableName() string {
+	return "xt_schedule"
+}

models/good_models.go

@@ -146,21 +146,21 @@ func (GoodInfoSeven) TableName() string {
 }
 
 type GoodsTypeOne struct {
-	ID             int64       `gorm:"column:id" json:"id"`
-	TypeCode       string      `gorm:"column:type_code" json:"type_code"`
-	TypeName       string      `gorm:"column:type_name" json:"type_name"`
-	Remark         string      `gorm:"column:remark" json:"remark"`
-	Ctime          int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime          int64       `gorm:"column:mtime" json:"mtime"`
-	Creater        int64       `gorm:"column:creater" json:"creater"`
-	Modifier       int64       `gorm:"column:modifier" json:"modifier"`
-	OrgId          int64       `gorm:"column:org_id" json:"org_id"`
-	Status         int64       `gorm:"column:status" json:"status"`
-	Type           int64       `gorm:"column:type" json:"type"`
-	Number         int64       `gorm:"column:number" json:"number"`
-	OutStock       int64       `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
-	StockAttribute int64       `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
-	GoodInfo       []*GoodInfo `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
+	ID             int64                    `gorm:"column:id" json:"id"`
+	TypeCode       string                   `gorm:"column:type_code" json:"type_code"`
+	TypeName       string                   `gorm:"column:type_name" json:"type_name"`
+	Remark         string                   `gorm:"column:remark" json:"remark"`
+	Ctime          int64                    `gorm:"column:ctime" json:"ctime"`
+	Mtime          int64                    `gorm:"column:mtime" json:"mtime"`
+	Creater        int64                    `gorm:"column:creater" json:"creater"`
+	Modifier       int64                    `gorm:"column:modifier" json:"modifier"`
+	OrgId          int64                    `gorm:"column:org_id" json:"org_id"`
+	Status         int64                    `gorm:"column:status" json:"status"`
+	Type           int64                    `gorm:"column:type" json:"type"`
+	Number         int64                    `gorm:"column:number" json:"number"`
+	OutStock       int64                    `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
+	StockAttribute int64                    `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
+	GoodInfo       []*GoodInformationThirty `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"GoodInfo"`
 }
 
 func (GoodsTypeOne) TableName() string {
@@ -217,3 +217,75 @@ type BloodGoodsType struct {
 func (BloodGoodsType) TableName() string {
 	return "xt_goods_type"
 }
+
+type GoodInformationThirty 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"`
+	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"`
+	IsReuse                     int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	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"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string  `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64   `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string  `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string  `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 string  `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	TotalCount                  int64   `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	SumOutCount                 int64   `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount              int64   `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+}
+
+func (GoodInformationThirty) TableName() string {
+	return "xt_good_information"
+}

models/patient_models.go

@@ -330,6 +330,7 @@ type DialysisPrescription struct {
 	IsWater                    int64         `gorm:"column:is_water" json:"is_water" form:"is_water"`
 	DrhyWater                  string        `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
 	DryWaterHour               string        `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
+	WaterMachine               string        `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 }
 
 func (DialysisPrescription) TableName() string {

service/dialysis_service.go

@@ -1812,3 +1812,46 @@ func GetScheduleByPatient(patient_id int64, schedule_date int64, orgid int64) (m
 	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, orgid).Find(&schedule).Error
 	return schedule, err
 }
+
+func GetSchedulePrintList(page int64, limit int64, schedulType int64, partitionType int64, keywords string, schedule_date int64, orgID int64) (list []*models.DialysisScheduleSix, total int64, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_patients as p").Where("p.status = 1")
+	fmt.Println("table", table)
+	if schedulType > 0 {
+		db = db.Where("x.schedule_type = ?", schedulType)
+	}
+	if partitionType > 0 {
+		db = db.Where("x.partition_id = ?", partitionType)
+	}
+	if orgID > 0 {
+		db = db.Where("x.user_org_id = ?", orgID)
+	}
+	if schedule_date > 0 {
+		db = db.Where("x.schedule_date = ?", schedule_date)
+	}
+	db = db.Joins("left join xt_patients as p on p.id = x.patient_id")
+	likeKey := "%" + keywords + "%"
+	if len(keywords) > 0 {
+		db = db.Where("p.name like ?", likeKey)
+	}
+	err = db.Count(&total).Select("x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.status,p.name").Offset(limit * (page - 1)).Limit(limit).Order("x.schedule_date desc").Find(&list).Error
+
+	return list, total, err
+}
+
+func GetSchedulePrintListOne(page int64, limit int64, schedulType int64, partitionType int64, keywords string, schedule_date int64, orgID int64) (list []*models.DialysisScheduleSeven, err error) {
+
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgID > 0 {
+		db = db.Where("user_org_id = ?", orgID)
+	}
+	if schedulType > 0 {
+		db = db.Where("schedule_type = ?", schedulType)
+	}
+	if partitionType > 0 {
+		db = db.Where("partition_id = ?", partitionType)
+	}
+	err = db.Group("schedule_type,partition_id").Find(&list).Error
+	return list, err
+}