2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10278 //机构id
+		subscibe.OrgId = 10635 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10635 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10278 //机构id小英9675或4
+		subscibe.OrgId = 10635 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10635 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2839,7 +2839,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10731 || adminUserInfo.CurrentOrgId == 10727 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {

controllers/doctor_schedule_api_controller.go

@@ -430,12 +430,37 @@ func (this *DoctorScheduleApiController) CopyStaffSchedule() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("start_time", start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	copy_startime, _ := this.GetInt64("copy_startime")
-	fmt.Println("copy_startime", copy_startime)
+
 	copy_endtime, _ := this.GetInt64("copy_endtime")
+
+	remark := this.GetString("remark")
+
+	if len(remark) > 0 {
+		scheduleRemark, _ := service.GetStaffScheduleRemark(orgId, copy_startime, copy_endtime)
+
+		remark := models.XtStaffScheduleRemark{
+			ID:        scheduleRemark.ID,
+			StartTime: copy_startime,
+			EndTime:   copy_endtime,
+			Remark:    remark,
+			UserOrgId: orgId,
+			Status:    1,
+			Ctime:     0,
+			Mtime:     0,
+		}
+
+		if scheduleRemark.ID == 0 {
+			service.CreateStaffScheduleRemark(remark)
+		}
+
+		if scheduleRemark.ID > 0 {
+			service.SaveStaffScheduleRemarkOne(remark)
+		}
+	}
 	schedule, err := service.GetStaffScheduleListTwo(orgId, start_time, end_time)
 	//查询选中日期的排班是否存在
 	_, errcode := service.GetNextWeekSchedule(orgId, copy_startime, copy_endtime)
@@ -477,6 +502,7 @@ func (this *DoctorScheduleApiController) CopyStaffSchedule() {
 				Status:       1,
 				Ctime:        time.Now().Unix(),
 				ScheduleDate: item.ScheduleDate,
+				Remark:       item.Remark,
 			}
 			service.AddSchedule(&staffSchedule)
 		}

controllers/his_api_controller.go

@@ -3386,7 +3386,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -7064,6 +7064,7 @@ func (c *HisApiController) DeletePrescription() {
 									ExpireDate:              it.ExpiryDate,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
 									OverCount:               flush_count_one,
+									OperateTime:             time.Now().Unix(),
 								}
 								service.CreateStockFlowOne(flow)
 
@@ -7697,8 +7698,6 @@ func (c *HisApiController) DeleteProject() {
 					//查询已出库数量
 					dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 
-					//fmt.Println("aiwohonguo --------------------", prescribingNumber)
-					//fmt.Println("aiwohonguo --------------------", dialysisInfo.Count)
 					if prescribingNumber < dialysisInfo.Count {
 						//改变数量
 						service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -12408,3 +12408,29 @@ func (c *DialysisAPIController) SaveLongAdviceTemplate() {
 		"advice": newAdvices,
 	})
 }
+
+func (c *DialysisAPIController) StopLongAdvice() {
+
+	stop_time := c.GetString("execution_time")
+	id, _ := c.GetInt64("id")
+	if len(stop_time) <= 0 {
+		utils.ErrorLog("stop_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, errs := time.ParseInLocation(timeLayout2, stop_time, loc)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	advice, _ := service.StopLongAdvice(id, theTime.Unix())
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -231,4 +231,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/updateeditdrugorder", &DialysisAPIController{}, "Post:UpdateEditDrugOrder")
 
 	beego.Router("/m/api/savelongadvicetemplate", &DialysisAPIController{}, "Post:SaveLongAdviceTemplate")
+
+	beego.Router("/m/api/stoplongadvice", &DialysisAPIController{}, "Get:StopLongAdvice")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3494,6 +3494,10 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 		}
 
+		if adminUserInfo.Org.Id == 10727 {
+			dewater_amount = dewater_amount * 1000
+		}
+
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}
@@ -4226,6 +4230,27 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	}
 
+	//古镇乐生
+	if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+		if evaluation.ID == 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				dewater_amount = dewater_amount * 1000
+				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+
+		if evaluation.ID > 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				dewater_amount = dewater_amount * 1000
+				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+	}
+
 	if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 {
 
 		prescription, _ := service.GetTodayPrescription(id, adminUserInfo.Org.Id, theAssessmentDateTime)
@@ -5706,6 +5731,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 				advice.PrescribingNumber = cnt
 				advice.PrescribingNumberUnit = item.Unit
 				advice.AdviceDoctor = item.Doctor
+				advice.Remark = item.Remark
 				if item.Type == 3 {
 					advice.AdviceName = item.GoodInfo.GoodName
 					advice.PrescribingNumberUnit = item.GoodInfo.PackingUnit

controllers/patient_api_controller.go

@@ -303,13 +303,24 @@ func (c *PatientApiController) GetPatientsAllList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	patients, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
+	if adminUserInfo.CurrentOrgId != 10702 {
+		patients, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": patients,
+			"total":    total,
+		})
+		return
+	} else {
+		patients, total, _ := service.GetAllPatientListOne(adminUserInfo.CurrentOrgId)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients": patients,
+			"total":    total,
+		})
+		return
+	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-	})
-	return
 }
 
 // GenerateDialysisNo 生成透析号
