历史排班

controllers/base_api_controller.go

 		var userAdmin models.AdminUser
 		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10599 //4，809
+		userAdmin.Id = 10489 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id 10344
+		subscibe.OrgId = 10489 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id小英10344或4
+		subscibe.OrgId = 10489 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/common_api_controller.go

 	lapseto, _ := this.GetInt64("lapseto")
 	origin, _ := this.GetInt64("origin")
 
-	fmt.Println("转归", lapseto)
 	startime := this.GetString("startime")
 
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	endTimeYMDHmsStr := endtime + " 23:59:59"
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
 	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+
 	//统计数值类型的数据
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto, origin)
-	fmt.Println("countwowowowoowowowowoww", count)
+
 	//统计rang_type== 2
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto, origin)
 

controllers/dialysis_api_controller.go

 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
 
-	longHisAdviceList, _ := service.GetHisLongAdviceList(orgId)
+	longHisAdviceList, _ := service.GetAllHisAdviceTemplateList(orgId)
 
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 

controllers/doctors_api_controller.go

 	last_time := this.GetString("last_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+" 23:59:59", loc)
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+"23:59:59", loc)
 	lastTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", last_time+" 00:00:00", loc)
 	patient_id, _ := this.GetInt64("patient_id")
 	adminUserInfo := this.GetAdminUserInfo()

controllers/his_api_controller.go

 		return
 	}
 
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
 
 	//药品发药出库
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	// 开始主事务
-	db := service.XTWriteDB()
-	tx := db.Begin()
-
-	// 在函数结束时处理事务回滚
-	defer func() {
-		if r := recover(); r != nil {
-			tx.Rollback()
-		}
-	}()
-
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
 
 						if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
-							service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+							service.ModifyNewDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
 
 						}
 						if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 
-							service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+							service.ModifyNewDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
 
 						}
 						if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-							service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+							service.ModifyNewDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId, tx)
 
 						}
 					}
 				}
 
 				//删除记录
-				service.DeleteDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID)
+				service.DeleteNewDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID, tx)
 				//查询最后一次数据
 				if drugOutConfig.IsOpen == 1 {
 					//出库
 					if drug.IsUse == 2 {
 						creater := adminInfo.AdminUser.Id
-						service.HisDrugsDelivery(item.UserOrgId, creater, item)
+						service.NewHisDrugsDelivery(item.UserOrgId, creater, item, tx)
 
 					}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

 
 		recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
 
-		if assessmentAfterDislysis.WeightAfter == 0 {
-			assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+		if assessmentAfterDislysis.UserOrgId != 10340 {
+			if assessmentAfterDislysis.WeightAfter == 0 {
+				assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+			}
 		}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 								Count:                   item.Count,
 								Price:                   stockInInfo.Price,
 								Status:                  1,
-								Ctime:                   time.Now().Unix(),
+								Ctime:                   record_time,
 								UserOrgId:               adminInfo.Org.Id,
 								Manufacturer:            stockInInfo.Manufacturer,
 								Dealer:                  stockInInfo.Dealer,
 									Count:                   exsit.Count - delete_count,
 									Price:                   stockInInfo.Price,
 									Status:                  1,
-									Ctime:                   time.Now().Unix(),
+									Ctime:                   record_time,
 									UserOrgId:               adminInfo.Org.Id,
 									Manufacturer:            stockInInfo.Manufacturer,
 									Dealer:                  stockInInfo.Dealer,
 									Creator:                 adminInfo.AdminUser.Id,
 									UpdateCreator:           0,
 									Status:                  1,
-									Ctime:                   time.Now().Unix(),
+									Ctime:                   record_time,
 									Mtime:                   0,
 									Price:                   info.Price,
 									WarehousingDetailId:     info.WarehouseInfotId,
 
 func ConsumablesDeliveryDeleteNew(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
-	fmt.Println("退库222322232322332232332322332232332233wo", good_yc.GoodId)
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
 
 			Count:                   count,
 			Price:                   stockInInfo.Price,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
 			UserOrgId:               good_yc.OrgId,
 			Manufacturer:            stockInInfo.Manufacturer,
 			Dealer:                  stockInInfo.Dealer,
 		Creator:                 warehouseOut.Creater,
 		UpdateCreator:           0,
 		Status:                  1,
-		Ctime:                   time.Now().Unix(),
+		Ctime:                   record_time,
 		Mtime:                   0,
 		Price:                   stockInInfo.Price,
 		WarehousingDetailId:     stockInInfo.ID,

controllers/patient_dataconfig_api_controller.go

 
 	beego.Router("/api/patient/deletepedpatientfallassment", &PatientDataConfigAPIController{}, "Get:DeletePadPatientFallassment")
 
+	beego.Router("/api/patient/savepatientpressuresore", &PatientDataConfigAPIController{}, "Post:SavePatientPressuresore")
+
+	beego.Router("/api/patient/savepatienthpressuresore", &PatientDataConfigAPIController{}, "Post:SavePatientHpPressuresore")
+
 }
 
 type PatientDataConfigAPIController struct {
 		"msg": "ok",
 	})
 }
