|
@@ -518,9 +518,19 @@ export default {
|
518
|
518
|
console.log('project_config',)
|
519
|
519
|
if(project_config.is_open == 1){
|
520
|
520
|
this.project = resp.data.project
|
|
521
|
+ let projectArr = []
|
|
522
|
+ this.project.map(item => {
|
|
523
|
+ resp.data.hisAdvices.map(it => {
|
|
524
|
+ if(item.patient_id == it.patient_id){
|
|
525
|
+ projectArr.push(item)
|
|
526
|
+ }
|
|
527
|
+ })
|
|
528
|
+
|
|
529
|
+ })
|
|
530
|
+
|
521
|
531
|
resp.data.hisAdvices.map((item,index) => {
|
522
|
|
- if(this.project[index].project.length > 0){
|
523
|
|
- this.project[index].project.map(it => {
|
|
532
|
+ if(projectArr[index].project.length > 0){
|
|
533
|
+ projectArr[index].project.map(it => {
|
524
|
534
|
let obj = {
|
525
|
535
|
advice_doctor: it.doctor,
|
526
|
536
|
start_time:it.start_time,
|
|
@@ -930,11 +940,11 @@ export default {
|
930
|
940
|
|
931
|
941
|
if (isChild == 1) {
|
932
|
942
|
// 不是子药
|
933
|
|
- console.log(tempDrugSpecDesc)
|
934
|
|
- console.log(tempPrescribingNumberDesc)
|
935
|
|
- console.log(tempSingleDoseDesc)
|
936
|
|
- console.log(11,row.delivery_way)
|
937
|
|
- console.log(22,row.execution_frequency)
|
|
943
|
+ // console.log(tempDrugSpecDesc)
|
|
944
|
+ // console.log(tempPrescribingNumberDesc)
|
|
945
|
+ // console.log(tempSingleDoseDesc)
|
|
946
|
+ // console.log(11,row.delivery_way)
|
|
947
|
+ // console.log(22,row.execution_frequency)
|
938
|
948
|
|
939
|
949
|
return (
|
940
|
950
|
row.advice_name +
|