@@ -8082,7 +8093,7 @@ func (c *DialysisApiController) AddDeathSummary() {
 	}
 
 	var lastRecordDate int64
-	if len(record_date) > 0 {
+	if len(last_record_date) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", last_record_date+" 00:00:00", loc)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/patient_dataconfig_api_controller.go

@@ -198,37 +198,31 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	//if patientID <= 0 || len(content) == 0 {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_time_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time_str+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
 
 	if len(record_time_str) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	record_date := strings.Split(record_time_str, " ")
-
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
-	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	//if getPatientErr != nil {
-	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if patient == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-	//	return
-	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientSickHistory{
 		OrgId:                   adminUserInfo.CurrentOrgId,
 		PatientId:               patientID,
 		Recorder:                adminUserInfo.AdminUser.Id,
-		RecordTime:              checkDate.Unix(),
+		RecordTime:              recordDate,
 		Content:                 content,
 		Status:                  1,
 		Title:                   title,
@@ -239,7 +233,7 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 		Ctime:                   now,
 		Mtime:                   now,
 		DoctorId:                doctor_id,
-		RecordDate:              checkDate_two.Unix(),
+		RecordDate:              recordDate,
 	}
 
 	createErr := service.CreatePatientSickHistory(&record)
@@ -304,24 +298,19 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	if patientID <= 0 || len(content) == 0 || id == 0 || len(record_time_str) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
-
 	adminUserInfo := this.GetAdminUserInfo()
-	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	//if getPatientErr != nil {
-	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if patient == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-	//	return
-	//}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_time_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time_str+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
 
 	now := time.Now().Unix()
 
@@ -335,7 +324,7 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 		Ctime:                   now,
 		Mtime:                   now,
 		Title:                   title,
-		RecordTime:              checkDate.Unix(),
+		RecordTime:              recordDate,
 		IsShenyizhiHistory:      is_shenyizhishi,
 		IsFumoDialysisHistory:   is_fumotouxishi,
 		HypersusceptibilityDesc: guominyaowu_desc,

service/dialysis_service.go

@@ -2726,3 +2726,11 @@ func ModifyPatientDisplacementQuantity(id int64, displacement_quantity float64)
 	err := XTWriteDB().Model(&models.MonitoringRecord{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"displacement_quantity": displacement_quantity}).Error
 	return err
 }
+
+func StopLongAdvice(id int64, stop_time int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id=? and status=1", id).Updates(map[string]interface{}{"stop_time": stop_time, "stop_state": 1, "updated_time": time.Now().Unix()}).Error
+
+	return advice, err
+}

service/patient_service.go

@@ -110,6 +110,14 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
+func GetAllPatientListOne(orgID int64) (patients []*models.Patients, total int64, err error) {
+
+	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto =1", orgID)
+
+	err = db.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.age,p.id_card_no").Count(&total).Find(&patients).Error
+	return
+}
+
 func GetAllPatientListTwenty(orgID int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto = 1", orgID)