历史排班

controllers/his_project_api_controller.go

@@ -1295,6 +1295,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 
 	eles, _ := service.GetNewAdminUserES(adminUserInfo.CurrentOrgId)
 
+	roles, _ := service.GetAllDoctor(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
@@ -1308,6 +1309,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 		"info":              prescriptionInfo,
 		"eles":              eles,
 		"psn_info":          psn_info,
+		"roles":             roles,
 	})
 }
 

service/mobile_dialysis_service.go

@@ -4021,7 +4021,7 @@ func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64
 		db = db.Where("x.dialysis_date <= ?", endtime)
 	}
 
-	err = db.Select("x.id,x.dialysis_date,x.schedual_type,s.mode_id").Joins("left join xt_schedule as s on  x.patient_id = s.patient_id and x.dialysis_date = s.schedule_date ").Scan(&order).Error
+	err = db.Select("x.id,x.dialysis_date,x.schedual_type,s.mode_id").Where("s.status=1").Joins("left join xt_schedule as s on  x.patient_id = s.patient_id and x.dialysis_date = s.schedule_date ").Group("x.id").Scan(&order).Error
 	return order, err
 }
 

service/pharmacy_service.go

@@ -249,63 +249,120 @@ func GetManyUsers(tmp []int64) (list []*models.TmpPatient, err error) {
 func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (pp []*models.PharmacyContent, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
-	if is_medicine == 0 {
+	if orgid == 10375 {
 		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and drug_id in (select id from xt_base_drug where org_id = ?)", stime, etime, orgid, patient_id, orgid).Find(&tmp).Error
 		if err != nil {
 			return pp, err
 		}
-	} else {
-		err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-			"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
-		if err != nil {
-			return pp, err
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         config.ToString(v.Day) + "天",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:  "his处方",
+				Remarks:      v.Remark, //备注
+				DrugId:       v.DrugId,
+			})
 		}
-	}
 
-	for _, v := range tmp {
-		pp = append(pp, &models.PharmacyContent{
-			Name:         v.AdviceName,
-			SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-			Usage:        v.DeliveryWay,
-			Frequency:    v.ExecutionFrequency,
-			Days:         config.ToString(v.Day) + "天",
-			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
-			DataSources:  "his处方",
-			Remarks:      v.Remark, //备注
-			DrugId:       v.DrugId,
-		})
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         "-",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:  "临时医嘱",
+				Remarks:      v.Remark,
+				DrugId:       v.DrugId,
+			})
+		}
+		return
 	}
 
-	var tmp_advice []*models.XtDoctorAdviceL
-	if is_medicine == 0 {
-		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
-		if err != nil {
-			return pp, err
+	if orgid != 10375 {
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp).Error
+			if err != nil {
+				return pp, err
+			}
 		}
-	} else {
-		err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-			"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
-		if err != nil {
-			return pp, err
+
+		for _, v := range tmp {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         config.ToString(v.Day) + "天",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
+				DataSources:  "his处方",
+				Remarks:      v.Remark, //备注
+				DrugId:       v.DrugId,
+			})
 		}
-	}
 
-	for _, v := range tmp_advice {
-		pp = append(pp, &models.PharmacyContent{
-			Name:         v.AdviceName,
-			SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
-			Usage:        v.DeliveryWay,
-			Frequency:    v.ExecutionFrequency,
-			Days:         "-",
-			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
-			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
-			DataSources:  "临时医嘱",
-			Remarks:      v.Remark,
-			DrugId:       v.DrugId,
-		})
+		var tmp_advice []*models.XtDoctorAdviceL
+		if is_medicine == 0 {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		} else {
+			err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and patient_id = ? and is_medicine = ? and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, is_medicine, orgid).Find(&tmp_advice).Error
+			if err != nil {
+				return pp, err
+			}
+		}
+
+		for _, v := range tmp_advice {
+			pp = append(pp, &models.PharmacyContent{
+				Name:         v.AdviceName,
+				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
+				Usage:        v.DeliveryWay,
+				Frequency:    v.ExecutionFrequency,
+				Days:         "-",
+				Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
+				Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
+				DataSources:  "临时医嘱",
+				Remarks:      v.Remark,
+				DrugId:       v.DrugId,
+			})
+		}
+		return
 	}
 	return
 }