11月9日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 #dev/prod
 

controllers/dialysis_api_controller.go

@@ -1158,6 +1158,9 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	psychological_other := c.GetString("psychological_other")
 	admission_number := c.GetString("admission_number")
 	tumble, _ := c.GetInt64("tumble")
+	his_department := c.GetString("his_department")
+	his_bed := c.GetString("his_bed")
+	diacrisis := c.GetString("diacrisis")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1206,6 +1209,9 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		PsychologicalOther:           psychological_other,
 		AdmissionNumber:              admission_number,
 		Tumble:                       tumble,
+		HisDepartment:                his_department,
+		HisBed:                       his_bed,
+		Diacrisis:                    diacrisis,
 	}
 
 	if receiveTreatment.ID == 0 { //新增

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -866,8 +866,10 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	psychological_other := c.GetString("psychological_other")
 
 	admission_number := c.GetString("admission_number")
-	tumble, _ := c.GetInt64("diacrisis")
+	tumble, _ := c.GetInt64("tumble")
 	diacrisis := c.GetString("diacrisis")
+	his_department := c.GetString("his_department")
+	his_bed := c.GetString("his_bed")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -922,6 +924,8 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		AdmissionNumber:              admission_number,
 		Tumble:                       tumble,
 		Diacrisis:                    diacrisis,
+		HisBed:                       his_bed,
+		HisDepartment:                his_department,
 	}
 
 	if receiveTreatment.ID == 0 { //新增
@@ -4097,12 +4101,6 @@ func (c *DialysisAPIController) GetSchedule() {
 	schedual_type, _ := c.GetInt64("schedual_type")
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
-	//timeLayout := "2006-01-02 15:04:05"
-	//
-	//date := time.Now().Format("2006-01-02") + " 00:00:00"
-	//loc, _ := time.LoadLocation("Local")
-	//theStartTime, _ := time.ParseInLocation(timeLayout, date, loc)
-	//scheduleTime := theStartTime.Unix()
 	scheduleTime, _ := c.GetInt64("record_date")
 	deviceNumber, _ := service.GetAllDeviceNumbers(adminUserInfo.Org.Id, scheduleTime, schedual_type)
 	list, _ := service.GetAllBedNumberSeven(adminUserInfo.Org.Id)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -720,3 +720,27 @@ func (c *StaffScheduleApiController) GetSolutionSchedule() {
 		"schedule": schedule,
 	})
 }
+
+func (c *StaffScheduleApiController) GetAllBedList() {
+
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+	list, _ := service.GetAllBedNumberSix(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (c *StaffScheduleApiController) ChangeScheduleById() {
+
+	id, _ := c.GetInt64("id")
+	mode_id, _ := c.GetInt64("mode_id")
+	schedule_date, _ := c.GetInt64("schedule_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	err := service.ChangeScheduleById(id, mode_id)
+	fmt.Println("9999999999999999", err)
+	err = service.ChangeDialysisSolution(patient_id, schedule_date, org_id, mode_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -26,4 +26,8 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("m/api/schedule/patients", &StaffScheduleApiController{}, "Get:GetSchedulePatient")
 	beego.Router("/m/api/schedule/create", &StaffScheduleApiController{}, "Post:CreateMobileSchedulePatient")
 	beego.Router("m/api/schedule/getsolutionschedule", &StaffScheduleApiController{}, "Get:GetSolutionSchedule")
+
+	beego.Router("m/api/schedule/getallbedlist", &StaffScheduleApiController{}, "Get:GetAllBedList")
+
+	beego.Router("m/api/schedule/changeschedulebyid", &StaffScheduleApiController{}, "Get:ChangeScheduleById")
 }

controllers/patient_api_controller.go

@@ -2339,7 +2339,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						if medical.IsUse == 2 {
 							if config.IsOpen != 1 {
-								fmt.Println("pharmacyConfig23232332322323", pharmacyConfig.IsOpen, medical.IsPharmacy)
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 

models/dialysis.go

@@ -967,6 +967,8 @@ type ReceiveTreatmentAsses struct {
 	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"`
+	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 (ReceiveTreatmentAsses) TableName() string {

service/device_service.go

@@ -782,3 +782,17 @@ func GetAllBedNumberSeven(orgId int64) (devicenumber []*models.SgjDeviceNumber,
 	err = XTReadDB().Where("org_id = ? and status= 1", orgId).Preload("Zone", "status = 1").Find(&devicenumber).Error
 	return devicenumber, err
 }
+
+func ChangeScheduleById(id int64, mode_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"mode_id": mode_id}).Error
+	fmt.Println("err233322323232232323", err)
+	return err
+}
+
+func ChangeDialysisSolution(patient_id int64, schedule_date int64, org_id int64, mode_id int64) error {
+
+	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("patient_id = ? and record_date =? and user_org_id = ? and status = 1", patient_id, schedule_date, org_id).Update(map[string]interface{}{"mode_id": mode_id}).Error
+	return err
+
+}

service/new_warehouse_service.go

@@ -14,7 +14,6 @@ import (
 //耗材出库
 func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
-	//fmt.Println("出库数量2333333333333333333333333333333333hhha", goods.Count)
 	//开事务
 	var deliver_number int64 = 0
 	var stock_number int64 = 0