历史排班

conf/app.conf

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

controllers/dialysis_record_api_controller.go

@@ -419,6 +419,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	allDoctor, _ := service.GetAllDoctor(adminInfo.CurrentOrgId, adminInfo.CurrentAppId)
 
+	lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminInfo.CurrentOrgId, patientID)
+	fmt.Println("--------------------", lastAcceptTreatment)
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -475,6 +477,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"lastOrder":                   lastOrder,
 			"dryWeightList":               dryWeightList,
 			"docList":                     allDoctor,
+			"lastAcceptTreatment":         lastAcceptTreatment,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -514,6 +517,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"lastOrder":                   lastOrder,
 			"dryWeightList":               dryWeightList,
 			"docList":                     allDoctor,
+			"lastAcceptTreatment":         lastAcceptTreatment,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -1377,7 +1377,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您今天没有排版！"
-				sc["mode"] = 0
+				sc["mode"] = "HD"
 				sc["data"] = daySchedule
 			}
 		}
@@ -1394,7 +1394,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		if len(nextSchedule) <= 0 {
 			sc["code"] = 1
 			sc["msg"] = "抱歉，您后续没有排版！"
-			sc["mode"] = 0
+			sc["mode"] = "HD"
 			sc["data"] = nextSchedule
 		} else {
 			if nextSchedule[0].Schedule.ID > 0 {
@@ -1523,7 +1523,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您后续没有排版！"
-				sc["mode"] = 0
+				sc["mode"] = "HD"
 				sc["data"] = nextSchedule
 			}
 		}

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -5,7 +5,6 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"strconv"
 	"time"
 )
@@ -45,7 +44,6 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	redis.Set(key, "", time.Second)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 
-	fmt.Println("scheduals00923923999233223", scheduals)
 	//获取所有的患者
 	blood_patients, _ := service.GetAllPatientListByListSeven(orgID)
 	//获取透析处方
@@ -81,7 +79,6 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
-	fmt.Println("project_config23323232322323", project_config.IsOpen)
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)

controllers/patient_api_controller.go

@@ -1122,7 +1122,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 	loc, _ := time.LoadLocation("Local")
 	todayTime, err := time.ParseInLocation(timeLayout, today, loc)
 
