历史排班

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -764,6 +764,23 @@ func (c *DialysisApiController) PostPrescription() {
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     1,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		//修改处方
 		if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
@@ -1329,6 +1346,23 @@ func (c *DialysisApiController) PostSoulution() {
 
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
+	//创建步骤表
+	finishOne := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminUserInfo.CurrentOrgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     1,
+		RecordDate: recordDate.Unix(),
+		Sourse:     1,
+		PatientId:  patient,
+	}
+
+	dialysisFinishOne, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 1, patient)
+	if dialysisFinishOne.ID == 0 {
+		service.CreateDialysisFinish(finishOne)
+	}
 	//获取最新1条
 	dialysisSolution, _ := service.GetLastPatientDialysisSolution(patient, adminUserInfo.CurrentOrgId)
 
@@ -2843,6 +2877,24 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		err := service.UpadatePredialysisEvaluation(&assessmentBeforeDislysis)
+
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminUserInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     3,
+			RecordDate: recordDate.Unix(),
+			Sourse:     1,
+			PatientId:  patient,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminUserInfo.CurrentOrgId, recordDate.Unix(), 3, patient)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
 		//清空key 值

controllers/his_api_controller.go

@@ -2636,6 +2636,23 @@ func (c *HisApiController) CreateHisPrescription() {
 			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: theTime.Unix(),
+			Sourse:     1,
+			PatientId:  patient_id,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminInfo.CurrentOrgId, theTime.Unix(), 4, patient_id)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 		redis.Set(key, "", time.Second)
@@ -2669,6 +2686,23 @@ func (c *HisApiController) CreateHisPrescription() {
 			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
+		//创建步骤表
+		finish := models.XtDialysisFinish{
+			IsFinish:   1,
+			UserOrgId:  adminInfo.CurrentOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Module:     4,
+			RecordDate: info.RecordDate,
+			Sourse:     1,
+			PatientId:  info.PatientId,
+		}
+
+		dialysisFinish, _ := service.GetDialysisFinish(adminInfo.CurrentOrgId, info.RecordDate, 4, info.PatientId)
+		if dialysisFinish.ID == 0 {
+			service.CreateDialysisFinish(finish)
+		}
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 		redis.Set(key, "", time.Second)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1277,6 +1277,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	weightAfter, _ := c.GetFloat("weight_after", 0)
 	additionalWeight, _ := c.GetFloat("additional_weight", 0)
 	weightReduce, _ := c.GetFloat("weight_loss", 0)
+	fmt.Println("weight_loss", weightReduce)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
 	breathing_rate := c.GetString("breathing_rate")
@@ -1284,7 +1285,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	actual_ultrafiltration, _ := c.GetFloat("actual_ultrafiltration", 0)
+
+	fmt.Println("actual_ultrafiltration233232322323", actual_ultrafiltration)
 	actual_displacement, _ := c.GetFloat("actual_displacement", 0)
+
 	actualtreatHour, _ := c.GetInt64("actual_treatment_hour", 0)
 	actualtreatmin, _ := c.GetInt64("actual_treatment_minute", 0)
 	cruor := c.GetString("cruor")
@@ -1354,6 +1358,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	after_urea := c.GetString("after_urea")
 	pip_coagulation := c.GetString("pip_coagulation")
 	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
+	fmt.Println("accumulated_blood_volume", accumulated_blood_volume)
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1361,6 +1366,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	patient, _ := service.FindPatientById(adminUserInfo.Org.Id, id)
+
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
@@ -1370,6 +1376,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	fmt.Println("parseDateErr", parseDateErr)
 	if parseDateErr != nil {
 		c.ErrorLog("日期(%v)解析错误：%v", recordDateStr, parseDateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1531,6 +1538,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
 		}
+		return
 	} else { //修改
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
@@ -1543,7 +1551,6 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 			//今日的日期减去设置的日期
 			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-			fmt.Println("recordDate.Unix()", recordDate.Unix())
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
 				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -1569,6 +1576,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
+		fmt.Println("werwewweoweoweoweoewoewoew", err)
 		redis := service.RedisClient()
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 
@@ -1580,13 +1588,16 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
-
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
+			return
 		}
+
 	}
