|
|
@@ -47,7 +47,7 @@
|
|
47
|
47
|
<template slot-scope="scope">{{scope.row.name}}</template>
|
|
48
|
48
|
</el-table-column>
|
|
49
|
49
|
<el-table-column align="center" prop="name" label="就诊号" width="110">
|
|
50
|
|
- <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}
|
|
|
50
|
+ <template slot-scope="scope">{{ scope.row.number?scope.row.number:''}}
|
|
51
|
51
|
</template>
|
|
52
|
52
|
</el-table-column>
|
|
53
|
53
|
</el-table>
|
|
|
@@ -139,8 +139,8 @@
|
|
139
|
139
|
</el-button>
|
|
140
|
140
|
|
|
141
|
141
|
<el-button
|
|
142
|
|
- v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
|
|
143
|
|
- size="small" @click="open(11)" type="primary"
|
|
|
142
|
+ v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
|
|
|
143
|
+ size="small" @click="open(11)" type="primary"
|
|
144
|
144
|
>撤销明细
|
|
145
|
145
|
</el-button>
|
|
146
|
146
|
|
|
|
@@ -596,6 +596,7 @@
|
|
596
|
596
|
}, chargeConfirm(form) {
|
|
597
|
597
|
|
|
598
|
598
|
form['id'] = this.patientInfo.id
|
|
|
599
|
+ form['his_patient_id'] = this.hisPatientInfo.id
|
|
599
|
600
|
form['record_time'] = this.record_date
|
|
600
|
601
|
form['admin_user_id'] = this.$store.getters.xt_user.user.id
|
|
601
|
602
|
form['order_id'] = this.order.id
|
|
|
@@ -749,27 +750,82 @@
|
|
749
|
750
|
let one_count = 0
|
|
750
|
751
|
let two_count = 0
|
|
751
|
752
|
let three_count = 0
|
|
|
753
|
+
|
|
752
|
754
|
for (let i = 0; i < response.data.data.list.length; i++) {
|
|
753
|
|
- that.all_table_data.push(response.data.data.list[i])
|
|
754
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
|
755
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
756
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
757
|
+ let obj = {
|
|
|
758
|
+ id: response.data.data.list[i].id,
|
|
|
759
|
+ name: response.data.data.list[i].name,
|
|
|
760
|
+ number: '',
|
|
|
761
|
+ order_status: 0,
|
|
|
762
|
+ order_number: '',
|
|
|
763
|
+ his_patient_id: 0
|
|
|
764
|
+ }
|
|
|
765
|
+
|
|
|
766
|
+ that.all_table_data.push(obj)
|
|
|
767
|
+ }
|
|
|
768
|
+
|
|
|
769
|
+ } else { //挂号
|
|
|
770
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
771
|
+ let obj = {
|
|
|
772
|
+ id: response.data.data.list[i].id,
|
|
|
773
|
+ name: response.data.data.list[i].name,
|
|
|
774
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
775
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
776
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
777
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
778
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
779
|
+ }
|
|
|
780
|
+ that.all_table_data.push(obj)
|
|
|
781
|
+
|
|
|
782
|
+ }
|
|
|
783
|
+
|
|
|
784
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
785
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
786
|
+ let obj = {
|
|
|
787
|
+ id: response.data.data.list[i].id,
|
|
|
788
|
+ name: response.data.data.list[i].name,
|
|
|
789
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
790
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
791
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
792
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
793
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
794
|
+ }
|
|
|
795
|
+ that.all_table_data.push(obj)
|
|
|
796
|
+
|
|
|
797
|
+ }
|
|
|
798
|
+ }
|
|
|
799
|
+ }
|
|
|
800
|
+
|
|
|
801
|
+ }
|
|
|
802
|
+
|
|
|
803
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
804
|
+ if (that.all_table_data[i].his_patient_id > 0) {
|
|
|
805
|
+ that.hisPatientDatas.push(that.all_table_data[i])
|
|
|
806
|
+ }
|
|
|
807
|
+ }
|
|
|
808
|
+
|
|
|
809
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
810
|
+
|
|
|
811
|
+ if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
|
|
755
|
812
|
one_count = one_count + 1
|
|
756
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
813
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
757
|
814
|
}
|
|
758
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
|
815
|
+ if (that.all_table_data[i].order_status == 2) {
|
|
759
|
816
|
two_count = two_count + 1
|
|
760
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
817
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
761
|
818
|
}
|
|
762
|
819
|
}
|
|
763
|
|
- that.hisPatientDatas = response.data.data.list_two
|
|
764
|
820
|
that.cal_one = one_count
|
|
765
|
821
|
that.cal_two = two_count
|
|
766
|
822
|
that.cal_three = three_count
|
|
767
|
823
|
that.current_index = 0
|
|
768
|
824
|
|
|
769
|
825
|
for (let i = 0; i < that.patientTableData.length; i++) {
|
|
770
|
|
- if (this.patientTableData[i].id == this.patientInfo.id) {
|
|
|
826
|
+ if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
|
|
771
|
827
|
that.$refs.tab.setCurrentRow(that.patientTableData[i])
|
|
772
|
|
- that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
|
|
|
828
|
+ that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number, that.patientTableData[i].his_patient_id)
|
|
773
|
829
|
}
|
|
774
|
830
|
}
|
|
775
|
831
|
that.loadingone = false
|
|
|
@@ -834,27 +890,82 @@
|
|
834
|
890
|
let one_count = 0
|
|
835
|
891
|
let two_count = 0
|
|
836
|
892
|
let three_count = 0
|
|
|
893
|
+
|
|
837
|
894
|
for (let i = 0; i < response.data.data.list.length; i++) {
|
|
838
|
|
- that.all_table_data.push(response.data.data.list[i])
|
|
839
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
|
895
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
896
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
897
|
+ let obj = {
|
|
|
898
|
+ id: response.data.data.list[i].id,
|
|
|
899
|
+ name: response.data.data.list[i].name,
|
|
|
900
|
+ number: '',
|
|
|
901
|
+ order_status: 0,
|
|
|
902
|
+ order_number: '',
|
|
|
903
|
+ his_patient_id: 0
|
|
|
904
|
+ }
|
|
|
905
|
+
|
|
|
906
|
+ that.all_table_data.push(obj)
|
|
|
907
|
+ }
|
|
|
908
|
+
|
|
|
909
|
+ } else { //挂号
|
|
|
910
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
911
|
+ let obj = {
|
|
|
912
|
+ id: response.data.data.list[i].id,
|
|
|
913
|
+ name: response.data.data.list[i].name,
|
|
|
914
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
915
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
916
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
917
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
918
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
919
|
+ }
|
|
|
920
|
+ that.all_table_data.push(obj)
|
|
|
921
|
+
|
|
|
922
|
+ }
|
|
|
923
|
+
|
|
|
924
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
925
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
926
|
+ let obj = {
|
|
|
927
|
+ id: response.data.data.list[i].id,
|
|
|
928
|
+ name: response.data.data.list[i].name,
|
|
|
929
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
930
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
931
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
932
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
933
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
934
|
+ }
|
|
|
935
|
+ that.all_table_data.push(obj)
|
|
|
936
|
+
|
|
|
937
|
+ }
|
|
|
938
|
+ }
|
|
|
939
|
+ }
|
|
|
940
|
+
|
|
|
941
|
+ }
|
|
|
942
|
+
|
|
|
943
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
944
|
+ if (that.all_table_data[i].his_patient_id > 0) {
|
|
|
945
|
+ that.hisPatientDatas.push(that.all_table_data[i])
|
|
|
946
|
+ }
|
|
|
947
|
+ }
|
|
|
948
|
+
|
|
|
949
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
950
|
+ if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
|
|
840
|
951
|
one_count = one_count + 1
|
|
841
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
952
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
842
|
953
|
}
|
|
843
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
|
954
|
+ if (that.all_table_data[i].order_status == 2) {
|
|
844
|
955
|
two_count = two_count + 1
|
|
845
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
956
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
846
|
957
|
}
|
|
847
|
958
|
}
|
|
848
|
|
- that.hisPatientDatas = response.data.data.list_two
|
|
|
959
|
+
|
|
849
|
960
|
that.cal_one = one_count
|
|
850
|
961
|
that.cal_two = two_count
|
|
851
|
962
|
that.cal_three = three_count
|
|
852
|
963
|
that.current_index = 0
|
|
853
|
964
|
|
|
854
|
965
|
for (let i = 0; i < that.patientTableData.length; i++) {
|
|
855
|
|
- if (this.patientTableData[i].id == this.patientInfo.id) {
|
|
|
966
|
+ if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
|
|
856
|
967
|
that.$refs.tab.setCurrentRow(that.patientTableData[i])
|
|
857
|
|
- that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
|
|
|
968
|
+ that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
|
|
858
|
969
|
}
|
|
859
|
970
|
}
|
|
860
|
971
|
that.$message({ message: '挂号成功', type: 'success' })
|
|
|
@@ -908,33 +1019,85 @@
|
|
908
|
1019
|
let one_count = 0
|
|
909
|
1020
|
let two_count = 0
|
|
910
|
1021
|
let three_count = 0
|
|
|
1022
|
+
|
|
911
|
1023
|
for (let i = 0; i < response.data.data.list.length; i++) {
|
|
912
|
|
- that.all_table_data.push(response.data.data.list[i])
|
|
913
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
|
1024
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
1025
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
1026
|
+ let obj = {
|
|
|
1027
|
+ id: response.data.data.list[i].id,
|
|
|
1028
|
+ name: response.data.data.list[i].name,
|
|
|
1029
|
+ number: '',
|
|
|
1030
|
+ order_status: 0,
|
|
|
1031
|
+ order_number: '',
|
|
|
1032
|
+ his_patient_id: 0
|
|
|
1033
|
+ }
|
|
|
1034
|
+
|
|
|
1035
|
+ that.all_table_data.push(obj)
|
|
|
1036
|
+ }
|
|
|
1037
|
+
|
|
|
1038
|
+ } else { //挂号
|
|
|
1039
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
1040
|
+ let obj = {
|
|
|
1041
|
+ id: response.data.data.list[i].id,
|
|
|
1042
|
+ name: response.data.data.list[i].name,
|
|
|
1043
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
1044
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
1045
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
1046
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
1047
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
1048
|
+ }
|
|
|
1049
|
+ that.all_table_data.push(obj)
|
|
|
1050
|
+
|
|
|
1051
|
+ }
|
|
|
1052
|
+
|
|
|
1053
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
1054
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
1055
|
+ let obj = {
|
|
|
1056
|
+ id: response.data.data.list[i].id,
|
|
|
1057
|
+ name: response.data.data.list[i].name,
|
|
|
1058
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
1059
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
1060
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
1061
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
1062
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
1063
|
+ }
|
|
|
1064
|
+ that.all_table_data.push(obj)
|
|
|
1065
|
+
|
|
|
1066
|
+ }
|
|
|
1067
|
+ }
|
|
|
1068
|
+ }
|
|
|
1069
|
+
|
|
|
1070
|
+ }
|
|
|
1071
|
+
|
|
|
1072
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
1073
|
+ if (that.all_table_data[i].his_patient_id > 0) {
|
|
|
1074
|
+ that.hisPatientDatas.push(this.all_table_data[i])
|
|
|
1075
|
+ }
|
|
|
1076
|
+ }
|
|
|
1077
|
+
|
|
|
1078
|
+ for (let i = 0; i < that.all_table_data.length; i++) {
|
|
|
1079
|
+ if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
|
|
914
|
1080
|
one_count = one_count + 1
|
|
915
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
1081
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
916
|
1082
|
}
|
|
917
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
|
1083
|
+ if (that.all_table_data[i].order_status == 2) {
|
|
918
|
1084
|
two_count = two_count + 1
|
|
919
|
|
- that.patientTableData.push(response.data.data.list[i])
|
|
|
1085
|
+ that.patientTableData.push(that.all_table_data[i])
|
|
920
|
1086
|
}
|
|
921
|
1087
|
}
|
|
922
|
|
- that.hisPatientDatas = response.data.data.list_two
|
|
923
|
1088
|
that.cal_one = one_count
|
|
924
|
1089
|
that.cal_two = two_count
|
|
925
|
1090
|
that.cal_three = three_count
|
|
926
|
1091
|
that.current_index = 0
|
|
927
|
1092
|
for (let i = 0; i < that.patientTableData.length; i++) {
|
|
928
|
|
- if (this.patientTableData[i].id == this.patientInfo.id) {
|
|
|
1093
|
+ if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
|
|
929
|
1094
|
that.$refs.tab.setCurrentRow(that.patientTableData[i])
|
|
930
|
|
- that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
|
|
|
1095
|
+ that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
|
|
931
|
1096
|
}
|
|
932
|
1097
|
}
|
|
933
|
1098
|
var his_info = response.data.data.his_info
|
|
934
|
1099
|
that.hisPatientInfo = his_info
|
|
935
|
|
-
|
|
936
|
1100
|
}
|
|
937
|
|
-
|
|
938
|
1101
|
})
|
|
939
|
1102
|
}
|
|
940
|
1103
|
}
|
|
|
@@ -1092,19 +1255,69 @@
|
|
1092
|
1255
|
let one_count = 0
|
|
1093
|
1256
|
let two_count = 0
|
|
1094
|
1257
|
let three_count = 0
|
|
|
1258
|
+
|
|
1095
|
1259
|
for (let i = 0; i < response.data.data.list.length; i++) {
|
|
1096
|
|
- this.all_table_data.push(response.data.data.list[i])
|
|
1097
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
1098
|
|
- one_count = one_count + 1
|
|
|
1260
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
1261
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
1262
|
+ let obj = {
|
|
|
1263
|
+ id: response.data.data.list[i].id,
|
|
|
1264
|
+ name: response.data.data.list[i].name,
|
|
|
1265
|
+ number: '',
|
|
|
1266
|
+ order_status: 0,
|
|
|
1267
|
+ order_number: '',
|
|
|
1268
|
+ his_patient_id: 0
|
|
|
1269
|
+ }
|
|
|
1270
|
+
|
|
|
1271
|
+ this.all_table_data.push(obj)
|
|
|
1272
|
+ }
|
|
|
1273
|
+
|
|
|
1274
|
+ } else { //挂号
|
|
|
1275
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
1276
|
+ let obj = {
|
|
|
1277
|
+ id: response.data.data.list[i].id,
|
|
|
1278
|
+ name: response.data.data.list[i].name,
|
|
|
1279
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
1280
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
1281
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
1282
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
1283
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
1284
|
+ }
|
|
|
1285
|
+ this.all_table_data.push(obj)
|
|
|
1286
|
+
|
|
|
1287
|
+ }
|
|
|
1288
|
+
|
|
|
1289
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
1290
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
1291
|
+ let obj = {
|
|
|
1292
|
+ id: response.data.data.list[i].id,
|
|
|
1293
|
+ name: response.data.data.list[i].name,
|
|
|
1294
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
1295
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
1296
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
1297
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
1298
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
1299
|
+ }
|
|
|
1300
|
+ this.all_table_data.push(obj)
|
|
|
1301
|
+
|
|
|
1302
|
+ }
|
|
|
1303
|
+ }
|
|
1099
|
1304
|
}
|
|
1100
|
1305
|
|
|
1101
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
1102
|
|
- two_count = two_count + 1
|
|
|
1306
|
+ }
|
|
|
1307
|
+
|
|
|
1308
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
1309
|
+ if (this.all_table_data[i].his_patient_id > 0) {
|
|
|
1310
|
+ this.hisPatientDatas.push(this.all_table_data[i])
|
|
1103
|
1311
|
}
|
|
|
1312
|
+ }
|
|
1104
|
1313
|
|
|
1105
|
|
- // if (response.data.data.list[i].order.order_status == 3) {
|
|
1106
|
|
- // three_count = three_count + 1
|
|
1107
|
|
- // }
|
|
|
1314
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
1315
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
|
|
|
1316
|
+ one_count = one_count + 1
|
|
|
1317
|
+ }
|
|
|
1318
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
|
1319
|
+ two_count = two_count + 1
|
|
|
1320
|
+ }
|
|
1108
|
1321
|
}
|
|
1109
|
1322
|
|
|
1110
|
1323
|
switch (this.radio) {
|
|
|
@@ -1113,7 +1326,7 @@
|
|
1113
|
1326
|
this.patientTableData = []
|
|
1114
|
1327
|
|
|
1115
|
1328
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
1116
|
|
- if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
|
|
|
1329
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1) {
|
|
1117
|
1330
|
this.patientTableData.push(this.all_table_data[i])
|
|
1118
|
1331
|
}
|
|
1119
|
1332
|
|
|
|
@@ -1122,7 +1335,7 @@
|
|
1122
|
1335
|
case 2:
|
|
1123
|
1336
|
this.patientTableData = []
|
|
1124
|
1337
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
1125
|
|
- if (this.all_table_data[i].order.order_status == 2) {
|
|
|
1338
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
1126
|
1339
|
this.patientTableData.push(this.all_table_data[i])
|
|
1127
|
1340
|
}
|
|
1128
|
1341
|
|
|
|
@@ -1133,7 +1346,7 @@
|
|
1133
|
1346
|
|
|
1134
|
1347
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
1135
|
1348
|
|
|
1136
|
|
- if (this.all_table_data[i].order.order_status == 3) {
|
|
|
1349
|
+ if (this.all_table_data[i].order_status == 3) {
|
|
1137
|
1350
|
this.patientTableData.push(this.all_table_data[i])
|
|
1138
|
1351
|
}
|
|
1139
|
1352
|
|
|
|
@@ -1146,7 +1359,6 @@
|
|
1146
|
1359
|
|
|
1147
|
1360
|
}
|
|
1148
|
1361
|
|
|
1149
|
|
- this.hisPatientDatas = response.data.data.list_two
|
|
1150
|
1362
|
this.cal_one = one_count
|
|
1151
|
1363
|
this.cal_two = two_count
|
|
1152
|
1364
|
this.cal_three = three_count
|
|
|
@@ -1154,9 +1366,9 @@
|
|
1154
|
1366
|
|
|
1155
|
1367
|
if (this.patientTableData.length > 0) {
|
|
1156
|
1368
|
for (let i = 0; i < this.patientTableData.length; i++) {
|
|
1157
|
|
- if (this.patientTableData[i].id == this.patientInfo.id) {
|
|
|
1369
|
+ if (this.patientTableData[i].his_patient_id == this.hisPatientInfo.id) {
|
|
1158
|
1370
|
this.$refs.tab.setCurrentRow(this.patientTableData[i])
|
|
1159
|
|
- this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
|
|
|
1371
|
+ this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id)
|
|
1160
|
1372
|
}
|
|
1161
|
1373
|
}
|
|
1162
|
1374
|
}
|
|
|
@@ -1183,26 +1395,76 @@
|
|
1183
|
1395
|
let two_count = 0
|
|
1184
|
1396
|
let three_count = 0
|
|
1185
|
1397
|
|
|
1186
|
|
- for (let i = 0; i < response.data.data.list_two.length; i++) {
|
|
1187
|
|
- this.hisPatientDatas.push(response.data.data.list_two[i])
|
|
1188
|
|
- if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
|
|
1189
|
|
- one_count = one_count + 1
|
|
|
1398
|
+ for (let i = 0; i < response.data.data.list.length; i++) {
|
|
|
1399
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
1400
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
1401
|
+ let obj = {
|
|
|
1402
|
+ id: response.data.data.list[i].id,
|
|
|
1403
|
+ name: response.data.data.list[i].name,
|
|
|
1404
|
+ number: '',
|
|
|
1405
|
+ order_status: 0,
|
|
|
1406
|
+ order_number: '',
|
|
|
1407
|
+ his_patient_id: 0
|
|
|
1408
|
+ }
|
|
|
1409
|
+
|
|
|
1410
|
+ this.all_table_data.push(obj)
|
|
|
1411
|
+ }
|
|
|
1412
|
+
|
|
|
1413
|
+ } else { //挂号
|
|
|
1414
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
1415
|
+ let obj = {
|
|
|
1416
|
+ id: response.data.data.list[i].id,
|
|
|
1417
|
+ name: response.data.data.list[i].name,
|
|
|
1418
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
1419
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
1420
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
1421
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
1422
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
1423
|
+ }
|
|
|
1424
|
+ this.all_table_data.push(obj)
|
|
|
1425
|
+
|
|
|
1426
|
+ }
|
|
|
1427
|
+
|
|
|
1428
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
1429
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
1430
|
+ let obj = {
|
|
|
1431
|
+ id: response.data.data.list[i].id,
|
|
|
1432
|
+ name: response.data.data.list[i].name,
|
|
|
1433
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
1434
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
1435
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
1436
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
1437
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
1438
|
+ }
|
|
|
1439
|
+ this.all_table_data.push(obj)
|
|
|
1440
|
+
|
|
|
1441
|
+ }
|
|
|
1442
|
+ }
|
|
1190
|
1443
|
}
|
|
1191
|
1444
|
|
|
1192
|
|
- if (response.data.data.list_two[i].order.order_status == 2) {
|
|
1193
|
|
- two_count = two_count + 1
|
|
|
1445
|
+ }
|
|
|
1446
|
+
|
|
|
1447
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
1448
|
+ if (this.all_table_data[i].his_patient_id > 0) {
|
|
|
1449
|
+ this.hisPatientDatas.push(this.all_table_data[i])
|
|
1194
|
1450
|
}
|
|
|
1451
|
+ }
|
|
1195
|
1452
|
|
|
1196
|
|
- // if (response.data.data.list_two[i].order.order_status == 3) {
|
|
1197
|
|
- // three_count = three_count + 1
|
|
1198
|
|
- // }
|
|
|
1453
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
1454
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
|
|
|
1455
|
+ one_count = one_count + 1
|
|
|
1456
|
+ }
|
|
|
1457
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
|
1458
|
+ two_count = two_count + 1
|
|
|
1459
|
+ }
|
|
1199
|
1460
|
}
|
|
|
1461
|
+
|
|
1200
|
1462
|
switch (this.radio) {
|
|
1201
|
1463
|
case 1:
|
|
1202
|
1464
|
this.patientTableData = []
|
|
1203
|
1465
|
|
|
1204
|
1466
|
for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
1205
|
|
- if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
|
|
|
1467
|
+ if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1 || this.hisPatientDatas[i].order_status == 3) {
|
|
1206
|
1468
|
this.patientTableData.push(this.hisPatientDatas[i])
|
|
1207
|
1469
|
}
|
|
1208
|
1470
|
|
|
|
@@ -1211,7 +1473,7 @@
|
|
1211
|
1473
|
case 2:
|
|
1212
|
1474
|
this.patientTableData = []
|
|
1213
|
1475
|
for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
1214
|
|
- if (this.hisPatientDatas[i].order.order_status == 2) {
|
|
|
1476
|
+ if (this.hisPatientDatas[i].order_status == 2) {
|
|
1215
|
1477
|
this.patientTableData.push(this.hisPatientDatas[i])
|
|
1216
|
1478
|
}
|
|
1217
|
1479
|
|
|
|
@@ -1239,9 +1501,9 @@
|
|
1239
|
1501
|
|
|
1240
|
1502
|
if (this.patientTableData.length > 0) {
|
|
1241
|
1503
|
for (let i = 0; i < this.patientTableData.length; i++) {
|
|
1242
|
|
- if (this.patientTableData[i].id == this.patientInfo.id) {
|
|
|
1504
|
+ if (this.patientTableData[i].his_patient_id == this.hisPatientInfo.id) {
|
|
1243
|
1505
|
this.$refs.tab.setCurrentRow(this.patientTableData[i])
|
|
1244
|
|
- this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
|
|
|
1506
|
+ this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id)
|
|
1245
|
1507
|
}
|
|
1246
|
1508
|
}
|
|
1247
|
1509
|
}
|
|
|
@@ -1651,6 +1913,7 @@
|
|
1651
|
1913
|
type: 'warning'
|
|
1652
|
1914
|
}).then(() => {
|
|
1653
|
1915
|
let params = {
|
|
|
1916
|
+ 'id': this.hisPatientInfo.id,
|
|
1654
|
1917
|
'patient_id': this.patientInfo.id,
|
|
1655
|
1918
|
'record_time': this.record_date,
|
|
1656
|
1919
|
'org_id': this.$store.getters.xt_user.org_id,
|
|
|
@@ -1962,38 +2225,89 @@
|
|
1962
|
2225
|
let two_count = 0
|
|
1963
|
2226
|
let three_count = 0
|
|
1964
|
2227
|
|
|
|
2228
|
+ for (let i = 0; i < response.data.data.list.length; i++) {
|
|
|
2229
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
2230
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
2231
|
+ let obj = {
|
|
|
2232
|
+ id: response.data.data.list[i].id,
|
|
|
2233
|
+ name: response.data.data.list[i].name,
|
|
|
2234
|
+ number: '',
|
|
|
2235
|
+ order_status: 0,
|
|
|
2236
|
+ his_patient_id: 0
|
|
|
2237
|
+ }
|
|
|
2238
|
+
|
|
|
2239
|
+ this.all_table_data.push(obj)
|
|
|
2240
|
+ }
|
|
|
2241
|
+
|
|
|
2242
|
+ } else { //挂号
|
|
|
2243
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
2244
|
+ let obj = {
|
|
|
2245
|
+ id: response.data.data.list[i].id,
|
|
|
2246
|
+ name: response.data.data.list[i].name,
|
|
|
2247
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
2248
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
2249
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id
|
|
|
2250
|
+ }
|
|
|
2251
|
+ this.all_table_data.push(obj)
|
|
|
2252
|
+
|
|
|
2253
|
+ }
|
|
|
2254
|
+
|
|
|
2255
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
2256
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
2257
|
+ let obj = {
|
|
|
2258
|
+ id: response.data.data.list[i].id,
|
|
|
2259
|
+ name: response.data.data.list[i].name,
|
|
|
2260
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
2261
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
2262
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id
|
|
|
2263
|
+ }
|
|
|
2264
|
+ this.all_table_data.push(obj)
|
|
|
2265
|
+
|
|
|
2266
|
+ }
|
|
|
2267
|
+ }
|
|
|
2268
|
+ }
|
|
|
2269
|
+
|
|
|
2270
|
+ }
|
|
|
2271
|
+
|
|
|
2272
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
2273
|
+ if (this.all_table_data[i].his_patient_id > 0) {
|
|
|
2274
|
+ this.hisPatientDatas.push(this.all_table_data[i])
|
|
|
2275
|
+ }
|
|
|
2276
|
+ }
|
|
|
2277
|
+
|
|
|
2278
|
+ console.log(this.hisPatientDatas)
|
|
|
2279
|
+ console.log(this.all_table_data)
|
|
|
2280
|
+
|
|
1965
|
2281
|
if (this.activeName == 'first') { //日结
|
|
1966
|
2282
|
|
|
1967
|
|
- for (let i = 0; i < response.data.data.list.length; i++) {
|
|
1968
|
|
- this.all_table_data.push(response.data.data.list[i])
|
|
1969
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
|
2283
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
2284
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
|
|
1970
|
2285
|
one_count = one_count + 1
|
|
1971
|
2286
|
}
|
|
1972
|
|
-
|
|
1973
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
|
2287
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
1974
|
2288
|
two_count = two_count + 1
|
|
1975
|
2289
|
}
|
|
1976
|
|
-
|
|
1977
|
|
- // if (response.data.data.list[i].order.order_status == 3) {
|
|
1978
|
|
- // three_count = three_count + 1
|
|
1979
|
|
- // }
|
|
1980
|
2290
|
}
|
|
1981
|
2291
|
|
|
|
2292
|
+ console.log(one_count)
|
|
|
2293
|
+ console.log(two_count)
|
|
|
2294
|
+
|
|
1982
|
2295
|
} else { //月结
|
|
1983
|
2296
|
|
|
1984
|
|
- for (let i = 0; i < response.data.data.list_two.length; i++) {
|
|
1985
|
|
- this.hisPatientDatas.push(response.data.data.list_two[i])
|
|
1986
|
|
- if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
|
|
|
2297
|
+ for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
|
2298
|
+ if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
|
|
1987
|
2299
|
one_count = one_count + 1
|
|
1988
|
2300
|
}
|
|
1989
|
2301
|
|
|
1990
|
|
- if (response.data.data.list_two[i].order.order_status == 2) {
|
|
|
2302
|
+ if (this.hisPatientDatas[i].order_status == 2) {
|
|
1991
|
2303
|
two_count = two_count + 1
|
|
1992
|
2304
|
}
|
|
1993
|
2305
|
|
|
1994
|
|
- if (response.data.data.list_two[i].order.order_status == 3) {
|
|
1995
|
|
- three_count = three_count + 1
|
|
1996
|
|
- }
|
|
|
2306
|
+ console.log(one_count)
|
|
|
2307
|
+ console.log(two_count)
|
|
|
2308
|
+ // if (this.hisPatientDatas[i].order_status == 3) {
|
|
|
2309
|
+ // three_count = three_count + 1
|
|
|
2310
|
+ // }
|
|
1997
|
2311
|
}
|
|
1998
|
2312
|
|
|
1999
|
2313
|
}
|
|
|
@@ -2001,7 +2315,8 @@
|
|
2001
|
2315
|
this.cal_one = one_count
|
|
2002
|
2316
|
this.cal_two = two_count
|
|
2003
|
2317
|
this.cal_three = three_count
|
|
2004
|
|
-
|
|
|
2318
|
+ console.log(this.cal_one)
|
|
|
2319
|
+ console.log(this.cal_two)
|
|
2005
|
2320
|
switch (temp_id) {
|
|
2006
|
2321
|
|
|
2007
|
2322
|
case 1:
|
|
|
@@ -2009,7 +2324,7 @@
|
|
2009
|
2324
|
if (this.activeName == 'first') {
|
|
2010
|
2325
|
|
|
2011
|
2326
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2012
|
|
- if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
|
|
|
2327
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1) {
|
|
2013
|
2328
|
this.patientTableData.push(this.all_table_data[i])
|
|
2014
|
2329
|
}
|
|
2015
|
2330
|
|
|
|
@@ -2017,28 +2332,24 @@
|
|
2017
|
2332
|
|
|
2018
|
2333
|
} else {
|
|
2019
|
2334
|
for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
2020
|
|
- if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
|
|
|
2335
|
+ if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
|
|
2021
|
2336
|
this.patientTableData.push(this.hisPatientDatas[i])
|
|
2022
|
2337
|
}
|
|
2023
|
|
-
|
|
2024
|
2338
|
}
|
|
2025
|
|
-
|
|
2026
|
2339
|
}
|
|
2027
|
2340
|
|
|
2028
|
2341
|
break
|
|
2029
|
2342
|
case 2:
|
|
2030
|
2343
|
this.patientTableData = []
|
|
2031
|
2344
|
if (this.activeName == 'first') {
|
|
2032
|
|
-
|
|
2033
|
2345
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2034
|
|
- if (this.all_table_data[i].order.order_status == 2) {
|
|
|
2346
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
2035
|
2347
|
this.patientTableData.push(this.all_table_data[i])
|
|
2036
|
2348
|
}
|
|
2037
|
|
-
|
|
2038
|
2349
|
}
|
|
2039
|
2350
|
} else {
|
|
2040
|
2351
|
for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
2041
|
|
- if (this.hisPatientDatas[i].order.order_status == 2) {
|
|
|
2352
|
+ if (this.hisPatientDatas[i].order_status == 2) {
|
|
2042
|
2353
|
this.patientTableData.push(this.hisPatientDatas[i])
|
|
2043
|
2354
|
}
|
|
2044
|
2355
|
}
|
|
|
@@ -2047,35 +2358,25 @@
|
|
2047
|
2358
|
break
|
|
2048
|
2359
|
case 3:
|
|
2049
|
2360
|
this.patientTableData = []
|
|
2050
|
|
-
|
|
2051
|
2361
|
if (this.activeName == 'first') {
|
|
2052
|
|
-
|
|
2053
|
2362
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2054
|
|
-
|
|
2055
|
|
- if (this.all_table_data[i].order.order_status == 3) {
|
|
|
2363
|
+ if (this.all_table_data[i].order_status == 3) {
|
|
2056
|
2364
|
this.patientTableData.push(this.all_table_data[i])
|
|
2057
|
2365
|
}
|
|
2058
|
|
-
|
|
2059
|
2366
|
}
|
|
2060
|
2367
|
} else {
|
|
2061
|
|
-
|
|
2062
|
2368
|
for (let i = 0; i < this.hisPatientDatas.length; i++) {
|
|
2063
|
|
-
|
|
2064
|
|
- if (this.hisPatientDatas[i].order.order_status == 3) {
|
|
|
2369
|
+ if (this.hisPatientDatas[i].order_status == 3) {
|
|
2065
|
2370
|
this.patientTableData.push(this.hisPatientDatas[i])
|
|
2066
|
2371
|
}
|
|
2067
|
|
-
|
|
2068
|
2372
|
}
|
|
2069
|
|
-
|
|
2070
|
2373
|
}
|
|
2071
|
2374
|
break
|
|
2072
|
2375
|
case 4:
|
|
2073
|
2376
|
this.patientTableData = []
|
|
2074
|
2377
|
if (this.activeName == 'first') {
|
|
2075
|
|
-
|
|
2076
|
2378
|
this.patientTableData = this.all_table_data
|
|
2077
|
2379
|
} else {
|
|
2078
|
|
-
|
|
2079
|
2380
|
this.patientTableData = this.hisPatientDatas
|
|
2080
|
2381
|
}
|
|
2081
|
2382
|
break
|
|
|
@@ -2084,7 +2385,7 @@
|
|
2084
|
2385
|
|
|
2085
|
2386
|
this.current_index = 0
|
|
2086
|
2387
|
this.$refs.tab.setCurrentRow(this.patientTableData[0])
|
|
2087
|
|
- this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
|
|
|
2388
|
+ this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id)
|
|
2088
|
2389
|
|
|
2089
|
2390
|
}
|
|
2090
|
2391
|
})
|
|
|
@@ -2116,28 +2417,80 @@
|
|
2116
|
2417
|
let one_count = 0
|
|
2117
|
2418
|
let two_count = 0
|
|
2118
|
2419
|
let three_count = 0
|
|
|
2420
|
+
|
|
2119
|
2421
|
for (let i = 0; i < response.data.data.list.length; i++) {
|
|
2120
|
|
- this.all_table_data.push(response.data.data.list[i])
|
|
2121
|
|
- if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
|
|
2122
|
|
- one_count = one_count + 1
|
|
|
2422
|
+ if (response.data.data.list[i].his_patient.length == 0) { //没挂号
|
|
|
2423
|
+ if (response.data.data.list[i].prescription.length > 0) {
|
|
|
2424
|
+ let obj = {
|
|
|
2425
|
+ id: response.data.data.list[i].id,
|
|
|
2426
|
+ name: response.data.data.list[i].name,
|
|
|
2427
|
+ number: '',
|
|
|
2428
|
+ order_status: 0,
|
|
|
2429
|
+ order_number: '',
|
|
|
2430
|
+ his_patient_id: 0
|
|
|
2431
|
+ }
|
|
|
2432
|
+
|
|
|
2433
|
+ this.all_table_data.push(obj)
|
|
|
2434
|
+ }
|
|
|
2435
|
+
|
|
|
2436
|
+ } else { //挂号
|
|
|
2437
|
+ if (response.data.data.list[i].his_patient.length == 1) {
|
|
|
2438
|
+ let obj = {
|
|
|
2439
|
+ id: response.data.data.list[i].id,
|
|
|
2440
|
+ name: response.data.data.list[i].name,
|
|
|
2441
|
+ number: response.data.data.list[i].his_patient[0].number,
|
|
|
2442
|
+ order_status: response.data.data.list[i].his_patient[0].order.order_status,
|
|
|
2443
|
+ his_patient_id: response.data.data.list[i].his_patient[0].id,
|
|
|
2444
|
+ order_number: response.data.data.list[i].his_patient[0].order.number,
|
|
|
2445
|
+ order_id: response.data.data.list[i].his_patient[0].order.id
|
|
|
2446
|
+ }
|
|
|
2447
|
+ this.all_table_data.push(obj)
|
|
|
2448
|
+
|
|
|
2449
|
+ }
|
|
|
2450
|
+
|
|
|
2451
|
+ if (response.data.data.list[i].his_patient.length > 1) {
|
|
|
2452
|
+ for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
|
|
|
2453
|
+ let obj = {
|
|
|
2454
|
+ id: response.data.data.list[i].id,
|
|
|
2455
|
+ name: response.data.data.list[i].name,
|
|
|
2456
|
+ number: response.data.data.list[i].his_patient[b].number,
|
|
|
2457
|
+ order_status: response.data.data.list[i].his_patient[b].order.order_status,
|
|
|
2458
|
+ his_patient_id: response.data.data.list[i].his_patient[b].id,
|
|
|
2459
|
+ order_number: response.data.data.list[i].his_patient[b].order.number,
|
|
|
2460
|
+ order_id: response.data.data.list[i].his_patient[b].order.id
|
|
|
2461
|
+ }
|
|
|
2462
|
+ this.all_table_data.push(obj)
|
|
|
2463
|
+
|
|
|
2464
|
+ }
|
|
|
2465
|
+ }
|
|
2123
|
2466
|
}
|
|
2124
|
2467
|
|
|
2125
|
|
- if (response.data.data.list[i].order.order_status == 2) {
|
|
2126
|
|
- two_count = two_count + 1
|
|
|
2468
|
+ }
|
|
|
2469
|
+
|
|
|
2470
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
2471
|
+ if (this.all_table_data[i].his_patient_id > 0) {
|
|
|
2472
|
+ this.hisPatientDatas.push(this.all_table_data[i])
|
|
2127
|
2473
|
}
|
|
|
2474
|
+ }
|
|
|
2475
|
+
|
|
|
2476
|
+ console.log(this.all_table_data)
|
|
|
2477
|
+ console.log(this.hisPatientDatas)
|
|
2128
|
2478
|
|
|
2129
|
|
- // if (response.data.data.list[i].order.order_status == 3) {
|
|
2130
|
|
- // three_count = three_count + 1
|
|
2131
|
|
- // }
|
|
|
2479
|
+ for (let i = 0; i < this.all_table_data.length; i++) {
|
|
|
2480
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
|
|
|
2481
|
+ one_count = one_count + 1
|
|
|
2482
|
+ }
|
|
|
2483
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
|
2484
|
+ two_count = two_count + 1
|
|
|
2485
|
+ }
|
|
2132
|
2486
|
}
|
|
2133
|
2487
|
|
|
2134
|
2488
|
switch (this.radio) {
|
|
2135
|
|
-
|
|
2136
|
2489
|
case 1:
|
|
2137
|
2490
|
this.patientTableData = []
|
|
2138
|
2491
|
|
|
2139
|
2492
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2140
|
|
- if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
|
|
|
2493
|
+ if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
|
|
2141
|
2494
|
this.patientTableData.push(this.all_table_data[i])
|
|
2142
|
2495
|
}
|
|
2143
|
2496
|
|
|
|
@@ -2146,7 +2499,7 @@
|
|
2146
|
2499
|
case 2:
|
|
2147
|
2500
|
this.patientTableData = []
|
|
2148
|
2501
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2149
|
|
- if (this.all_table_data[i].order.order_status == 2) {
|
|
|
2502
|
+ if (this.all_table_data[i].order_status == 2) {
|
|
2150
|
2503
|
this.patientTableData.push(this.all_table_data[i])
|
|
2151
|
2504
|
}
|
|
2152
|
2505
|
|
|
|
@@ -2157,7 +2510,7 @@
|
|
2157
|
2510
|
|
|
2158
|
2511
|
for (let i = 0; i < this.all_table_data.length; i++) {
|
|
2159
|
2512
|
|
|
2160
|
|
- if (this.all_table_data[i].order.order_status == 3) {
|
|
|
2513
|
+ if (this.all_table_data[i].order_status == 3) {
|
|
2161
|
2514
|
this.patientTableData.push(this.all_table_data[i])
|
|
2162
|
2515
|
}
|
|
2163
|
2516
|
|
|
|
@@ -2167,16 +2520,14 @@
|
|
2167
|
2520
|
this.patientTableData = []
|
|
2168
|
2521
|
this.patientTableData = this.all_table_data
|
|
2169
|
2522
|
break
|
|
2170
|
|
-
|
|
2171
|
2523
|
}
|
|
2172
|
2524
|
|
|
2173
|
|
- this.hisPatientDatas = response.data.data.list_two
|
|
2174
|
2525
|
this.cal_one = one_count
|
|
2175
|
2526
|
this.cal_two = two_count
|
|
2176
|
2527
|
this.cal_three = three_count
|
|
2177
|
2528
|
this.current_index = 0
|
|
2178
|
2529
|
this.$refs.tab.setCurrentRow(this.patientTableData[0])
|
|
2179
|
|
- this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
|
|
|
2530
|
+ this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id)
|
|
2180
|
2531
|
|
|
2181
|
2532
|
}
|
|
2182
|
2533
|
})
|
|
|
@@ -2361,24 +2712,23 @@
|
|
2361
|
2712
|
this.prescriptions = []
|
|
2362
|
2713
|
this.month_prescriptions = []
|
|
2363
|
2714
|
|
|
2364
|
|
- this.getPatientInformation(val.id, val.order.number)
|
|
|
2715
|
+ this.getPatientInformation(val.id, val.order_number, val.his_patient_id)
|
|
2365
|
2716
|
this.patient_id = val.id
|
|
2366
|
2717
|
|
|
2367
|
2718
|
for (let i = 0; i < this.patientTableData.length; i++) {
|
|
2368
|
|
- if (this.patientTableData[i].id == val.id) {
|
|
|
2719
|
+ if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
|
|
2369
|
2720
|
this.current_index = i
|
|
2370
|
2721
|
}
|
|
2371
|
2722
|
|
|
2372
|
2723
|
}
|
|
2373
|
2724
|
|
|
2374
|
2725
|
},
|
|
2375
|
|
-
|
|
2376
|
2726
|
//获取患者的基本信息
|
|
2377
|
|
- getPatientInformation(id, batch_number) {
|
|
2378
|
|
-
|
|
|
2727
|
+ getPatientInformation(id, batch_number, his_patient_id) {
|
|
2379
|
2728
|
let params = {
|
|
2380
|
2729
|
'record_date': this.record_date,
|
|
2381
|
2730
|
'patient_id': id,
|
|
|
2731
|
+ 'his_patient_id': his_patient_id,
|
|
2382
|
2732
|
'number': batch_number,
|
|
2383
|
2733
|
'start_time': this.other_start_time,
|
|
2384
|
2734
|
'end_time': this.other_end_time,
|
|
|
@@ -2386,7 +2736,6 @@
|
|
2386
|
2736
|
|
|
2387
|
2737
|
}
|
|
2388
|
2738
|
this.loading = true
|
|
2389
|
|
-
|
|
2390
|
2739
|
getChargeHisPatientInfo(params).then(response => {
|
|
2391
|
2740
|
if (response.data.state == 0) {
|
|
2392
|
2741
|
this.loading = false
|
|
|
@@ -2398,18 +2747,15 @@
|
|
2398
|
2747
|
this.month_prescriptions = []
|
|
2399
|
2748
|
this.curPrescriptions = {}
|
|
2400
|
2749
|
this.curMonthPrescriptions = {}
|
|
2401
|
|
-
|
|
2402
|
2750
|
this.loading = false
|
|
2403
|
2751
|
this.patientInfo = response.data.data.xt_info
|
|
2404
|
2752
|
this.hisPatientInfo = response.data.data.his_info
|
|
2405
|
2753
|
this.info = response.data.data.info
|
|
2406
|
2754
|
this.order = response.data.data.order
|
|
2407
|
|
-
|
|
2408
|
2755
|
this.p_type = ''
|
|
2409
|
2756
|
this.sick_type = ''
|
|
2410
|
2757
|
this.diagnosis = ''
|
|
2411
|
2758
|
this.sick_history = ''
|
|
2412
|
|
-
|
|
2413
|
2759
|
if (this.info.id > 0) {
|
|
2414
|
2760
|
this.p_type = this.info.register_type
|
|
2415
|
2761
|
this.sick_type = this.info.sick_type
|
|
|
@@ -2427,13 +2773,11 @@
|
|
2427
|
2773
|
if (this.info.diagnosis == 0) {
|
|
2428
|
2774
|
this.diagnosis = ''
|
|
2429
|
2775
|
}
|
|
2430
|
|
-
|
|
2431
|
2776
|
} else {
|
|
2432
|
2777
|
this.p_type = ''
|
|
2433
|
2778
|
this.sick_type = ''
|
|
2434
|
2779
|
this.diagnosis = ''
|
|
2435
|
2780
|
this.sick_history = ''
|
|
2436
|
|
-
|
|
2437
|
2781
|
}
|
|
2438
|
2782
|
this.addtions_charge = response.data.data.addtions_charge
|
|
2439
|
2783
|
this.setMonthPrescription(response.data.data.month_prescriptions)
|
|
|
@@ -2442,7 +2786,6 @@
|
|
2442
|
2786
|
} else {
|
|
2443
|
2787
|
this.prescription_id = 0
|
|
2444
|
2788
|
}
|
|
2445
|
|
-
|
|
2446
|
2789
|
for (let i = 0; i < response.data.data.prescription.length; i++) {
|
|
2447
|
2790
|
var prescription = response.data.data.prescription[i]
|
|
2448
|
2791
|
let tempAdvice = []
|
|
|
@@ -2549,7 +2892,8 @@
|
|
2549
|
2892
|
'patient_id': this.patientInfo.id,
|
|
2550
|
2893
|
'record_time': this.record_date,
|
|
2551
|
2894
|
'settle_accounts_type': this.settle_accounts_type,
|
|
2552
|
|
- 'admin_user_id': this.$store.getters.xt_user.user.id
|
|
|
2895
|
+ 'admin_user_id': this.$store.getters.xt_user.user.id,
|
|
|
2896
|
+ 'his_patient_id': this.hisPatientInfo.id
|
|
2553
|
2897
|
}
|
|
2554
|
2898
|
axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
|
|
2555
|
2899
|
params: params,
|
|
|
@@ -2596,6 +2940,7 @@
|
|
2596
|
2940
|
params: {
|
|
2597
|
2941
|
order_id: this.order.id,
|
|
2598
|
2942
|
record_time: this.record_date,
|
|
|
2943
|
+ his_patient_id: this.hisPatientInfo.id,
|
|
2599
|
2944
|
admin_user_id: this.$store.getters.xt_user.user.id,
|
|
2600
|
2945
|
patient_id: this.patientInfo.id
|
|
2601
|
2946
|
}
|
csx