11月9日库存管理

controllers/dialysis_api_controller.go

@@ -89,6 +89,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getdialysisadvicescheduelist", &DialysisApiController{}, "Get:GetDialysisAdviceSchedulist")
 
 	beego.Router("/api/patient/getdialysisparametergoodlist", &DialysisApiController{}, "Get:GetDialysisParameterGoodList")
+
+	beego.Router("/api/patinet/savehisdialysis", &DialysisApiController{}, "Get:SaveHisDialysis")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3795,7 +3797,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
 
 		if ultrafiltration_rate > 0 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
@@ -4272,10 +4274,14 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
 
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+	goodType, err := service.GetAllGoodType(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
-			"total": total,
+			"list":     list,
+			"total":    total,
+			"config":   config,
+			"goodType": goodType,
 		})
 		return
 
@@ -4543,3 +4549,19 @@ func (this *DialysisApiController) GetDialysisParameterGoodList() {
 		return
 	}
 }
+
+func (this *DialysisApiController) SaveHisDialysis() {
+
+	var ids []string
+	advice_ids := this.GetString("ids")
+	ids = strings.Split(advice_ids, ",")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	service.SaveHisDialysis(orgId, ids)
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/dialysis_record_api_controller.go

@@ -775,6 +775,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
 	bedID, _ := this.GetInt64("bed")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
@@ -972,6 +973,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		ChangeNurse:            change_nurse,
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
+		QualityNurseId:         quality_nurse_id,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1480,6 +1482,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	quality_nurse, _ := this.GetInt64("quality_nurse")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1611,6 +1614,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		}
 
 	}
+	fmt.Println("quality_nurse", quality_nurse)
 	dialysisRecord := &models.DialysisOrder{
 		ID:                     record_id,
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -1625,6 +1629,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		ChangeNurse:            change_nurse,
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
+		QualityNurseId:         quality_nurse,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2081,6 +2081,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
 	zone_id, _ := this.GetInt64("zone_id")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
@@ -2265,6 +2266,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
 		ZoneId:                 zone_id,
+		QualityNurseId:         quality_nurse_id,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -2961,7 +2963,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-
+				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -2992,7 +2994,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
 
 		if ultrafiltration_rate > 0 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
@@ -3020,6 +3022,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
 	if record_id == 0 {
@@ -3167,6 +3170,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		ChangeNurse:            change_nurse,
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
+		QualityNurseId:         quality_nurse_id,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

models/dialysis.go

@@ -836,6 +836,7 @@ type DialysisOrder struct {
 	Cruor                      string        `gorm:"column:cruor" json:"cruor" form:"cruor"`
 	Url                        string        `gorm:"column:url" json:"url" form:"url"`
 	Hash                       string        `gorm:"column:hash" json:"hash" form:"hash"`
+	QualityNurseId             int64         `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -899,6 +900,7 @@ type XtDialysisOrders struct {
 	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	QualityNurseId int64  `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
 }
 
 type TreatmentMode struct {

models/good_models.go

@@ -194,3 +194,25 @@ type XtCancelStockInfo struct {
 func (XtCancelStockInfo) TableName() string {
 	return "xt_cancel_stock_info"
 }
+
+type BloodGoodsType 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"`
+	IsOpen         int64  `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (BloodGoodsType) TableName() string {
+	return "xt_goods_type"
+}

service/dialysis_service.go

@@ -632,7 +632,7 @@ func FindDialysisMacher(orgid int64, patientid int64, dialysisDate int64) (model
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := readDb.Table("xt_device_number as n")
 	fmt.Print("table", table)
-	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
+	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,o.quality_nurse_id,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
 	return orders, err
 }
 func FindPunctureNurse(adminid int64, appid int64, orgid int64) (models.App_Roles, error) {
@@ -652,6 +652,13 @@ func FindeStartNuse(adminid int64, appid int64, orgid int64) (models.App_Roles,
 	return role, err
 }
 
+func FindeQualityNurse(adminid int64, appid int64, orgid int64) (models.App_Roles, error) {
+	role := models.App_Roles{}
+	db := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	err := db.Select("r.id,r.admin_user_id,r.org_id,r.role_id,r.user_name,r.avatar,r.user_type,r.user_title,r.intro,r.status,r.ctime,e.url").Joins("left join sgj_user_admin_electronic_signature as e on e.creator = r.admin_user_id").Where("r.admin_user_id = ? and r.app_id = ? and r.org_id = ?", adminid, appid, orgid).Find(&role).Error
+	return role, err
+}
+
 func FindDialysisWay(orgid int64, patientid int64, recorddate int64) (models.DialysisPrescription, error) {
 	prescription := models.DialysisPrescription{}
 	err := readDb.Where("user_org_id = ? and patient_id = ? and record_date = ? and status =1", orgid, patientid, recorddate).Find(&prescription).Error

service/dialysis_solution_service.go

@@ -262,3 +262,10 @@ func GetDialysisParameterGoodList(orgID int64, schedule_type int64, partition_id
 
 	return schedule, err
 }
+
+func SaveHisDialysis(orgid int64, ids []string) error {
+
+	goodsType := models.BloodGoodsType{}
+	err := XTWriteDB().Where("org_id = ? and status = 1 and id in(?)", orgid, ids).Update(map[string]interface{}{"is_open": goodsType.IsOpen}).Error
+	return err
+}

service/his_project_service.go

@@ -240,7 +240,7 @@ func DeleteProjectList(id int64) error {
 
 func GetHisProject(orgid int64) (project []*models.XtHisProject, err error) {
 
-	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1", orgid).Find(&project).Error
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status =1 and medical_status!=1", orgid).Find(&project).Error
 	return project, err
 }
 

service/mobile_dialysis_service.go

@@ -2021,7 +2021,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/stock_service.go

@@ -4269,7 +4269,7 @@ func GetOrderDetailStockFlow(id []string, orgid int64) (list []*models.VmStockFl
 
 func GetOrderStockFlow(id []string, orgid int64) (list []*models.VmStockFlow, err error) {
 
-	db := XTReadDB().Model(&list).Where("status = 1 and consumable_type = 7 and patient_id > 0")
+	db := XTReadDB().Model(&list).Where("status = 1 and consumable_type = 7 and patient_id > 0 and count>0")
 	if len(id) > 0 {
 		db = db.Where("warehouse_out_id in (?)", id)
 	}