+
+	return
 }
 
 func (c *DialysisAPIController) PostDialysisPrescription() {
@@ -3657,6 +3668,7 @@ func (c *DialysisAPIController) PostSolution() {
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	fmt.Println("appRole0000000000000", appRole.UserType)
 	//
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription_doctor = adminUserInfo.AdminUser.Id
@@ -5846,6 +5858,24 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 		}
 	}
+
+	//创建步骤表
+	finish := models.XtDialysisFinish{
+		IsFinish:   1,
+		UserOrgId:  adminInfo.Org.Id,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      0,
+		Module:     11,
+		RecordDate: record_time,
+		Sourse:     1,
+		PatientId:  patient_id,
+	}
+
+	dialysisFinish, _ := service.GetDialysisFinish(adminInfo.Org.Id, record_time, 11, patient_id)
+	if dialysisFinish.ID == 0 {
+		service.CreateDialysisFinish(finish)
+	}
 	consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -7,7 +7,6 @@ import (
 	"XT_New/service"
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"log"
 	"os"
 	"path"
@@ -143,7 +142,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//redis key值
 			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
-			fmt.Println("ket--------------------", key)
 
 			redis.Set(key, "", time.Second)
 			purviews_json_str, _ := redis.Get(key).Result()

controllers/patient_api_controller.go

@@ -108,7 +108,7 @@ func (c *PatientApiController) GetPatientsList() {
 	reimbursement_way, _ := c.GetInt64("reimbursement_way", 0)
 	isscheduling, _ := c.GetInt64("isscheduling", 0)
 	isprescription, _ := c.GetInt64("isprescription", 0)
-
+	patientSoureType, _ := c.GetInt64("patientSoureType")
 	if page <= 0 {
 		page = 1
 	}
@@ -147,7 +147,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -229,7 +229,6 @@ func (c *PatientApiController) CreatePatient() {
 	fmt.Println(code)
 	fmt.Println(patient)
 
-	fmt.Println("contagions是什么", contagions)
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
@@ -367,6 +366,7 @@ func (c *PatientApiController) CreatePatient() {
 		TreatmentPlan:                patient.TreatmentPlan,
 		Doctor:                       patient.Doctor,
 		RecordNumber:                 patient.RecordNumber,
+		PatientSource:                patient.PatientSource,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -584,6 +584,7 @@ func (c *PatientApiController) EditPatient() {
 		SchRemark:                 patient.SchRemark,
 		TreatmentPlan:             patient.TreatmentPlan,
 		RecordNumber:              patient.RecordNumber,
+		PatientSource:             patient.PatientSource,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -4910,6 +4911,14 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		record_number := patientBody["record_number"].(string)
 		patient.RecordNumber = record_number
 	}
+
+	patient_source := int64(patientBody["patient_source"].(float64))
+	if patient_source <= 0 {
+		utils.ErrorLog("patient_source <= 0")
+		code = enums.ErrorCodeParamWrong
+		return
+	}
+	patient.PatientSource = patient_source
 	return
 }
 

models/patient_models.go

@@ -222,6 +222,7 @@ type Patients struct {
 	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
+	PatientSource            int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
 }
 
 func (Patients) TableName() string {
@@ -814,6 +815,7 @@ type XtPatientsNew struct {
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
+	PatientSource                int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
 }
 
 func (XtPatientsNew) TableName() string {

service/manage_center_service.go

@@ -853,7 +853,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				BatchNumber:             info.BatchNumber,
 				Count:                   prescribingNumber,
 				UserOrgId:               advice.UserOrgId,
-				PatientId:               0,
+				PatientId:               advice.PatientId,
 				SystemTime:              info.SysRecordTime,
 				ConsumableType:          7,
 				IsSys:                   0,

service/patient_service.go

@@ -12,7 +12,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -65,6 +65,10 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 		db = db.Where("p.created_time<=?", endTime)
 	}
 
+	if patientSoureType > 0 {
+		db = db.Where("p.patient_source =?", patientSoureType)
+	}
+
 	offset := (page - 1) * limit
 	if lapseto == 2 || lapseto == 3 {
 		err = db.Order("p.death_time desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error

service/self_drug_service.go

@@ -2715,6 +2715,6 @@ func ModifyDrugFlowById(id int64, over_count int64) error {
 
 func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
 	return info, err
 }

service/stock_service.go

@@ -8212,7 +8212,7 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 
 func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
 	return info, err
 }