|
@@ -529,7 +529,7 @@ func (c *HisApiController) GetHisPatientInfo() {
|
529
|
529
|
//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
|
530
|
530
|
//monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
|
531
|
531
|
case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
|
532
|
|
- patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
|
532
|
+ patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
|
533
|
533
|
lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
534
|
534
|
|
535
|
535
|
order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
|
|
@@ -1156,7 +1156,7 @@ func (c *HisApiController) EditHisPrescription() {
|
1156
|
1156
|
|
1157
|
1157
|
role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
|
1158
|
1158
|
|
1159
|
|
- info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type)
|
|
1159
|
+ info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
|
1160
|
1160
|
var hpInfo models.HisPrescriptionInfo
|
1161
|
1161
|
if info.ID == 0 {
|
1162
|
1162
|
var randNum int
|
|
@@ -3844,7 +3844,7 @@ func (c *HisApiController) GetHisChargePatientInfo() {
|
3844
|
3844
|
//}
|
3845
|
3845
|
|
3846
|
3846
|
case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
|
3847
|
|
- patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
|
3847
|
+ patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
|
3848
|
3848
|
|
3849
|
3849
|
lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
3850
|
3850
|
|
|
@@ -5438,7 +5438,7 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
|
5438
|
5438
|
}
|
5439
|
5439
|
|
5440
|
5440
|
case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
|
5441
|
|
- patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
|
5441
|
+ patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
|
5442
|
5442
|
|
5443
|
5443
|
lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
5444
|
5444
|
|
|
@@ -5495,7 +5495,7 @@ func (c *HisApiController) GetHisMonthPatientInfo() {
|
5495
|
5495
|
|
5496
|
5496
|
monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
|
5497
|
5497
|
case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
|
5498
|
|
- patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
|
5498
|
+ patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
|
5499
|
5499
|
lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
|
5500
|
5500
|
|
5501
|
5501
|
order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
|