-	if adminUserInfo.CurrentOrgId == 9538 {
+	if adminUserInfo.CurrentOrgId == 9538 || adminUserInfo.CurrentOrgId == 10375 || adminUserInfo.CurrentOrgId == 10164 {
 		prescription := models.DialysisPrescription{
 			Dialyzer:                   solution.Dialyzer,
 			Anticoagulant:              solution.Anticoagulant,

controllers/patient_dataconfig_api_controller.go

@@ -65,6 +65,10 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/updatepatientfallassment", &PatientDataConfigAPIController{}, "Post:UpdatePatientFallassment")
 
+	beego.Router("/api/patient/savepediatrcfallassesment", &PatientDataConfigAPIController{}, "Post:SavePediatrcFallassment")
+
+	beego.Router("/api/patient/getbeddiatricfallassessmentlist", &PatientDataConfigAPIController{}, "Get:GetBedDiatricFallassessmentList")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -2676,3 +2680,131 @@ func (this *PatientDataConfigAPIController) UpdatePatientFallassment() {
 		"patientFallassessment": patientFallassessment,
 	})
 }
+
+func (this *PatientDataConfigAPIController) SavePediatrcFallassment() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	admin_user_id := int64(dataBody["tumble"].(float64))
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	record_date := dataBody["date"].(string)
+
+	total := int64(dataBody["pedia_Totalpoints"].(float64))
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	var str string
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
+
+	if dataBody["age"] != nil && reflect.TypeOf(dataBody["age"]).String() == "[]interface {}" {
+		ageList, _ := dataBody["age"].([]interface{})
+
+		for _, item := range ageList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	if dataBody["cognize"] != nil && reflect.TypeOf(dataBody["cognize"]).String() == "[]interface {}" {
+		cognizeList, _ := dataBody["cognize"].([]interface{})
+
+		for _, item := range cognizeList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	if dataBody["diagnosis"] != nil && reflect.TypeOf(dataBody["diagnosis"]).String() == "[]interface {}" {
+		diagnosisList, _ := dataBody["diagnosis"].([]interface{})
+
+		for _, item := range diagnosisList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	if dataBody["environment"] != nil && reflect.TypeOf(dataBody["environment"]).String() == "[]interface {}" {
+		environmentList, _ := dataBody["environment"].([]interface{})
+
+		for _, item := range environmentList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	if dataBody["medicine"] != nil && reflect.TypeOf(dataBody["medicine"]).String() == "[]interface {}" {
+		medicineList, _ := dataBody["medicine"].([]interface{})
+
+		for _, item := range medicineList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	if dataBody["sex"] != nil && reflect.TypeOf(dataBody["sex"]).String() == "[]interface {}" {
+		sexList, _ := dataBody["medicine"].([]interface{})
+
+		for _, item := range sexList {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			str += string(byterequest) + ","
+		}
+	}
+
+	pedFallssessment := models.XtPatientPedFallssessment{
+		PatientId:   patient_id,
+		UserOrgId:   user_org_id,
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Text:        str,
+		RecordDate:  recordDate,
+		Total:       total,
+		AdminUserId: admin_user_id,
+		Type:        1,
+	}
+
+	service.CreatePadFallssessment(pedFallssessment)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"pedFallssessment": pedFallssessment,
+	})
+
+}
+
+func (this *PatientDataConfigAPIController) GetBedDiatricFallassessmentList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	is_type, _ := this.GetInt64("is_type")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, _ := service.GetBedDiatricFallassessmentList(patient_id, is_type, orgId, limit, page)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}

controllers/self_drug_api_congtroller.go

@@ -3987,34 +3987,36 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 		}
 
-		//获取入库
-		infoFLow, _ := service.GetNewDrugFlowInWarehouseInfo(item.ID, orgId, startTime)
+		if orgId != 10215 && orgId != 10265 {
+			//获取入库
+			infoFLow, _ := service.GetNewDrugFlowInWarehouseInfo(item.ID, orgId, startTime)
 
-		for _, it := range infoFLow {
-			item.NewDrugFlowInWarehouseInfo = append(item.NewDrugFlowInWarehouseInfo, it)
-		}
-		//获取盘盈
-		infoProfitFlow, _ := service.GetNewDrugFlowPofitWarehouseInfo(item.ID, orgId, startTime)
+			for _, it := range infoFLow {
+				item.NewDrugFlowInWarehouseInfo = append(item.NewDrugFlowInWarehouseInfo, it)
+			}
+			//获取盘盈
+			infoProfitFlow, _ := service.GetNewDrugFlowPofitWarehouseInfo(item.ID, orgId, startTime)
 
-		for _, it := range infoProfitFlow {
-			item.NewDrugFlowPofitWarehouseInfo = append(item.NewDrugFlowPofitWarehouseInfo, it)
-		}
-		//获取出库
-		infoOutFlow, _ := service.GetNewDrugFlowOutWarehouseInfo(item.ID, orgId, startTime)
-		for _, it := range infoOutFlow {
-			item.NewDrugFlowOutWarehouseInfo = append(item.NewDrugFlowOutWarehouseInfo, it)
-		}
+			for _, it := range infoProfitFlow {
+				item.NewDrugFlowPofitWarehouseInfo = append(item.NewDrugFlowPofitWarehouseInfo, it)
+			}
+			//获取出库
+			infoOutFlow, _ := service.GetNewDrugFlowOutWarehouseInfo(item.ID, orgId, startTime)
+			for _, it := range infoOutFlow {
+				item.NewDrugFlowOutWarehouseInfo = append(item.NewDrugFlowOutWarehouseInfo, it)
+			}
 
-		//获取退库
-		infoCacelFlow, _ := service.GetNewDrugFlowCacelWarehouseInfo(item.ID, orgId, startTime)
-		for _, it := range infoCacelFlow {
-			item.NewDrugFlowNoCancelWarehouseInfo = append(item.NewDrugFlowNoCancelWarehouseInfo, it)
-		}
+			//获取退库
+			infoCacelFlow, _ := service.GetNewDrugFlowCacelWarehouseInfo(item.ID, orgId, startTime)
+			for _, it := range infoCacelFlow {
+				item.NewDrugFlowNoCancelWarehouseInfo = append(item.NewDrugFlowNoCancelWarehouseInfo, it)
+			}
 
-		//获取盘亏
-		infoNoPofitFlow, _ := service.GetNewDrugFlowNoPofitWarehouseInfo(item.ID, orgId, startTime)
-		for _, it := range infoNoPofitFlow {
-			item.NewDrugFlowNoPofitWarehouseInfo = append(item.NewDrugFlowNoPofitWarehouseInfo, it)
+			//获取盘亏
+			infoNoPofitFlow, _ := service.GetNewDrugFlowNoPofitWarehouseInfo(item.ID, orgId, startTime)
+			for _, it := range infoNoPofitFlow {
+				item.NewDrugFlowNoPofitWarehouseInfo = append(item.NewDrugFlowNoPofitWarehouseInfo, it)
+			}
 		}
 
 	}

models/patient_models.go

@@ -2825,3 +2825,21 @@ type XtPatientFallassessmentRealize struct {
 func (XtPatientFallassessmentRealize) TableName() string {
 	return "xt_patient_fallassessment_realize"
 }
+
+type XtPatientPedFallssessment struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Text        string `gorm:"column:text" json:"text" form:"text"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Total       int64  `gorm:"column:total" json:"total" form:"total"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Type        int64  `gorm:"column:type" json:"type" form:"type"`
+}
+
+func (XtPatientPedFallssessment) TableName() string {
+	return "xt_patient_ped_fallssessment"
+}

service/mobile_dialysis_service.go

@@ -129,6 +129,7 @@ type MDialysisScheduleVM struct {
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
+	LastTreatmentSummary     *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -9278,3 +9279,10 @@ func MobileGetLongScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceT
 	err := db.Find(&vms).Error
 	return vms, err
 }
+
+func GetLastAcceptTreatment(user_org_id int64, patient_id int64) (models.ReceiveTreatmentAsses, error) {
+
+	treatmentAsses := models.ReceiveTreatmentAsses{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and status=1 and admission_number<>''", user_org_id, patient_id).Last(&treatmentAsses).Error
+	return treatmentAsses, err
+}

service/new_warehouse_service.go

@@ -97,8 +97,6 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		warehouseOutInfo.Count = count
 		if orgID == 9671 || orgID == 10265 {
 			goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
-
-			fmt.Println("加个我我我哦我我我", goodsInfo.PackingPrice)
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -1287,8 +1285,6 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 // 药品自动出库 递归方式
 func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string) (err error) {
 
-	fmt.Println("出库拉22222222222222222222222222222222222222222222222222222222222222222222")
-	fmt.Println("剩余库存2哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦噢噢噢噢", prescribingNumber)
 	//开事务
 	tx := XTWriteDB().Begin()
 	defer func() {
@@ -2468,7 +2464,7 @@ func GetSigleDrugWarehouseOutInfoTwo(patient_id int64, advice_date int64, orgid
 
 	info := models.XtDrugWarehouseOutInfo{}
 	var err error
-	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and drug_id = ?", patient_id, advice_date, orgid, drug_id).Find(&info).Error
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and drug_id = ? and is_sys=1", patient_id, advice_date, orgid, drug_id).Find(&info).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}

service/patient_service.go

@@ -2838,7 +2838,7 @@ func GetAllTreatModeByList(orgID int64) (treatement []*models.TreatmentMode, err
 
 func GetAllPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVM, err error) {
 
-	err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+	err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 	return patients, nil
 }
 
@@ -2849,7 +2849,7 @@ func GetAllPatientListByListTwo(orgID int64) (patients []*MSchedualPatientVM, er
 	patient_info_str, _ := redis.Get(key).Result()
 
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -4067,3 +4067,29 @@ func DeletePatientFallsessment(id int64, user_org_id int64) (models.XtPatientFal
 	err = XTWriteDB().Model(&models.XtPatientFallassessmentRealize{}).Where("status=1 and user_org_id =? and fassement_id=?", user_org_id, id).Updates(map[string]interface{}{"status": 0}).Error
 	return fallassessment, err
 }
+
+func CreatePadFallssessment(fallssessment models.XtPatientPedFallssessment) error {
+
+	err := XTWriteDB().Create(&fallssessment).Error
+
+	return err
+}
+
+func GetBedDiatricFallassessmentList(patient_id int64, is_type int64, user_org_id int64, limit int64, page int64) (list []*models.XtPatientPedFallssessment, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if is_type > 0 {
+		db = db.Where("is_type = ?", is_type)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+
+	return list, total, err
+}

service/stock_service.go

@@ -5210,7 +5210,7 @@ func GetWarehouseOutInfoIsExistOne(good_id int64, patient_id int64, record_time
 
 	info := models.WarehouseOutInfo{}
 	var err error
-	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ?", good_id, record_time, patient_id).Find(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and is_sys=1", good_id, record_time, patient_id).Find(&info).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -5222,7 +5222,7 @@ func GetWarehouseOutInfoIsExistOne(good_id int64, patient_id int64, record_time
 
 func GetWarehouseOutInfoIsExistTwo(good_id int64, patient_id int64, record_time int64, project_id int64) (models.WarehouseOutInfo, error) {
 	info := models.WarehouseOutInfo{}
-	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ?", good_id, record_time, patient_id).Find(&info).Error
+	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and is_sys=1", good_id, record_time, patient_id).Find(&info).Error
 	return info, err
 }