+
+func (this *PatientDataConfigAPIController) SavePatientPressuresore() {
+
+}
+
+func (this *PatientDataConfigAPIController) SavePatientHpPressuresore() {
+
+}

controllers/sign_api_controller.go

 	//	service.ModifyPatient(item.PatientId, item.Count)
 	//}
 
-	list, _ := service.GetNewAllpatient(orgId)
+	//list, _ := service.GetNewAllpatient(orgId)
+	//
+	//for _, item := range list {
+	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
+	//}
 
+	list, _ := service.GetAllDialysisOrder(6963)
 	for _, item := range list {
-		service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
+		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
 	}
 
-	//list, _ := service.GetAllDialysisOrder(10579)
-	//for _, item := range list {
-	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, 10579, item.BedId, item.ZoneId, item.SchedualType)
-	//}
-
 	//drugList, _ := service.GetAllBaseDrugList(10571)
 	//for _, item := range drugList {
 	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)

service/common_service.go

 }
 
 func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (inspection []*models.VmPatientInspectionTwo, err error) {
-	fmt.Println(lapseto)
-	fmt.Println(origin)
+
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and r.range_type = 1 and q.user_org_id = ? and q.is_status = 1", orgid, orgid)

service/manage_center_service.go

 	return
 }
 
+func FindNewBaseDrugLibRecord(org_id int64, id int64, tx *gorm.DB) (lib models.BaseDrugLib, err error) {
+	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
+	if err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return lib, err
+}
+
 func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
 	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count,is_user,is_pharmacy").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
 	return

service/patient_service.go

 func GetAdviceListNoExecution(advice_date int64, user_org_id int64, patientIds []int64) (advice []*models.NoDoctorAdvice, err error) {
 
 	db := XTReadDB().Model(advice).Where("status=1 and  execution_state = 2 and advice_type = 2")
-
-	if advice_date > 0 {
-		db = db.Where("advice_date= ?", advice_date)
-	}
-	if user_org_id > 0 {
-		db = db.Where("user_org_id =?", user_org_id)
-	}
 	if len(patientIds) > 0 {
-		db = db.Where("patient_id in(?)", patientIds)
+		if advice_date > 0 {
+			db = db.Where("advice_date= ?", advice_date)
+		}
+		if user_org_id > 0 {
+			db = db.Where("user_org_id =?", user_org_id)
+		}
+		if len(patientIds) > 0 {
+			db = db.Where("patient_id in(?)", patientIds)
+		}
+		err = db.Select("patient_id,Count(id) as count,advice_date").Group("patient_id").Find(&advice).Error
+		return advice, err
+	} else {
+		return advice, err
 	}
 
-	err = db.Select("patient_id,Count(id) as count,advice_date").Group("patient_id").Find(&advice).Error
-	return advice, err
 }
 
 func GetHisAdviceListNoExecution(advice_date int64, user_org_id int64, patientIds []int64) (advice []*models.HisNoDoctorAdvice, err error) {

service/self_drug_service.go

 		db = db.Where("storehouse_id = ?", storehouse_id)
 	}
 
