耗材参数

controllers/doctors_api_controller.go

@@ -39,6 +39,11 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/updatepasswayassesment", &DoctorsApiController{}, "Get:UpdatePassWayAssesment")
 	beego.Router("/api/patient/deletepasswayassessment", &DoctorsApiController{}, "Get:DeleteWayAssessment")
 	beego.Router("/api/patient/getaccesslist", &DoctorsApiController{}, "Get:GetAccessList")
+
+	//阶段小结路由
+	beego.Router("/api/patient/getinspectionmajoritem", &DoctorsApiController{}, "Get:GetInspectionMajorItem")
+	beego.Router("/api/patient/getinspectiondetail", &DoctorsApiController{}, "Get:GetInspectionDetailByProject")
+
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -661,3 +666,37 @@ func (this *DoctorsApiController) GetAccessList() {
 		return
 	}
 }
+
+func (this *DoctorsApiController) GetInspectionMajorItem() {
+
+	other_start_time := this.GetString("other_start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+" 23:59:59", loc)
+	fmt.Println("startTime2222345555533344334334433433344", startTime.Unix())
+	patient_id, _ := this.GetInt64("patient_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetInspectionMajorItem(startTime.Unix(), orgId, patient_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) GetInspectionDetailByProject() {
+
+	project_id, _ := this.GetInt64("project_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	inspect_date, _ := this.GetInt64("inspect_date")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetInspectionDetailByProject(project_id, patient_id, inspect_date, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+}

controllers/drug_stock_api_contorller.go

@@ -2233,7 +2233,12 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			out_number += item.Count
 		}
 		fmt.Println("出库数量23232232323222332", out_number)
-
+		if out_number == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "2",
+			})
+			return
+		}
 		//判断退库数量是否大于总入库数量
 		if total_number > out_number {
 			service.UpdateDrugCancel(item.CancelStockId)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -3,8 +3,10 @@ package new_mobile_api_controllers
 import (
 	"XT_New/controllers/mobile_api_controllers"
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
+	"strings"
 	"time"
 )
 
@@ -320,3 +322,42 @@ func (this *StaffScheduleApiController) SearchPatient() {
 		"schedule": schedule,
 	})
 }
+
+func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
+
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	var err error
+	//查询患者信息
+	list, _ := service.GetStaffScheduleById(idSplit)
+	if len(list) > 0 {
+		for index, _ := range list {
+			fmt.Println("index2322332", index)
+			schedule := models.XtSchedule{
+				PartitionId:  list[0].PartitionId,
+				BedId:        list[0].BedId,
+				PatientId:    list[0].PatientId,
+				ScheduleDate: list[0].ScheduleDate,
+				ScheduleType: list[0].ScheduleType,
+				ScheduleWeek: list[0].ScheduleWeek,
+				ModeId:       list[0].ModeId,
+			}
+			xtSchedule := models.WeekSchedule{
+				PartitionId:  list[1].PartitionId,
+				BedId:        list[1].BedId,
+				PatientId:    list[1].PatientId,
+				ScheduleDate: list[1].ScheduleDate,
+				ScheduleType: list[1].ScheduleType,
+				ScheduleWeek: list[1].ScheduleWeek,
+				ModeId:       list[1].ModeId,
+			}
+			err = service.UpdateStaffSchedule(list[1].ID, schedule)
+			fmt.Println("errrrrrrr2323323232323", err)
+			service.UpdateStaffScheduleOne(list[0].ID, xtSchedule)
+		}
+	}
+	fmt.Println(err)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "切换成功",
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -19,4 +19,5 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/getpatientschedulelist", &StaffScheduleApiController{}, "Get:GetPatientScheduleList")
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
+	beego.Router("/m/api/updatepatientschedule", &StaffScheduleApiController{}, "Get:UpdatePatientScheduleById")
 }

controllers/stock_in_api_controller.go

@@ -1940,6 +1940,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 		//统计该耗材的出库数量
 		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
