Merge branch '20220812' of http://git.shengws.com/csx/XT_New into 20220812

controllers/dialysis_api_controller.go

@@ -448,6 +448,9 @@ func (c *DialysisApiController) PostPrescription() {
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
 	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
+		if prescribing_number == 0 {
+			prescribing_number = 1
+		}
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.CurrentOrgId,
 			PatientId:             patient,
@@ -455,8 +458,8 @@ func (c *DialysisApiController) PostPrescription() {
 			AdviceType:            2,
 			RecordDate:            recordDate.Unix(),
 			AdviceDate:            recordDate.Unix(),
-			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
-			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			StartTime:             recordDate.Unix() + 6.5*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
 			SingleDose:            5000,
@@ -472,12 +475,15 @@ func (c *DialysisApiController) PostPrescription() {
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),
 			IsPrescription:        1,
+			ExecutionState:        2,
+			StopState:             2,
+			IsSettle:              2,
 		}
 		// 查询排班信息
 		schedulePatient, _ := service.GetScheduleByPatient(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 		if schedulePatient.ID > 0 {
 			if schedulePatient.ScheduleType == 1 {
-				advice.StartTime = recordDate.Unix() + 7*60*60
+				advice.StartTime = recordDate.Unix() + 6.5*60*60
 			}
 
 			if schedulePatient.ScheduleType == 2 {
@@ -525,7 +531,7 @@ func (c *DialysisApiController) PostPrescription() {
 		}
 		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
 
-		if appRole.UserType == 2 || appRole.UserType == 1 {
+		if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 3 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
 
@@ -1162,6 +1168,9 @@ func (c *DialysisApiController) PostSoulution() {
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
 	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
+		if prescribing_number == 0 {
+			prescribing_number = 1
+		}
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.CurrentOrgId,
 			PatientId:             patient,
@@ -1169,8 +1178,8 @@ func (c *DialysisApiController) PostSoulution() {
 			AdviceType:            2,
 			RecordDate:            recordDate.Unix(),
 			AdviceDate:            recordDate.Unix(),
-			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
-			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			StartTime:             recordDate.Unix() + 6.5*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
 			SingleDose:            5000,
@@ -1186,12 +1195,15 @@ func (c *DialysisApiController) PostSoulution() {
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),
 			IsPrescription:        1,
+			ExecutionState:        2,
+			StopState:             2,
+			IsSettle:              2,
 		}
 		// 查询排班信息
 		schedulePatient, _ := service.GetScheduleByPatient(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 		if schedulePatient.ID > 0 {
 			if schedulePatient.ScheduleType == 1 {
-				advice.StartTime = recordDate.Unix() + 7*60*60
+				advice.StartTime = recordDate.Unix() + 6.5*60*60
 			}
 
 			if schedulePatient.ScheduleType == 2 {
@@ -1238,7 +1250,7 @@ func (c *DialysisApiController) PostSoulution() {
 			break
 		}
 		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
-		if appRole.UserType == 2 || appRole.UserType == 1 {
+		if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 3 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
 

controllers/dialysis_record_api_controller.go

@@ -1385,7 +1385,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		}
 
 		//针对蓬安
-		if adminUserInfo.CurrentOrgId == 9829 {
+		if adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
@@ -1472,7 +1472,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 {
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -684,6 +684,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 9829 {
 					evaluation.PulseFrequency = 80
 				}
+				if adminUserInfo.Org.Id == 10440 {
+					evaluation.Temperature = 36.5
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -841,6 +841,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			fmt.Println("-----------------------", adminUserInfo.Org.Id)
+			fmt.Println("modifier----------------", modifier)
 			//查询未核对的医嘱
 			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
 			if len(doctorList) > 0 && modifier > 0 {
@@ -883,6 +885,29 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.ID = check.ID
 		doubleCheck.EmployeeNumber = employee_number
 		err := service.UpdateDoubleCheck(&doubleCheck)
+		//针对长沙南雅
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			if len(doctorList) > 0 && modifier > 0 {
+				for _, advice := range doctorList {
+					service.UpdateDoctorAdviceList(advice.ID, modifier)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
 		defer redis.Close()
@@ -1658,6 +1683,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//长沙南雅医院，自动生成抗凝剂的临时处方
 		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
 
+			if prescribing_number == 0 {
+				prescribing_number = 1
+			}
 			advice := models.DoctorAdvice{
 				UserOrgId:             adminUserInfo.Org.Id,
 				PatientId:             id,
@@ -1665,8 +1693,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				AdviceType:            2,
 				RecordDate:            recordDate.Unix(),
 				AdviceDate:            recordDate.Unix(),
-				StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
-				AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+				StartTime:             recordDate.Unix() + 6.5*60*60, // 根据排班班次，给默认时间
+				AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 				AdviceDesc:            "",
 				ReminderDate:          0,
 				SingleDose:            5000,
@@ -1682,12 +1710,15 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				CreatedTime:           time.Now().Unix(),
 				UpdatedTime:           time.Now().Unix(),
 				IsPrescription:        1,
+				ExecutionState:        2,
+				StopState:             2,
+				IsSettle:              2,
 			}
 			// 查询排班信息
 			schedulePatient, _ := service.GetScheduleByPatient(id, recordDate.Unix(), adminUserInfo.Org.Id)
 			if schedulePatient.ID > 0 {
 				if schedulePatient.ScheduleType == 1 {
-					advice.StartTime = recordDate.Unix() + 7*60*60
+					advice.StartTime = recordDate.Unix() + 6.5*60*60
 				}
 
 				if schedulePatient.ScheduleType == 2 {
@@ -1735,7 +1766,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			}
 			//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
 
-			if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 4 {
+			if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 3 || appRole.UserType == 4 {
 				advice.AdviceDoctor = appRole.AdminUserId
 			}
 
@@ -2062,7 +2093,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2719,7 +2750,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			}
 
@@ -3233,6 +3264,9 @@ func (c *DialysisAPIController) PostSolution() {
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
 	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+		if prescribing_number == 0 {
+			prescribing_number = 1
+		}
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.Org.Id,
 			PatientId:             id,
@@ -3240,8 +3274,8 @@ func (c *DialysisAPIController) PostSolution() {
 			AdviceType:            2,
 			RecordDate:            recordDate.Unix(),
 			AdviceDate:            recordDate.Unix(),
-			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
-			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			StartTime:             recordDate.Unix() + 6.5*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
 			SingleDose:            5000,
@@ -3257,12 +3291,15 @@ func (c *DialysisAPIController) PostSolution() {
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),
 			IsPrescription:        1,
+			ExecutionState:        2,
+			StopState:             2,
+			IsSettle:              2,
 		}
 		// 查询排班信息
 		schedulePatient, _ := service.GetScheduleByPatient(id, recordDate.Unix(), adminUserInfo.Org.Id)
 		if schedulePatient.ID > 0 {
 			if schedulePatient.ScheduleType == 1 {
-				advice.StartTime = recordDate.Unix() + 7*60*60
+				advice.StartTime = recordDate.Unix() + 6.5*60*60
 			}
 
 			if schedulePatient.ScheduleType == 2 {
@@ -3309,7 +3346,7 @@ func (c *DialysisAPIController) PostSolution() {
 			break
 		}
 		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
-		if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 4 {
+		if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 3 || appRole.UserType == 4 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
 
@@ -3547,7 +3584,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3792,8 +3829,22 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	}
 
 	//修改床位号需要重新消毒
-	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10445 {
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 3877 {
 		service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
+
+		//查询第一条监测
+		firstMonitor, _ := service.GetFirstMonitor(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
+
+		service.UpdateFirstMonitor(firstMonitor.ID, catheter_operation)
+
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecord.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":monitor_records"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecord.DialysisDate, 10) + ":monitor_record_list_all"
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
+
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

service/mobile_dialysis_service.go

@@ -5257,3 +5257,17 @@ func MobileGetDoubleCheckSix(orgID int64, patientID int64, recordDate int64) (mo
 
 	return record, err
 }
+
+func GetFirstMonitor(patient_id int64, monit_date int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("patient_id = ? and monitoring_date = ? and status=1", patient_id, monit_date).First(&record).Error
+	return record, err
+}
+
+func UpdateFirstMonitor(id int64, catheter_operation string) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTWriteDB().Model(&record).Where("id = ? and status= 1", id).Updates(map[string]interface{}{"dispose": catheter_operation}).Error
+	return record, err
+}