|
|
@@ -852,13 +852,14 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
|
|
852
|
852
|
}
|
|
853
|
853
|
|
|
854
|
854
|
} else if adviceType == 2 && len(deliverWay) <= 0 {
|
|
|
855
|
+
|
|
855
|
856
|
if patientType == 0 {
|
|
856
|
857
|
adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
|
|
857
|
858
|
adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
|
|
858
|
859
|
|
|
859
|
860
|
} else if patientType == 1 {
|
|
860
|
|
- adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
|
|
861
|
|
- adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
|
|
|
861
|
+ adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND (advice_doctor = ? or execution_staff = ?)"
|
|
|
862
|
+ adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, adminUserId)
|
|
862
|
863
|
} else if patientType == 2 {
|
|
863
|
864
|
adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND execution_staff = 0"
|
|
864
|
865
|
adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
|
|
|
@@ -886,41 +887,82 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
|
|
886
|
887
|
return vms, err
|
|
887
|
888
|
}
|
|
888
|
889
|
|
|
889
|
|
-func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string) ([]*HisMScheduleDoctorAdviceVM, error) {
|
|
|
890
|
+func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleDoctorAdviceVM, error) {
|
|
890
|
891
|
|
|
891
|
892
|
var vms []*HisMScheduleDoctorAdviceVM
|
|
892
|
893
|
if len(deliverWay) > 0 {
|
|
893
|
|
- db := readDb.
|
|
894
|
|
- Table("xt_schedule").
|
|
895
|
|
- Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
896
|
|
- Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
897
|
|
- return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
898
|
|
- }).
|
|
899
|
|
- Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
900
|
|
- Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
901
|
|
- Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
902
|
|
- Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
|
|
903
|
|
- Where("status = 1 AND user_org_id = ?", orgID)
|
|
904
|
|
- if scheduleDate != 0 {
|
|
905
|
|
- db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
894
|
+ if patientType == 0 {
|
|
|
895
|
+ db := readDb.
|
|
|
896
|
+ Table("xt_schedule").
|
|
|
897
|
+ Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
|
898
|
+ Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
|
899
|
+ return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
|
900
|
+ }).
|
|
|
901
|
+ Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
|
902
|
+ Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
|
903
|
+ Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
|
904
|
+ Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
|
|
|
905
|
+ Where("status = 1 AND user_org_id = ?", orgID)
|
|
|
906
|
+ if scheduleDate != 0 {
|
|
|
907
|
+ db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
908
|
+ }
|
|
|
909
|
+ err = db.Find(&vms).Error
|
|
906
|
910
|
}
|
|
907
|
|
- err = db.Find(&vms).Error
|
|
|
911
|
+ if patientType > 0 {
|
|
|
912
|
+ db := readDb.
|
|
|
913
|
+ Table("xt_schedule").
|
|
|
914
|
+ Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
|
915
|
+ Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
|
916
|
+ return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
|
917
|
+ }).
|
|
|
918
|
+ Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
|
919
|
+ Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
|
920
|
+ Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
|
921
|
+ Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
|
|
|
922
|
+ Where("status = 1 AND user_org_id = ?", orgID)
|
|
|
923
|
+ if scheduleDate != 0 {
|
|
|
924
|
+ db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
925
|
+ }
|
|
|
926
|
+ err = db.Find(&vms).Error
|
|
|
927
|
+ }
|
|
|
928
|
+
|
|
908
|
929
|
} else {
|
|
909
|
|
- db := readDb.
|
|
910
|
|
- Table("xt_schedule").
|
|
911
|
|
- Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
912
|
|
- Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
913
|
|
- return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
914
|
|
- }).
|
|
915
|
|
- Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
916
|
|
- Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
917
|
|
- Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
918
|
|
- Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
|
|
919
|
|
- Where("status = 1 AND user_org_id = ?", orgID)
|
|
920
|
|
- if scheduleDate != 0 {
|
|
921
|
|
- db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
930
|
+ if patientType == 0 {
|
|
|
931
|
+ db := readDb.
|
|
|
932
|
+ Table("xt_schedule").
|
|
|
933
|
+ Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
|
934
|
+ Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
|
935
|
+ return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
|
936
|
+ }).
|
|
|
937
|
+ Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
|
938
|
+ Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
|
939
|
+ Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
|
940
|
+ Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
|
|
|
941
|
+ Where("status = 1 AND user_org_id = ?", orgID)
|
|
|
942
|
+ if scheduleDate != 0 {
|
|
|
943
|
+ db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
944
|
+ }
|
|
|
945
|
+ err = db.Find(&vms).Error
|
|
922
|
946
|
}
|
|
923
|
|
- err = db.Find(&vms).Error
|
|
|
947
|
+ fmt.Println("patin34te2222222222222222222", patientType)
|
|
|
948
|
+ if patientType > 0 {
|
|
|
949
|
+ db := readDb.
|
|
|
950
|
+ Table("xt_schedule").
|
|
|
951
|
+ Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
|
|
|
952
|
+ Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
|
|
|
953
|
+ return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
|
|
|
954
|
+ }).
|
|
|
955
|
+ Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
|
|
|
956
|
+ Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
|
|
|
957
|
+ Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
|
|
|
958
|
+ Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
|
|
|
959
|
+ Where("status = 1 AND user_org_id = ?", orgID)
|
|
|
960
|
+ if scheduleDate != 0 {
|
|
|
961
|
+ db = db.Where("schedule_date = ?", scheduleDate)
|
|
|
962
|
+ }
|
|
|
963
|
+ err = db.Find(&vms).Error
|
|
|
964
|
+ }
|
|
|
965
|
+
|
|
924
|
966
|
}
|
|
925
|
967
|
|
|
926
|
968
|
return vms, err
|
XMLWAN