+		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{

models/patient_models.go

@@ -800,6 +800,26 @@ func (XtInspection) TableName() string {
 	return "xt_inspection"
 }
 
+type VmInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	RangeMin     string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax     string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	Unit         string `gorm:"column:unit" json:"unit" form:"unit"`
+}
+
 type BloodXtPatients struct {
 	ID         int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`

service/device_service.go

@@ -387,7 +387,7 @@ type DeviceNumberViewModel struct {
 
 func GetAllValidDeviceNumbers(orgID int64) ([]*DeviceNumberViewModel, error) {
 	var vms []*DeviceNumberViewModel = make([]*DeviceNumberViewModel, 0)
-	rows, err := readDb.Raw("SELECT n.*, z.name as zone_name, g.name as group_name FROM xt_device_number as n join xt_device_zone as z on z.id = n.zone_id AND z.status = 1 join xt_device_group as g on g.id = n.group_id WHERE (n.org_id = ? AND n.status = 1)", orgID).Rows()
+	rows, err := readDb.Raw("SELECT n.*, z.name as zone_name, g.name as group_name FROM xt_device_number  as n join xt_device_zone as z on z.id = n.zone_id AND z.status = 1 join xt_device_group as g on g.id = n.group_id WHERE (n.org_id = ? AND n.status = 1) order by sort ", orgID).Rows()
 	defer rows.Close()
 	if err != nil {
 		return nil, err

service/doctor_schedule_service.go

@@ -615,3 +615,22 @@ func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }
+
+func GetStaffScheduleById(ids []string) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("id in(?)", ids).Find(&schedule).Error
+	return schedule, err
+
+}
+
+func UpdateStaffSchedule(nextid int64, schedule models.XtSchedule) error {
+
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"partition_id": schedule.PartitionId, "bed_id": schedule.BedId, "patient_id": schedule.PatientId, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "mode_id": schedule.ModeId}).Error
+	return err
+}
+
+func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
+
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"partition_id": schedule.PartitionId, "bed_id": schedule.BedId, "patient_id": schedule.PatientId, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "mode_id": schedule.ModeId}).Error
+	return err
+}

service/patientmanage_service.go

@@ -1621,3 +1621,40 @@ func GetTotalBedNumber(orgid int64, ids []string) (list []*models.XtDeviceNumber
 	err = db.Count(&total).Find(&list).Error
 	return list, total, err
 }
+
+func GetInspectionMajorItem(startime int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.inspect_date<=?", startime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	err = db.Group("x.project_id").Find(&inspection).Error
+	return inspection, err
+}
+
+func GetInspectionDetailByProject(project_id int64, patientid int64, inspect_date int64, orgid int64) (inspection []*models.VmInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_inspection_reference as t").Where("t.status = 1")
+	fmt.Println(table)
+	if inspect_date > 0 {
+		db = db.Where("x.inspect_date=?", inspect_date)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	if project_id > 0 {
+		db = db.Where("x.project_id = ?", project_id)
+	}
+	err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,t.range_max,t.range_min,t.range_value,t.unit").Joins("left join xt_inspection_reference as t on t.id = x.item_id").Scan(&inspection).Error
+	return inspection, err
+}

service/stock_service.go

@@ -3908,16 +3908,16 @@ func UpdatedStockFlow(flow models.VmStockFlow) error {
 
 func GetStockFlowIsExsit(warehousing_id int64, patient_id int64, record_time int64, good_id int64) (*models.VmStockFlow, error) {
 
-	flow := models.VmStockFlow{}
+	stock := models.VmStockFlow{}
 	var err error
-	err = XTReadDB().Model(&flow).Where("warehousing_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehousing_id, patient_id, record_time, good_id).Find(&flow).Error
+	err = XTReadDB().Model(&stock).Where("warehousing_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehousing_id, patient_id, record_time, good_id).Find(&stock).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
 	if err != nil {
 		return nil, err
 	}
-	return &flow, nil
+	return &stock, nil
 }
 
 func GetWarehouseOutInfoIsExist(id int64) (*models.WarehouseOutInfo, error) {

service/warhouse_service.go

@@ -203,24 +203,27 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		if advice.PrescribingNumberUnit == drup.MinUnit {
+		fmt.Println("单位1111111111", advice.PrescribingNumberUnit)
+		fmt.Println("单位222222222222222", drup.MaxUnit)
+		if advice.PrescribingNumberUnit == drup.MaxUnit {
 			maxNumber = count / drup.MinNumber
 			minNumber = count % drup.MinNumber
 		} else {
-			maxNumber = count
+			minNumber = count
 		}
-
+		fmt.Println("maxNumber0000000000000", maxNumber)
+		fmt.Println("minNumber999999999999999", minNumber)
 		if warehouse.StockMaxNumber < maxNumber {
-			fmt.Println("尽量323223232")
+
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		warehouse.Mtime = time.Now().Unix()
-
 		if warehouse.StockMinNumber < minNumber {
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+
 		} else {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 		}
@@ -228,6 +231,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 		}
+
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
 			return errThree
@@ -933,7 +937,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 	info, _ := GetGoodInformationByGoodId(goods.GoodId)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
-		fmt.Println("进来22323232323232323232233223323223322323")
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -986,6 +989,9 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 
 		if errcode == gorm.ErrRecordNotFound {
 			errTwo := CreateAutoReduceRecord(&details)
+			if errTwo != nil {
+				return errTwo
+			}
 			//插入库存流水表
 			flow := models.VmStockFlow{
 				WarehouseOutId:          warehouseOut.ID,
@@ -1013,10 +1019,13 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
-			fmt.Println("8888232322332323222332323223322332233232323232322323233223232332", exsit.Count+goods.Count)
 
+			fmt.Println("什么数据233232323", errflow)
 			if errflow == gorm.ErrRecordNotFound {
-				CreateStockFlowOne(flow)
+				errThre := CreateStockFlowOne(flow)
+				if errThre != nil {
+					return errThre
+				}
 			} else if errflow == nil {
 				flow := models.VmStockFlow{
 					ID:                      exsit.ID,
@@ -1044,14 +1053,13 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				UpdatedStockFlow(flow)
-			}
-			if errTwo != nil {
-				return errTwo
+				errFour := UpdatedStockFlow(flow)
+				if errFour != nil {
+					return errFour
+				}
 			}
-		} else if errcode == nil {
 
-			fmt.Println("wodeeeeeeeeeeewewewewewewewewweewewewewewweewewew")
+		} else if errcode == nil {
 			flow := models.VmStockFlow{
 				WarehouseOutId:          warehouseOut.ID,
 				WarehousingId:           warehouse.ID,
@@ -1078,10 +1086,11 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
-			fmt.Println("8888232322332323222332323223322332233232323232322323233223232332", exsit.Count+goods.Count)
 
 			if errflow == gorm.ErrRecordNotFound {
 				CreateStockFlowOne(flow)
+				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+				CreateAutoReduceRecord(&details)
 			} else if errflow == nil {
 				flow := models.VmStockFlow{
 					ID:                      exsit.ID,
@@ -1110,9 +1119,9 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
 				UpdatedStockFlow(flow)
+				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+				CreateAutoReduceRecord(&details)
 			}
-			DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-			CreateAutoReduceRecord(&details)
 
 		}