-	err = db.Find(&list).Error
+	err = db.Group("patient_id,good_id,sys_record_time,is_sys").Find(&list).Error
 
 	return list, err
 }

service/sign_service.go

 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and dialysis_date =?", 10579, 1701360000).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 6963).Find(&list).Error
 
 	return list, err
 }

service/stock_service.go

 
 }
 
+func AddNewSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut, tx *gorm.DB) error {
+	err := tx.Create(&warehouseOut).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+
+}
+
 func UpdateSingleDrugWarehouseOut(id int64, storehouse_id int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"storehouse_id": storehouse_id}).Error
 
 }
 
+func FindNewDrugStockOutByIsSys(org_id int64, is_sys int, record_time int64, tx *gorm.DB) (out models.DrugWarehouseOut, err error) {
+	err = tx.Model(&models.DrugWarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ?", is_sys, org_id, record_time).First(&out).Error
+	if err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return out, err
+}
+
 func FindDrugSettleStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out models.DrugWarehouseOut, err error) {
 	err = readDb.Model(&models.DrugWarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ?", is_sys, org_id, record_time).First(&out).Error
 	return
 func DeleteDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64) error {
 
 	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	//err = XTWriteDB().Model(models.DrugWarehouseOutInfo{}).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
+func DeleteNewDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64, tx *gorm.DB) error {
+
+	err := tx.Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = tx.Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+}
+
 func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
 	return err
 }
 
+func ModifyNewDrugWarehouseInfoStockMaxNumber(count int64, drugid int64, orgid int64, id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+}
+
 func ModifyDrugWarehouseInfoStockMinNumber(count int64, drugid int64, orgid int64, id int64) error {
 
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
 }
 
+func ModifyNewDrugWarehouseInfoStockMinNumber(count int64, drugid int64, orgid int64, id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+}
+
 func ModifyDrugCancelStockInfo(id int64, info *models.DrugCancelStockInfo) error {
 
 	err := XTWriteDB().Model(&models.DrugCancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit, "batch_number_id": info.BatchNumberId, "storehouse_id": info.StorehouseId}).Error

service/warhouse_service.go

 
 	return advice, err
 }
+
+// 药品出库
+
+func NewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+
+	// 1.判断药品是否来自专用字典的药品库
+	// 2.判断当天当前机构有没有创建出库单，没有则创建
+	// 3.创建出库流程
+	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
+	isHasWay := false
+	record_time := int64(0)
+	isHasWay = true
+	record_time = advice.RecordDate
+
+	if isHasWay {
+		//判断当天当前机构有没有创建出库单，没有则创建
+		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
+
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		if err == gorm.ErrRecordNotFound {
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugWarehouseOut(orgID)
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+
+			warehouseOut := models.DrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           time.Now().Unix(),
+				OrgId:                   orgID,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        record_time,
+				Dealer:                  0,
+				Manufacturer:            0,
+				Type:                    1,
+				IsSys:                   1,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+			}
+			err := AddNewSigleDrugWarehouseOut(&warehouseOut, tx)
+			if err != nil {
+				utils.TraceLog("创建出库单失败 err = %v", err)
+				return err
+			} else {
+				out = warehouseOut
+			}
+		}
+
+		// 出库流程
+		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
+		if drup.ID > 0 {
+			prescribingNumber := advice.PrescribingNumber
+
+			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
+
+		} else {
+			return errors.New("药品信息不存在")
+		}
+
+	}
+
+	return
+}