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

controllers/zuobiao_api_controller.go

@@ -92,14 +92,14 @@ func (c *ZuobiaoApiController) GetHisZuoBiaoDetailInfo() {
 	} else if is_upload == 2 { //已上传
 		prescriptions, _ = service.GetUploadHisZuoBiaoPrescription(adminInfo.CurrentOrgId, patient_id, recordDateTime)
 	}
-	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
+	patient, _ := service.GetPatientByIDThree(c.GetAdminUserInfo().CurrentOrgId, patient_id)
 	var monthPrescriptions []*models.HisPrescription
 	if is_upload == 1 {
 		monthPrescriptions, _ = service.GetMonthUnUploadHisZuoBiaoPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
 	} else if is_upload == 2 {
 		monthPrescriptions, _ = service.GetMonthUploadHisZuoBiaoPrescription(adminInfo.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
 	}
-	prescription_info, _ := service.GetZuoBiaoPrescriptionInfo(c.GetAdminUserInfo().CurrentOrgId, patient.ID)
+	prescription_info, _ := service.GetZuoBiaoPrescriptionInfo(adminInfo.CurrentOrgId, patient.ID)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"prescription":        prescriptions,

service/patient_dataconfig_service.go

@@ -161,3 +161,16 @@ func GetFaPiaoPatientByID(orgID int64, patientID int64) (*models.Patients, error
 	}
 	return &patient, nil
 }
+
+func GetPatientByIDThree(orgID int64, patientID int64) (*models.Patients, error) {
+	var patient models.Patients
+	err := readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &patient, nil
+}