|
@@ -742,17 +742,22 @@
|
742
|
742
|
console.log("prescription.advices",this.prescription.advices)
|
743
|
743
|
var obj = {id:0,day:"",delivery_way:"",execution_frequency:""}
|
744
|
744
|
if(this.prescription.advices!=null && this.prescription.advices.length>0){
|
745
|
|
- for(let i=0;i<this.prescription.advices.length;i++){
|
746
|
|
- console.log("this.prescription.advices[i].groupno",this.prescription.advices[i].groupno)
|
747
|
|
- if(parseInt(val.groupno) == parseInt(this.prescription.advices[i].groupno) && parseInt(val.id)!= parseInt(this.prescription.advices[i].id)){
|
748
|
|
- console.log("this.prescription.advices[i]",this.prescription.advices[i])
|
749
|
|
- obj.id = val.id
|
750
|
|
- obj.day = this.prescription.advices[i].day
|
751
|
|
- obj.delivery_way = this.prescription.advices[i].delivery_way
|
752
|
|
- obj.execution_frequency = this.prescription.advices[i].execution_frequency
|
753
|
|
- console.log("-----------------",obj)
|
754
|
|
- }
|
755
|
|
- }
|
|
745
|
+ for(let i=0;i<this.prescription.advices.length;i++){
|
|
746
|
+ if(parseInt(val.groupno) == parseInt(this.prescription.advices[i].groupno) && parseInt(val.id)!= parseInt(this.prescription.advices[i].id)){
|
|
747
|
+ console.log("this.prescription.advices[i]",this.prescription.advices[i])
|
|
748
|
+ obj.id = val.id
|
|
749
|
+ obj.day = this.prescription.advices[i].day
|
|
750
|
+ obj.delivery_way = this.prescription.advices[i].delivery_way
|
|
751
|
+ obj.execution_frequency = this.prescription.advices[i].execution_frequency
|
|
752
|
+ console.log("-----------------",obj)
|
|
753
|
+ } else
|
|
754
|
+ if(parseInt(val.id)== parseInt(this.prescription.advices[i].id)){
|
|
755
|
+ obj.id = val.id
|
|
756
|
+ obj.day = this.prescription.advices[i].day
|
|
757
|
+ obj.delivery_way = this.prescription.advices[i].delivery_way
|
|
758
|
+ obj.execution_frequency = this.prescription.advices[i].execution_frequency
|
|
759
|
+ }
|
|
760
|
+ }
|
756
|
761
|
}
|
757
|
762
|
console.log("-----------------",obj)
|
758
|
763
|
|