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

controllers/his_api_controller.go

 	printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
 
-	patient, _ := service.GetPatientByID(order.UserOrgId, order.PatientId)
+	patient, _ := service.GetFaPiaoPatientByID(order.UserOrgId, order.PatientId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patient":                                     patient,
 	record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
-	patient, _ := service.GetPatientByID(org_id, order.PatientId)
+	patient, _ := service.GetFaPiaoPatientByID(org_id, order.PatientId)
 	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order":           order,
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
 	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
-	patient, _ := service.GetPatientByID(org_id, order.PatientId)
+	patient, _ := service.GetFaPiaoPatientByID(org_id, order.PatientId)
 
 	his, _ := service.GetHisPatientInfoThree(order.UserOrgId, order.MdtrtId)
 	//his, _ := service.Get(order.UserOrgId, order.MdtrtId)
 
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 
-	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+	patient, _ := service.GetFaPiaoPatientByID(adminUser.CurrentOrgId, patient_id)
 
 	var bedCostTotal float64 = 0         //床位总费
 	var bedCostSelfTotal float64 = 0     //床位自费
 
 	orderInfos, _ := service.GetHisOrderInfoByNumberOne(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
-	orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
+	//orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
 
-	var orderInfos_four []*models.HisOrderInfoTwo
-	for _, item := range orderInfos_three {
-		if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
-			item.HisPrescriptionProject.IsCheckTeam = 1
-			orderInfos_four = append(orderInfos_four, item)
-
-		}
-		if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
-			item.HisPrescriptionProject.IsCheckTeam = 2
-			orderInfos_two = append(orderInfos_two, item)
-		}
-	}
+	//var orderInfos_four []*models.HisOrderInfoTwo
+	//for _, item := range orderInfos_three {
+	//	if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
+	//		item.HisPrescriptionProject.IsCheckTeam = 1
+	//		orderInfos_four = append(orderInfos_four, item)
+	//
+	//	}
+	//	if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
+	//		item.HisPrescriptionProject.IsCheckTeam = 2
+	//		orderInfos_two = append(orderInfos_two, item)
+	//	}
+	//}
 
 	//new_order_info := RemoveRepeatedTeam(orderInfos_four)
-	var cus_slice []CustomOrderInfo
+	//var cus_slice []CustomOrderInfo
 	//for _, item := range new_order_info {
 	//	var cus CustomOrderInfo
 	//	cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
 
 	orderInfos = append(orderInfos, orderInfos_two...)
 	//if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
-	orderInfos = append(orderInfos, orderInfos_three...)
+	//orderInfos = append(orderInfos, orderInfos_three...)
 
 	//}/**/
 
-	patient, _ := service.GetPatientByID(org_id, order.PatientId)
+	patient, _ := service.GetFaPiaoPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":          order,
-		"order_info":     orderInfos,
-		"patient":        patient,
-		"admin_info":     adminInfo,
-		"his":            his,
-		"current_admin":  role,
-		"org_config":     miConfig,
-		"new_order_info": cus_slice,
+		"order":         order,
+		"order_info":    orderInfos,
+		"patient":       patient,
+		"admin_info":    adminInfo,
+		"his":           his,
+		"current_admin": role,
+		"org_config":    miConfig,
+		//"new_order_info": cus_slice,
 	})
 
 }

controllers/his_project_api_controller.go

 	adminUserInfo := this.GetAdminUserInfo()
 	chargePrint, err := service.GetChargePrint(recordDateTime, patient_id, adminUserInfo.CurrentOrgId)
 	prescription, err := service.GetHisPrescriptionNight(adminUserInfo.CurrentOrgId, patient_id, recordDateTime, prescription_id)
-	patient, err := service.GetPatientByID(adminUserInfo.CurrentOrgId, patient_id)
+	patient, err := service.GetFaPiaoPatientByID(adminUserInfo.CurrentOrgId, patient_id)
 	hisPatient, err := service.GetHisPatientById(patient_id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 
 	id, _ := this.GetInt64("id")
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, err := service.GetPatientByID(adminUserInfo.CurrentOrgId, id)
+	patient, err := service.GetFaPiaoPatientByID(adminUserInfo.CurrentOrgId, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/his_summary_controller.go

 	endRecordDateTime := endTime.Unix()
 
 	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
-	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+	patient, _ := service.GetFaPiaoPatientByID(adminUser.CurrentOrgId, patient_id)
 
 	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 
 	endRecordDateTime := endTime.Unix()
 
 	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
-	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+	patient, _ := service.GetFaPiaoPatientByID(adminUser.CurrentOrgId, patient_id)
 
 	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 

controllers/inspection_api_controller.go

 		return
 	}
 
-	patient_info, _ := service.GetPatientByID(adminUserInfo.CurrentOrgId, patient)
+	patient_info, _ := service.GetFaPiaoPatientByID(adminUserInfo.CurrentOrgId, patient)
 
 	counts, err := service.GetPatientInspectionProjectCount(adminUserInfo.CurrentOrgId, patient)
 	if err != nil {

controllers/statistics_api_controller.go

 		endTime = theTime.Unix()
 	}
 
-	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
+	patient, _ := service.GetFaPiaoPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
 	//获取配置
 	reference, _ := service.GetInspectionReferenceThree(project_id, item_id)
 	//获取数值在正常范围内的总数

service/his_service.go

 
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfoTwo, err error) {
 	db := readDb.Model(&models.HisOrderInfoTwo{})
-	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id = 0")
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id")
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+		return db.Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})
 	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0 ", order_number).Find(&order).Error
 	return
 	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
 
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+		return db.Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})
 	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0", order_number).Find(&order).Error
 	return

service/patient_dataconfig_service.go

 	err := writeDb.Model(&models.XtPatientPhysiqueCheck{}).Where("org_id = ? and patient_id = ? and id in (?) and status = 1", orgID, patientID, recordIDs).Updates(map[string]interface{}{"status": 2, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func GetFaPiaoPatientByID(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
+}