XMLWAN 3 лет назад
Родитель
Сommit
5da7b6aae3

+ 2 - 1
controllers/dialysis_record_api_controller.go Просмотреть файл

@@ -88,7 +88,8 @@ func (this *DialysisRecordAPIController) GetSchedules() {
88 88
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
89 89
 		} else {
90 90
 			if len(scheduals) > 0 {
91
-				patients, _ := service.GetAllPcPatientListByList(orgID)
91
+
92
+				patients, _ := service.GetAllPcPatientListByListSeven(orgID)
92 93
 
93 94
 				dialysisOrders, _ := service.GetAllPcDialysisOrdersByList(orgID, date.Unix())
94 95
 

+ 7 - 0
service/dialysis_service.go Просмотреть файл

@@ -1409,6 +1409,13 @@ func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (ad
1409 1409
 	return
1410 1410
 }
1411 1411
 
1412
+func GetAllPcPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVMList, err error) {
1413
+
1414
+	err = readDb.Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
1415
+
1416
+	return patients, err
1417
+}
1418
+
1412 1419
 func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList, err error) {
1413 1420
 	redis := RedisClient()
1414 1421
 	defer redis.Close()

+ 1 - 1
service/patientmanage_service.go Просмотреть файл

@@ -1871,7 +1871,7 @@ func GetHospitalSummaryDetail(id int64) (models.XtHospitalSummary, error) {
1871 1871
 
1872 1872
 func UpdateHospital(id int64, summary models.XtHospitalSummary) error {
1873 1873
 
1874
-	err := XTWriteDB().Model(&summary).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": summary.Title, "admission_time": summary.AdmissionTime, "discharge_time": summary.DischargeTime, "sick_personnel": summary.SickPersonnel, "xray": summary.Xray, "connecticut": summary.Connecticut, "nuclear_magnetic_resonance": summary.NuclearMagneticResonance, "ultrasound": summary.Ultrasound, "pathology": summary.Pathology, "admitting_diagnosis_id": summary.AdmittingDiagnosisId, "admitting_diagnosis": summary.AdmittingDiagnosis, "discharge_diagnosis_id": summary.DischargeAdviceId, "discharge_diagnosis": summary.DischargeDiagnosis, "diagnosis_admission_id": summary.DiagnosisAdmissionId, "diagnosis_admission": summary.DiagnosisAdmission, "treatment_id": summary.TreatmentId, "treatment": summary.Treatment, "illness_discharge_id": summary.IllnessDischargeId, "illness_discharge": summary.IllnessDischarge, "discharge_advice_id": summary.DischargeAdviceId, "discharge_advice": summary.DischargeAdvice, "mtime": summary.Mtime, "record_time": summary.RecordTime, "dean_id": summary.DeanId, "doctor": summary.Doctor, "record_date": summary.RecordDate}).Error
1874
+	err := XTWriteDB().Model(&summary).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"title": summary.Title, "admission_time": summary.AdmissionTime, "discharge_time": summary.DischargeTime, "sick_personnel": summary.SickPersonnel, "xray": summary.Xray, "connecticut": summary.Connecticut, "nuclear_magnetic_resonance": summary.NuclearMagneticResonance, "ultrasound": summary.Ultrasound, "pathology": summary.Pathology, "admitting_diagnosis_id": summary.AdmittingDiagnosisId, "admitting_diagnosis": summary.AdmittingDiagnosis, "discharge_diagnosis_id": summary.DischargeDiagnosisId, "discharge_diagnosis": summary.DischargeDiagnosis, "diagnosis_admission_id": summary.DiagnosisAdmissionId, "diagnosis_admission": summary.DiagnosisAdmission, "treatment_id": summary.TreatmentId, "treatment": summary.Treatment, "illness_discharge_id": summary.IllnessDischargeId, "illness_discharge": summary.IllnessDischarge, "discharge_advice_id": summary.DischargeAdviceId, "discharge_advice": summary.DischargeAdvice, "mtime": summary.Mtime, "record_time": summary.RecordTime, "dean_id": summary.DeanId, "doctor": summary.Doctor, "record_date": summary.RecordDate}).Error
1875 1875
 	return err
1876 1876
 }
1877 1877